5918c6700bd8e660abbf2c8f78cac5ea6a947374 - SHIFTPHONES/android_frameworks_base

commit	5918c6700bd8e660abbf2c8f78cac5ea6a947374	[log] [tgz]
author	Sudheer Shanka <sudheersai@google.com>	Tue Mar 21 19:31:37 2017 -0700
committer	Sudheer Shanka <sudheersai@google.com>	Fri Mar 24 13:05:27 2017 -0700
tree	6e8118b5fa9fb21698bc93e4457d124748925634
parent	62f5c178378be82d15fcb6d0b3a95be154f062bd [diff]

Update AMS to use NetworkManagementInternal.isNetworkRestrictedForUid.

And add global setting WAIT_FOR_NETWORK_TIMEOUT_MS.

Bug: 27803922
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
      cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests
      runtest -c android.provider.SettingsBackupTest frameworks-core
      and manual

Change-Id: I6949cd517255670e2ce21ab2de24271082461b11

core/java/android/provider/Settings.java[diff]
core/tests/coretests/src/android/provider/SettingsBackupTest.java[diff]
services/core/java/com/android/server/am/ActivityManagerService.java[diff]
services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java[diff]

4 files changed

tree: 6e8118b5fa9fb21698bc93e4457d124748925634