199069 Commits

Author SHA1 Message Date
Winson
1df9c3c6bd Pushing the startActivity before the calls to remove task.
- It appears that there is contention between startActivityAsUser() and
  removeTask() (called on two separate threads) which can cause jank when
  a user removes all the tasks from their recents list.  This CL ensures
  that startActivityAsUser() is always run first so it is not blocked
  by the other call (which should be able to run in the background
  uninterrupted).

Bug: 22760556
Change-Id: I7564a2f0e43414686419d3657379bbd0ca6b4152
2015-08-10 15:45:35 -07:00
Matthew Williams
2c8c251e73 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:10 +00:00
Chris Tate
5ca842ae08 am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev
* commit '5d05a24cff5be83dc7b03deccfb7f52b0066b34e':
  Fix wifi disable during restore
2015-08-10 22:40:25 +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
862840d689 am 301dfe08: Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev
* commit '301dfe08bc662e9475739309a0ccbce2231ecddb':
  [Fix getAccounts MANAGE_USERS permission]
2015-08-10 21:44:04 +00:00
Simranjit Kohli
301dfe08bc Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev 2015-08-10 21:36:30 +00:00
Dan Sandler
334398105f Crash apps with bad notification icons.
This shouldn't happen, since there are many places where
invalid icons should already have been either fixed (in the
case where there's an .icon but no .mSmallIcon) or rejected
(if they're both null or invalid). But if a notification
makes it all the way to SystemUI without a valid icon, let's
crash the sender.

Bug: 23011305
Change-Id: Ifaebec57d59baa1defb4520178b5815d47ed5712
2015-08-10 16:04:12 -04:00
Filip Gruszczynski
26ed265cee When closing task stack remove reference to display content.
This tightens the guarantee that detached stack won't be used. We also
add logging to detecting a situation where a stack not belonging to a
display is being moved on that display.

Bug: 22191609
Change-Id: Ia674bb5960018104a56c5138775ab5216906675b
2015-08-10 13:03:46 -07: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
Geoff Mendal
3ea5cfa8e8 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-10 18:09:23 +00:00
Geoff Mendal
c21a0fa940 Import translations. DO NOT MERGE
Change-Id: Ie2a8186b906ad14696892948248a0f7e47a4a744
Auto-generated-cl: translation import
2015-08-10 11:00:18 -07:00
Esteban Talavera
6b8e06495b Update setApplicationRestrictions documentation
From M we support nested Bundles in the input parameter

Bug: 23076454
Change-Id: I9c27d19ccfbc713ca757cbdde7ea9fbbc3839302
2015-08-10 18:04:10 +01:00
Torne (Richard Coles)
c207c9437d am c5283927: Close ZipFiles correctly in WebViewFactory.
* commit 'c52839277b8714d150a9fe276b6ba3fa8a0cbf38':
  Close ZipFiles correctly in WebViewFactory.
2015-08-10 16:01:43 +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
a5c0c209c5 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:52 +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
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