204297 Commits

Author SHA1 Message Date
Dianne Hackborn
919e7cad27 am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
* commit 'b2b020922fb51b88d34a6478209fc232702de318':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
2015-08-11 00:22:58 +00:00
Dianne Hackborn
b2b020922f Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev 2015-08-11 00:11:20 +00:00
Matthew Williams
48d58aad65 am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev
* commit '77d5b91401d87610128d9bf656f66c0d74bcb254':
  DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
2015-08-10 22:45:06 +00:00
Chris Tate
2403e51c2f am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev
* commit '5d05a24cff5be83dc7b03deccfb7f52b0066b34e':
  Fix wifi disable during restore
2015-08-10 22:39:54 +00:00
Matthew Williams
77d5b91401 Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev 2015-08-10 22:36:49 +00:00
Chris Tate
5d05a24cff Merge "Fix wifi disable during restore" into mnc-dev 2015-08-10 22:33:05 +00:00
Kevin Zhu
e910be0b7e DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
BUG: 23086704
Cherry-picked from https://android-review.googlesource.com/#/c/162280/
When the screen goes off or dreaming start, an alarm will be
scheduled and idle state will be true when the alarm expired.
If the screen goes on or dreaming stop happens before
the alarm expired, the alarm isn't cancelled and idle state is
set to be true when the device is in SCREEN_ON or DREADING_STOPPED
state. There is also a case that Idle alarm triggered when
the screen on or dreaming stop just start to be processed.
ACTION_TRIGGER_IDLE will set mIdle to true during screen on
or dreaming stop.

In this patch, the alarm will be cancelled when the screen goes
on or dreaming stop and screen-on flag will be set. So the idle
state can only be set when screen is off or dreaming started.

Change-Id: Ic21a2394418ca55513ab932b3bfad1126b8769c1
2015-08-10 15:03:34 -07:00
Dianne Hackborn
c7b57b1e65 Fix issue #23037899: Support for Battery Optimization permission + Dialog
New permission, new Intent action.

Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
2015-08-10 14:52:52 -07:00
Simranjit Kohli
cb3129656d am 301dfe08: Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev
* commit '301dfe08bc662e9475739309a0ccbce2231ecddb':
  [Fix getAccounts MANAGE_USERS permission]
2015-08-10 21:44:16 +00:00
Simranjit Kohli
301dfe08bc Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev 2015-08-10 21:36:30 +00:00
Simranjit Singh Kohli
b77d8b6085 [Fix getAccounts MANAGE_USERS permission]
Make code having potential to call userInfo inside clearIdentity.
Bug: 22917218

Change-Id: If95fb7c0ec36a2f5c737f04bc7d8af95b44fea22
2015-08-10 12:48:09 -07:00
Torne (Richard Coles)
081905c582 am c5283927: Close ZipFiles correctly in WebViewFactory.
* commit 'c52839277b8714d150a9fe276b6ba3fa8a0cbf38':
  Close ZipFiles correctly in WebViewFactory.
2015-08-10 16:02:34 +00:00
Torne (Richard Coles)
c52839277b Close ZipFiles correctly in WebViewFactory.
We weren't closing the ZipFiles created in WebViewFactory to check
inside APKs - use try-with-resources to get them closed automatically.

Bug: 23072621
Change-Id: I11c6b77e960a7d240d19d22240cac177b6ba27b2
2015-08-10 16:40:50 +01:00
Jason Monk
eda0838faa am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev
* commit '4218e46a3263e5ed9d99e600ef9b30cbd24cc861':
  Initialize network name better in NetworkController
2015-08-10 14:56:15 +00:00
Jason Monk
4218e46a32 Merge "Initialize network name better in NetworkController" into mnc-dev 2015-08-10 14:50:45 +00:00
Jason Monk
00aa9d4427 Initialize network name better in NetworkController
Initialize current network name to correct value from the
SubscriptionInfo until we get a broadcast about its current state.

Bug: 22212693
Change-Id: I17fa4378cc7a540c81268f8c4d5aa6a505f3ee40
2015-08-10 10:29:47 -04:00
Paul Mclean
624037df15 am a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev
* commit 'a2e39c6a1197f87cab2712a7776ff9022433b90a':
  Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API.
2015-08-10 13:49:26 +00:00
Paul Mclean
ef23eb24d5 am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev
* commit 'beda6e2b9abf576e7d33b520232d45b34a4ed168':
  Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."
2015-08-10 13:49:18 +00:00
Paul Mclean
a2e39c6a11 Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev 2015-08-10 13:42:15 +00:00
Paul Mclean
beda6e2b9a Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev 2015-08-10 13:40:58 +00:00
Svetoslav Ganov
8a23ad62c5 am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
* commit '90b030bae8cc1f13da7948fef4aff1d171a2885a':
  Do not show removed permissions in the UI - framework
2015-08-08 06:58:03 +00:00
Svetoslav Ganov
90b030bae8 Merge "Do not show removed permissions in the UI - framework" into mnc-dev 2015-08-08 06:48:38 +00:00
Dianne Hackborn
416605e450 am fc81be94: Merge "Fix issue #23037093: "Write system settings" permission value fails..." into mnc-dev
* commit 'fc81be947fcbb0d738a75eb2c6d560c52f7f9a99':
  Fix issue #23037093: "Write system settings" permission value fails...
2015-08-08 06:41:42 +00:00
Dianne Hackborn
fc81be947f Merge "Fix issue #23037093: "Write system settings" permission value fails..." into mnc-dev 2015-08-08 06:35:03 +00:00
Svet Ganov
3e0be7440b Do not show removed permissions in the UI - framework
bug:23043018

Change-Id: Ia5cf49f299eda627d9fde2b34498812afcb3a6d5
2015-08-07 23:06:04 -07:00
Christopher Tate
45dc0d03fd Fix wifi disable during restore
The main looper needs to run freely for a moment after disabling
wifi in order for various signals (content observers, broadcast) to
propagate to all the listeners that need to take action for the
wifi stack to shut all the way down.  This patch breaks up the
disable-and-rewrite-config sequence of wifi AP restore in to two
distinct operations separated by a moment so as not to block those
necessary messages.

Bug 22979342

Change-Id: I271766cad0e454669a194652fb67f835bb022cd1
2015-08-07 19:20:05 -07:00
Dianne Hackborn
4d34bb8304 Fix issue #23037093: "Write system settings" permission value fails...
...to persist after reboot

We were writing a corrupt settings file, so would always reset back
to the default app ops state after boot...!

Also add new appops service commands to manually write and read
its settings, since that is very useful for testing.

Change-Id: Ia510507764738fd82e45ec0be6db840c6ea30c28
2015-08-07 18:37:21 -07:00
Billy Lau
199edc5ca6 am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '70f998e57df2b3ed79331669a93a0ba314f25e7d':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:22:18 +00:00
Billy Lau
70f998e57d Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 2015-08-07 22:16:03 +00:00
Dianne Hackborn
10faec4bc0 am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev
* commit 'f0e5501e093c688cd293308e0aafc2b55326c255':
  Fix issue #22989030: Separate battery whitelists
2015-08-07 22:06:31 +00:00
Dianne Hackborn
f0e5501e09 Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 2015-08-07 21:58:38 +00:00
Matthew Williams
6dc2ac39e5 am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev
* commit '9d92955894118a51e310fdfeeb09f5b1d187c37f':
  Correctly skip files that are excluded from restore
2015-08-07 21:31:28 +00:00
Matthew Williams
9d92955894 Merge "Correctly skip files that are excluded from restore" into mnc-dev 2015-08-07 21:25:31 +00:00
Dianne Hackborn
4a503b1ece Fix issue #22989030: Separate battery whitelists
We now have a new whitelist you can put apps in, which
opts them out of the old battery saver mode and new app idle,
but doesn't keep them from going in to doze.  This is for a few
special cases that we had previously whitelisted for battery saver,
and inherited to the new modes...  ultimately we should figure out
how to get these apps out of the whitelist completely, but this
will help for now.

Apps in this new whitelist are not shown in the UI, because they
are still significantly restricted by not being able to operate
normally in doze.  This also means they are still visible in the
list of all apps for the user to be able to put them on/off the
complete whitelist if that is what they really want.

