OSDN Git Service
Filip Gruszczynski [Wed, 12 Aug 2015 00:47:52 +0000 (00:47 +0000)]
am
59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev
* commit '
59123b9b2d7b26e7f49c77b4c62d48dc1a28518f':
When closing task stack remove reference to display content.
Filip Gruszczynski [Wed, 12 Aug 2015 00:40:50 +0000 (00:40 +0000)]
Merge "When closing task stack remove reference to display content." into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 00:37:34 +0000 (00:37 +0000)]
am
15f704e7: Merge "Fix issue #
23122445: Add 420 density" into mnc-dev
* commit '
15f704e70a0fc02f50f0b618b19147ca09c5e421':
Fix issue #
23122445: Add 420 density
Wale Ogunwale [Wed, 12 Aug 2015 00:37:23 +0000 (00:37 +0000)]
am
e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev
* commit '
e43d43c391a5b531aead1eae0156a66a3d924fd1':
Fixed issue with moveTaskToBack on single stack devices
Dianne Hackborn [Wed, 12 Aug 2015 00:34:56 +0000 (00:34 +0000)]
Merge "Fix issue #
23122445: Add 420 density" into mnc-dev
Wale Ogunwale [Wed, 12 Aug 2015 00:31:26 +0000 (00:31 +0000)]
Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 00:18:53 +0000 (17:18 -0700)]
Fix issue #
23122445: Add 420 density
Change-Id: I15c113eb7e22f1d882db071c007224746f9d408f
Andres Morales [Tue, 11 Aug 2015 23:35:53 +0000 (23:35 +0000)]
am
494d6e9b: [fingerprint] use credential owner in FingerprintService
* commit '
494d6e9b030e757cef996bcbfd68a80a7d1526e7':
[fingerprint] use credential owner in FingerprintService
Winson Chung [Tue, 11 Aug 2015 23:16:12 +0000 (23:16 +0000)]
am
8851608d: Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev
* commit '
8851608de30c1ebba80eb2de0e98795165e543dd':
Always call onProvidersChanged() when packages containing widgets are updated.
Andres Morales [Thu, 6 Aug 2015 22:01:41 +0000 (15:01 -0700)]
[fingerprint] use credential owner in FingerprintService
Bug:
23027554
Change-Id: I185492b5008058fdb23a4536a8a73177ee4903d8
Winson Chung [Tue, 11 Aug 2015 22:53:51 +0000 (22:53 +0000)]
Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev
Chris Manton [Tue, 11 Aug 2015 22:28:44 +0000 (22:28 +0000)]
am
19aa341a: Merge "Save data registration roaming state" into mnc-dev
* commit '
19aa341a3548c454c12378d7c4d92cc5074685a8':
Save data registration roaming state
Chris Manton [Tue, 11 Aug 2015 22:19:39 +0000 (22:19 +0000)]
Merge "Save data registration roaming state" into mnc-dev
Winson [Tue, 11 Aug 2015 21:29:13 +0000 (14:29 -0700)]
Always call onProvidersChanged() when packages containing widgets are updated.
- In the existing logic, the call to onProvidersChanged() is called when a package
with widgets is added or removed, but only called when a package is updated _and_
there is an app widget bound to a host. This differs from what the expected
behavior is based on the documentation and means that packages with widgets that
update have no way of notifying host apps of changes except via package events.
Bug:
20698931
Change-Id: I60af36d51e99ca1ea751d9d9d03a50ef2d5bef98
Wale Ogunwale [Tue, 11 Aug 2015 20:54:42 +0000 (13:54 -0700)]
Fixed issue with moveTaskToBack on single stack devices
Icdad980eec64e081d15679600da07cf4431e40d6 allowed us to
properly return to the home acitvity when a task is moved
to back. However, this improperly moved the home task to
the front if it is the task we are moving to the back on
a single stack device. We now prevent the movement of the
home task to the front from happening.
Bug:
23088310
Change-Id: Ic21779cdb2d2007671d212d41fab5e68be2ae632
Diego Perez [Tue, 11 Aug 2015 20:51:03 +0000 (20:51 +0000)]
am
7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev
* commit '
7d85b5435d01f8d4856a718d655e30fb5a703560':
Make DelegateManager thread safe
Diego Perez [Tue, 11 Aug 2015 20:44:40 +0000 (20:44 +0000)]
Merge "Make DelegateManager thread safe" into mnc-dev
Alan Viverette [Tue, 11 Aug 2015 19:41:53 +0000 (19:41 +0000)]
am
105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev
* commit '
105febd2cfb4760926ed0aef3c24be3727dd36e4':
Don't re-wrap alert dialog context
Alan Viverette [Tue, 11 Aug 2015 19:41:41 +0000 (19:41 +0000)]
am
11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev
* commit '
11104791c71e0140f1d37b711ca929939a85b77c':
Ensure ripple mask is drawn at correct position
Alan Viverette [Tue, 11 Aug 2015 19:34:27 +0000 (19:34 +0000)]
Merge "Don't re-wrap alert dialog context" into mnc-dev
Alan Viverette [Tue, 11 Aug 2015 19:33:55 +0000 (19:33 +0000)]
Merge "Ensure ripple mask is drawn at correct position" into mnc-dev
Alan Viverette [Tue, 11 Aug 2015 19:02:42 +0000 (15:02 -0400)]
Don't re-wrap alert dialog context
Bug:
23038618
Change-Id: Iafe3a45096153d9fe656ad930cc3978d8fab1968
Alan Viverette [Tue, 11 Aug 2015 18:32:05 +0000 (18:32 +0000)]
am
b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
* commit '
b4eb06402fba62f94bb16cbe433fe99a8df7cb18':
Avoid use-after-free race condition when rebasing theme
Alan Viverette [Tue, 11 Aug 2015 18:25:45 +0000 (14:25 -0400)]
Ensure ripple mask is drawn at correct position
Bug:
22911708
Change-Id: Icdbe1f8a66d5e35eb25aa973c94f5870896cc1f8
Alan Viverette [Tue, 11 Aug 2015 18:24:04 +0000 (18:24 +0000)]
Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
Chris Manton [Mon, 10 Aug 2015 20:32:24 +0000 (13:32 -0700)]
Save data registration roaming state
Carrier configuration may override the roaming state
but the roaming state may be required for specifying
proper APNs upon data call setup. This change stores
the unmodified roaming state.
bug:
22990977
Change-Id: I5ebe04f60709bc691e9c79be193f1790a7148818
Alan Viverette [Tue, 11 Aug 2015 14:26:08 +0000 (10:26 -0400)]
Avoid use-after-free race condition when rebasing theme
... by never rebasing the theme. We don't need to do this unless the
system theme is configuration-dependent, which it is not currently.
Bug:
22943781
Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
Daniel Sandler [Tue, 11 Aug 2015 14:21:56 +0000 (14:21 +0000)]
am
ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev
* commit '
ad7719dea4e8fd34854e4dcc918fc593c4416d82':
Crash apps with bad notification icons.
Daniel Sandler [Tue, 11 Aug 2015 14:17:45 +0000 (14:17 +0000)]
Merge "Crash apps with bad notification icons." into mnc-dev
Esteban Talavera [Tue, 11 Aug 2015 10:08:24 +0000 (10:08 +0000)]
am
4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev
* commit '
4dbb37ae95bdf60d230777c6a5e8d53b932e9d40':
Update setApplicationRestrictions documentation
Esteban Talavera [Tue, 11 Aug 2015 09:40:57 +0000 (09:40 +0000)]
Merge "Update setApplicationRestrictions documentation" into mnc-dev
Andreas Gampe [Tue, 11 Aug 2015 06:35:37 +0000 (06:35 +0000)]
am
b08c24a3: Frameworks/base: Disable Clang in core/jni
* commit '
b08c24a3e4f5362bbddc3735802e844e1992cd46':
Frameworks/base: Disable Clang in core/jni
Andreas Gampe [Sat, 11 Jul 2015 04:46:17 +0000 (21:46 -0700)]
Frameworks/base: Disable Clang in core/jni
thread_local does not work with Clang at the moment.
Bug:
22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
(cherry picked from commit
2bc67a1b5f9d4662ef7da4645ca8e580302b3553)
Winson Chung [Tue, 11 Aug 2015 02:40:23 +0000 (02:40 +0000)]
am
c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev
* commit '
c00b1067a05116548a0883e1400a1c4715078797':
Pushing the startActivity before the calls to remove task.
Winson Chung [Tue, 11 Aug 2015 02:33:15 +0000 (02:33 +0000)]
Merge "Pushing the startActivity before the calls to remove task." into mnc-dev
Jorim Jaggi [Tue, 11 Aug 2015 01:41:22 +0000 (01:41 +0000)]
am
f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev
* commit '
f8359cfb93e349771388709b160ae1b9d3f880b3':
Don't show fingerprint cancellation messages in keyguard
Jorim Jaggi [Tue, 11 Aug 2015 01:31:56 +0000 (01:31 +0000)]
Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:22:58 +0000 (00:22 +0000)]
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
Dianne Hackborn [Tue, 11 Aug 2015 00:11:20 +0000 (00:11 +0000)]
Merge "Fix issue #
23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
Winson [Thu, 6 Aug 2015 23:46:01 +0000 (16:46 -0700)]
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
Matthew Williams [Mon, 10 Aug 2015 22:45:06 +0000 (22:45 +0000)]
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
Chris Tate [Mon, 10 Aug 2015 22:39:54 +0000 (22:39 +0000)]
am
5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev
* commit '
5d05a24cff5be83dc7b03deccfb7f52b0066b34e':
Fix wifi disable during restore
Matthew Williams [Mon, 10 Aug 2015 22:36:49 +0000 (22:36 +0000)]
Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev
Chris Tate [Mon, 10 Aug 2015 22:33:05 +0000 (22:33 +0000)]
Merge "Fix wifi disable during restore" into mnc-dev
Kevin Zhu [Mon, 29 Jun 2015 23:06:49 +0000 (16:06 -0700)]
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
Dianne Hackborn [Mon, 10 Aug 2015 21:52:52 +0000 (14:52 -0700)]
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
New permission, new Intent action.
Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
Simranjit Kohli [Mon, 10 Aug 2015 21:44:16 +0000 (21:44 +0000)]
am
301dfe08: Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev
* commit '
301dfe08bc662e9475739309a0ccbce2231ecddb':
[Fix getAccounts MANAGE_USERS permission]
Simranjit Kohli [Mon, 10 Aug 2015 21:36:30 +0000 (21:36 +0000)]
Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev
Dan Sandler [Mon, 10 Aug 2015 19:49:56 +0000 (15:49 -0400)]
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
Filip Gruszczynski [Mon, 10 Aug 2015 18:02:53 +0000 (11:02 -0700)]
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
Simranjit Singh Kohli [Sat, 8 Aug 2015 00:07:23 +0000 (17:07 -0700)]
[Fix getAccounts MANAGE_USERS permission]
Make code having potential to call userInfo inside clearIdentity.
Bug:
22917218
Change-Id: If95fb7c0ec36a2f5c737f04bc7d8af95b44fea22
Esteban Talavera [Mon, 10 Aug 2015 16:26:04 +0000 (17:26 +0100)]
Update setApplicationRestrictions documentation
From M we support nested Bundles in the input parameter
Bug:
23076454
Change-Id: I9c27d19ccfbc713ca757cbdde7ea9fbbc3839302
Torne (Richard Coles) [Mon, 10 Aug 2015 16:02:34 +0000 (16:02 +0000)]
am
c5283927: Close ZipFiles correctly in WebViewFactory.
* commit '
c52839277b8714d150a9fe276b6ba3fa8a0cbf38':
Close ZipFiles correctly in WebViewFactory.
Torne (Richard Coles) [Mon, 10 Aug 2015 15:40:50 +0000 (16:40 +0100)]
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
Jason Monk [Mon, 10 Aug 2015 14:56:15 +0000 (14:56 +0000)]
am
4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev
* commit '
4218e46a3263e5ed9d99e600ef9b30cbd24cc861':
Initialize network name better in NetworkController
Jason Monk [Mon, 10 Aug 2015 14:50:45 +0000 (14:50 +0000)]
Merge "Initialize network name better in NetworkController" into mnc-dev
Jason Monk [Mon, 10 Aug 2015 14:12:02 +0000 (10:12 -0400)]
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
Paul Mclean [Mon, 10 Aug 2015 13:49:26 +0000 (13:49 +0000)]
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.
Paul Mclean [Mon, 10 Aug 2015 13:49:18 +0000 (13:49 +0000)]
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."
Paul Mclean [Mon, 10 Aug 2015 13:42:15 +0000 (13:42 +0000)]
Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev
Paul Mclean [Mon, 10 Aug 2015 13:40:58 +0000 (13:40 +0000)]
Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev
Svetoslav Ganov [Sat, 8 Aug 2015 06:58:03 +0000 (06:58 +0000)]
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
Svetoslav Ganov [Sat, 8 Aug 2015 06:48:38 +0000 (06:48 +0000)]
Merge "Do not show removed permissions in the UI - framework" into mnc-dev
Dianne Hackborn [Sat, 8 Aug 2015 06:41:42 +0000 (06:41 +0000)]
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...
Dianne Hackborn [Sat, 8 Aug 2015 06:35:03 +0000 (06:35 +0000)]
Merge "Fix issue #
23037093: "Write system settings" permission value fails..." into mnc-dev
Svet Ganov [Sat, 8 Aug 2015 06:06:00 +0000 (23:06 -0700)]
Do not show removed permissions in the UI - framework
bug:
23043018
Change-Id: Ia5cf49f299eda627d9fde2b34498812afcb3a6d5
Christopher Tate [Sat, 8 Aug 2015 02:20:05 +0000 (19:20 -0700)]
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
Dianne Hackborn [Sat, 8 Aug 2015 01:26:38 +0000 (18:26 -0700)]
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
Billy Lau [Fri, 7 Aug 2015 22:22:18 +0000 (22:22 +0000)]
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
Billy Lau [Fri, 7 Aug 2015 22:16:03 +0000 (22:16 +0000)]
Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 22:06:31 +0000 (22:06 +0000)]
am
f0e5501e: Merge "Fix issue #
22989030: Separate battery whitelists" into mnc-dev
* commit '
f0e5501e093c688cd293308e0aafc2b55326c255':
Fix issue #
22989030: Separate battery whitelists
Dianne Hackborn [Fri, 7 Aug 2015 21:58:38 +0000 (21:58 +0000)]
Merge "Fix issue #
22989030: Separate battery whitelists" into mnc-dev
Matthew Williams [Fri, 7 Aug 2015 21:31:28 +0000 (21:31 +0000)]
am
9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev
* commit '
9d92955894118a51e310fdfeeb09f5b1d187c37f':
Correctly skip files that are excluded from restore
Matthew Williams [Fri, 7 Aug 2015 21:25:31 +0000 (21:25 +0000)]
Merge "Correctly skip files that are excluded from restore" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 05:19:06 +0000 (22:19 -0700)]
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
Neil Fuller [Fri, 7 Aug 2015 21:16:51 +0000 (21:16 +0000)]
am
14b884c1: am
daf8d905: Merge "Add ICU as a java library for docs."
* commit '
14b884c16ecf3a70999fcbd1862f6f1b38b24367':
Add ICU as a java library for docs.
Paul McLean [Fri, 7 Aug 2015 18:50:48 +0000 (12:50 -0600)]
Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API.
Bug:
22729461
Change-Id: Ie581c385af2be16e61fcab5993391ef42f82a7d8
Shirish Kalele [Fri, 7 Aug 2015 20:30:38 +0000 (20:30 +0000)]
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
Shirish Kalele [Fri, 7 Aug 2015 20:25:06 +0000 (20:25 +0000)]
Merge "Fix check for caller being the active network scorer" into mnc-dev
Nicolas Prévot [Fri, 7 Aug 2015 19:33:23 +0000 (19:33 +0000)]
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.
Julia Reynolds [Fri, 7 Aug 2015 19:24:45 +0000 (19:24 +0000)]
am
9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev
* commit '
9dc4d50be1db82359050fd082828680bde44b9fd':
Update Navigation bar assets.
Nicolas Prévot [Fri, 7 Aug 2015 19:23:52 +0000 (19:23 +0000)]
Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev
Julia Reynolds [Fri, 7 Aug 2015 19:19:02 +0000 (19:19 +0000)]
Merge "Update Navigation bar assets." into mnc-dev
Paul Mclean [Fri, 7 Aug 2015 17:12:47 +0000 (17:12 +0000)]
Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."
This reverts commit
8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523.
Change-Id: I731d01fd652e928ba331fa28bb09cc8234753fbf
Jason Monk [Fri, 7 Aug 2015 18:47:06 +0000 (18:47 +0000)]
am
69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '
69ed33087d77e32a1f1475adf00b9d87580960aa':
Allow system to disable lockscreen
Jason Monk [Fri, 7 Aug 2015 18:40:19 +0000 (18:40 +0000)]
Merge "Allow system to disable lockscreen" into mnc-dev
Billy Lau [Sat, 1 Aug 2015 11:45:02 +0000 (12:45 +0100)]
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
Amith Yamasani [Fri, 7 Aug 2015 18:28:09 +0000 (18:28 +0000)]
am
1fbc1b3b: Merge "Fix partial user cleanup on restart" into mnc-dev
* commit '
1fbc1b3b4b742cdba25d32d65a9813933a37005f':
Fix partial user cleanup on restart
Amith Yamasani [Fri, 7 Aug 2015 18:21:30 +0000 (18:21 +0000)]
Merge "Fix partial user cleanup on restart" into mnc-dev
Chris Tate [Fri, 7 Aug 2015 18:20:36 +0000 (18:20 +0000)]
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
Dianne Hackborn [Fri, 7 Aug 2015 18:16:13 +0000 (18:16 +0000)]
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
Chris Tate [Fri, 7 Aug 2015 18:15:19 +0000 (18:15 +0000)]
Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev
Nicolas Prevot [Fri, 7 Aug 2015 18:11:25 +0000 (19:11 +0100)]
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
Amith Yamasani [Fri, 7 Aug 2015 18:09:05 +0000 (11:09 -0700)]
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
Dianne Hackborn [Fri, 7 Aug 2015 18:06:01 +0000 (18:06 +0000)]
Merge "Debugging for issue #
22556778: Starting under voice control not allowed" into mnc-dev
Julia Reynolds [Fri, 7 Aug 2015 17:56:08 +0000 (13:56 -0400)]
Update Navigation bar assets.
Bug:
22855920
Change-Id: I2d66bb087b092cdb6280e78c064f32ae9e42ad61
Christopher Tate [Fri, 7 Aug 2015 17:57:01 +0000 (10:57 -0700)]
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
Dianne Hackborn [Fri, 7 Aug 2015 17:37:21 +0000 (10:37 -0700)]
Debugging for issue #
22556778: Starting under voice control not allowed
Better error messages in log to explain what is going on.
Change-Id: Ie686a323ceedd42453b6581fe79653b407d49ee5
Dianne Hackborn [Fri, 7 Aug 2015 17:26:11 +0000 (17:26 +0000)]
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
Dianne Hackborn [Fri, 7 Aug 2015 17:18:11 +0000 (17:18 +0000)]
Merge "Fix issue #
22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev