199049 Commits

Author SHA1 Message Date
Paul Mclean
e6639066bd 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:52:14 +00:00
Paul Mclean
1d19dc588f 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:52:10 +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
Geoff Mendal
035e10f8f5 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-08 18:55:37 +00:00
Geoff Mendal
5d4994b498 Import translations. DO NOT MERGE
Change-Id: I1c9149946ceaaa41d36a305c338336f27d0224d3
Auto-generated-cl: translation import
2015-08-08 11:13:47 -05:00
Geoff Mendal
e53e421e1e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-08 14:21:20 +00:00
Geoff Mendal
ba4a568cf8 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-08 14:20:49 +00:00
Geoff Mendal
bdd5db78c7 Import translations. DO NOT MERGE
Change-Id: I2bf98a2ed7790b147b2b13c460a52bb79c4b8db7
Auto-generated-cl: translation import
2015-08-08 07:16:18 -07:00
Geoff Mendal
283c030130 Import translations. DO NOT MERGE
Change-Id: Ib02888af570eee35060b2c624eaaaee25df11ea6
Auto-generated-cl: translation import
2015-08-08 07:14:55 -07:00
Geoff Mendal
2393f7e282 Import translations. DO NOT MERGE
Change-Id: I8efa511283a9b372c6386dd3a3396abee1d10780
Auto-generated-cl: translation import
2015-08-08 07:13:01 -07:00
Svetoslav Ganov
02d6c013e4 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:57:32 +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
42f6d217f5 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:43:39 +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
Ruben Brunk
ae81ebf892 Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev 2015-08-07 23:11:50 +00:00
Billy Lau
26ab6ed3ef 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:24 +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
977d421af9 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:00 +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
2327dd3f80 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:30:50 +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
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
d7408469f7 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:59 +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
543fd8be75 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:30:40 +00:00
Julia Reynolds
04b9614548 am 9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev
* commit '9dc4d50be1db82359050fd082828680bde44b9fd':
  Update Navigation bar assets.
2015-08-07 19:24:12 +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
69a07d401a am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '69ed33087d77e32a1f1475adf00b9d87580960aa':
  Allow system to disable lockscreen
2015-08-07 18:46:58 +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
85b3d03479 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:16 +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
db0cff71c8 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:19:35 +00:00
Chris Tate
c376afb472 Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev 2015-08-07 18:15:19 +00:00
Dianne Hackborn
0fe3e45555 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:15:01 +00:00
Nicolas Prevot
b5ab2ffc21 Keep intent verification status of system apps when uninstalling them.
When creating a work profile, system apps are uninstalled and then
sometimes reinstalled.
In the process, they lose their intent verification status.

BUG:22943461
Change-Id:I5b008c6de2125f190063b08908076a649067c60d
2015-08-07 19:13:01 +01:00
Amith Yamasani
a7892486c2 Fix partial user cleanup on restart
Internal volume was not available during PackageManagerService creation,
which resulted in a zombie user's folder not being cleaned after a reboot.

Add the internal volume earlier in the boot cycle so that it can be accessed
for user cleanup.

Bug: 22483086
Change-Id: I8f3ffbb25f3902d00a96d1ee2d7a79373c5e35b7
2015-08-07 11:09:05 -07:00
Dianne Hackborn
3d06ea0349 Merge "Debugging for issue #22556778: Starting under voice control not allowed" into mnc-dev 2015-08-07 18:06:01 +00:00
Julia Reynolds
ae4b8deada Update Navigation bar assets.
Bug: 22855920
Change-Id: I2d66bb087b092cdb6280e78c064f32ae9e42ad61
2015-08-07 13:59:46 -04:00
Christopher Tate
907e01eb70 Wait a bit longer for wifi to shut down before rewriting the config
We've seen case of it taking longer than 1500ms for the wifi system to
actually shut down after the triggering settings element is written,
so extend the wait time a bit.  We've seen it take more than 1500ms
but not more than 2500ms, so that's the new heuristic.

This will of course all become happily obsolete once we start
applying restored AP definitions programmatically rather than by
filesystem-level operations.

Bug 22979342

Change-Id: I6acf1baac23d4100124093128b82abf242b11a0e
2015-08-07 10:57:01 -07:00
Dianne Hackborn
eed29a7109 am 53d6cddb: Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev
* commit '53d6cddb4137c7b5648fc069adcc0cf6c501a6c4':
  Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today
2015-08-07 17:53:24 +00:00
Michael Wright
9dd2663db4 am d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev
* commit 'd7255cfb1cf8dc7249632d93d68daac8cc2c7b9c':
  DO NOT MERGE. Add new media navigation keys.
2015-08-07 17:53:17 +00:00
Dianne Hackborn
74aefdf28f Debugging for issue #22556778: Starting under voice control not allowed
Better error messages in log to explain what is going on.

Change-Id: Ie686a323ceedd42453b6581fe79653b407d49ee5
2015-08-07 10:37:21 -07:00