In the course of doing this, I needed to clean up code in the
network policy manager to better separate management of the
two firewall rules that now have different whitelists applied
to them.  This also hopefully just generally simplifies and cleans
up that code.  Hopefully!

Change-Id: I92e15f2f85899571dd8b049b5e3eb1354f55f353
2015-08-07 14:23:32 -07:00
Neil Fuller
cf9b82518c am 14b884c1: am daf8d905: Merge "Add ICU as a java library for docs."
* commit '14b884c16ecf3a70999fcbd1862f6f1b38b24367':
  Add ICU as a java library for docs.
2015-08-07 21:16:51 +00:00
Paul McLean
1135457a3d Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API.
Bug: 22729461
Change-Id: Ie581c385af2be16e61fcab5993391ef42f82a7d8
2015-08-07 14:45:24 -06:00
Shirish Kalele
1451df2816 am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev
* commit '027e3b7f51cd172dae89f69cc358363b0cf20f5f':
  Fix check for caller being the active network scorer
2015-08-07 20:30:38 +00:00
Shirish Kalele
027e3b7f51 Merge "Fix check for caller being the active network scorer" into mnc-dev 2015-08-07 20:25:06 +00:00
Nicolas Prévot
d63cb33774 am 288e82f8: Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev
* commit '288e82f8f67db894c43bf4ea659ca832f979c65a':
  Keep intent verification status of system apps when uninstalling them.
2015-08-07 19:33:23 +00:00
Julia Reynolds
936d2022e1 am 9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev
* commit '9dc4d50be1db82359050fd082828680bde44b9fd':
  Update Navigation bar assets.
2015-08-07 19:24:45 +00:00
Nicolas Prévot
288e82f8f6 Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev 2015-08-07 19:23:52 +00:00
Julia Reynolds
9dc4d50be1 Merge "Update Navigation bar assets." into mnc-dev 2015-08-07 19:19:02 +00:00
Paul Mclean
5fa8939d6f Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."
This reverts commit 8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523.

Change-Id: I731d01fd652e928ba331fa28bb09cc8234753fbf
2015-08-07 12:57:55 -06:00
Jason Monk
59769181a5 am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '69ed33087d77e32a1f1475adf00b9d87580960aa':
  Allow system to disable lockscreen
2015-08-07 18:47:06 +00:00
Jason Monk
69ed33087d Merge "Allow system to disable lockscreen" into mnc-dev 2015-08-07 18:40:19 +00:00
Billy Lau
a7238a397d Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Merge the CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.

AndroidManifest.xml:
Raised the protection level of CHANGE_NETWORK_STATE permission from
normal to signature|appops and pre23|preinstall for compatibility

provider/Settings:
Wrote new helper methods to check if app is allowed to change network
state.

ConnectivityManager.java & ConnectivityService.java:
Replace enforcement checks for CHANGE_NETWORK_STATE with
checkAndNoteChangeNetworkStateOperations instead.

Change-Id: If8c2dd3c76a5324ca43f1d90fa17973216c2bcc5
2015-08-07 19:29:51 +01:00
Amith Yamasani
d512325aaa am 1fbc1b3b: Merge "Fix partial user cleanup on restart" into mnc-dev
* commit '1fbc1b3b4b742cdba25d32d65a9813933a37005f':
  Fix partial user cleanup on restart
2015-08-07 18:28:09 +00:00
Amith Yamasani
1fbc1b3b4b Merge "Fix partial user cleanup on restart" into mnc-dev 2015-08-07 18:21:30 +00:00
Chris Tate
d39fb4afb1 am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev
* commit 'c376afb472d1d4f0fba4a03ac4cf05b498866d64':
  Wait a bit longer for wifi to shut down before rewriting the config
2015-08-07 18:20:36 +00:00
Dianne Hackborn
0e8b4fa0ec am 3d06ea03: Merge "Debugging for issue #22556778: Starting under voice control not allowed" into mnc-dev
* commit '3d06ea0349d6afb4248ab47151424bf64cdf5a2d':
  Debugging for issue #22556778: Starting under voice control not allowed
2015-08-07 18:16:13 +00:00