OSDN Git Service
Elliott Hughes [Wed, 12 Aug 2015 23:21:56 +0000 (23:21 +0000)]
am
39669d7f: am
6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
* commit '
39669d7f6b8fedef3468ab3d417c93a21df528af':
Lose HAVE_ANDROID_OS from frameworks/base.
Elliott Hughes [Wed, 12 Aug 2015 22:31:01 +0000 (22:31 +0000)]
am
6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
* commit '
6fdc633380bb4744595575449101ee171b690175':
Lose HAVE_ANDROID_OS from frameworks/base.
Elliott Hughes [Wed, 12 Aug 2015 22:21:46 +0000 (22:21 +0000)]
Merge "Lose HAVE_ANDROID_OS from frameworks/base."
Elliott Hughes [Wed, 12 Aug 2015 21:49:53 +0000 (14:49 -0700)]
Lose HAVE_ANDROID_OS from frameworks/base.
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
Raph Levien [Wed, 12 Aug 2015 21:08:13 +0000 (21:08 +0000)]
am
beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
* commit '
beabcb92cbdec6f68bd712c9972e6f8377b78f46':
Fix Insertion ActionMode not showing on RTL languages
Raph Levien [Wed, 12 Aug 2015 21:00:07 +0000 (21:00 +0000)]
Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
Eino-Ville Talvala [Wed, 12 Aug 2015 20:12:35 +0000 (20:12 +0000)]
am
242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
* commit '
242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
Camera: Fix framework bugs with DEPTH-only camera devices
Clara Bayarri [Wed, 12 Aug 2015 18:46:47 +0000 (19:46 +0100)]
Fix Insertion ActionMode not showing on RTL languages
When long pressing on an empty Text field with the system language set
to RTL, the "paste" popup was not showing up.
The Floating Toolbar requires a content rect to determine where the
text is and place itself close to it. In the case of an empty field,
we create a "fake" content rect by taking the placement of the cursor
+1 pixel to the right. In RTL languages, this +1 causes the content
rect to be considered off the bounds of the view, as the cursor is
aligned to the right, and hence the Floating Toolbar is hidden.
After making the rect a 0 width rect, we ran into the issue that
it was considered out of bounds due to the calculation ignoring rects
that simply touch the edge of the view's bounds.
BUG:
22540083
Change-Id: I29c79b701f586970b2611178233eff082b802ec1
Eino-Ville Talvala [Wed, 12 Aug 2015 20:01:44 +0000 (20:01 +0000)]
Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:59:00 +0000 (18:59 +0000)]
am
ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
* commit '
ad285c169fd55bee8feef6e076a6710c357043e5':
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
Mike Dodd [Wed, 12 Aug 2015 18:53:48 +0000 (18:53 +0000)]
Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:48:31 +0000 (18:48 +0000)]
Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."
This reverts commit
3a24898f5553e72589eaba3aeb5ef8f63909dd64.
Change-Id: I86de9a7fe9f72748c7ac33d9df7fd1fbd8007f7c
Adrian Roos [Wed, 12 Aug 2015 18:14:06 +0000 (18:14 +0000)]
am
c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev
* commit '
c0a4883d58554c84d10911da20f43be149b47c53':
Prevent overlap of color views in landscape
Jason Monk [Wed, 12 Aug 2015 18:07:33 +0000 (18:07 +0000)]
am
0c762957: Merge "Fix tuner for secondary users" into mnc-dev
* commit '
0c7629579184f85d36a4854e7c6f5b81f5b7299e':
Fix tuner for secondary users
Adrian Roos [Wed, 12 Aug 2015 18:06:42 +0000 (18:06 +0000)]
Merge "Prevent overlap of color views in landscape" into mnc-dev
Jason Monk [Wed, 12 Aug 2015 17:59:22 +0000 (17:59 +0000)]
Merge "Fix tuner for secondary users" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 17:34:56 +0000 (17:34 +0000)]
am
7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
* commit '
7f2f96cce3f1663e3c1dccdde2c0f196b2b16e72':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
Todd Kennedy [Wed, 12 Aug 2015 17:34:50 +0000 (17:34 +0000)]
am
24e4d48f: Merge "Promote system app permissions" into mnc-dev
* commit '
24e4d48f56a6fca6974c5670b88a7b4da2180331':
Promote system app permissions
Michael Wright [Wed, 12 Aug 2015 17:34:43 +0000 (17:34 +0000)]
am
e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev
* commit '
e20493ea5affdc417db1fc3fbb527781d6e51612':
Log last filtered sensor timestamp.
Mike Dodd [Wed, 12 Aug 2015 17:01:25 +0000 (17:01 +0000)]
Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
Todd Kennedy [Wed, 12 Aug 2015 16:51:13 +0000 (16:51 +0000)]
Merge "Promote system app permissions" into mnc-dev
Michael Wright [Wed, 12 Aug 2015 16:32:11 +0000 (16:32 +0000)]
Merge "Log last filtered sensor timestamp." into mnc-dev
Michael Wright [Wed, 12 Aug 2015 14:35:31 +0000 (15:35 +0100)]
Log last filtered sensor timestamp.
Bug:
22870354
Change-Id: Ib4efaa0f05bec81856c939c5c640eceff98d88ed
Todd Kennedy [Wed, 12 Aug 2015 15:26:15 +0000 (08:26 -0700)]
Promote system app permissions
When upgrading from a pre-M version of Android, install permissions for
exisiting system are promoted to runtime permissions. This only happens
for apps that existed prior to the OTA. Other system apps targeting M
are not automatically granted any permissions.
Bug:
22970710
Change-Id: I964ee3f93c66ea43fbb1be6b5ac6b09ddea3c385
Narayan Kamath [Wed, 12 Aug 2015 10:39:16 +0000 (10:39 +0000)]
am
bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.
* commit '
bf88205bef88f78ade5c6830e6203aa343387820':
Fall back to persist.sys.language/country if locale isn't set.
Narayan Kamath [Tue, 11 Aug 2015 14:40:34 +0000 (15:40 +0100)]
Fall back to persist.sys.language/country if locale isn't set.
This will prevent users from losing their language setting when they
take an OTA to M.
bug:
23021286
Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
Alex Klyubin [Wed, 12 Aug 2015 05:47:51 +0000 (05:47 +0000)]
am
e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev
* commit '
e19b76cbb50db816c535d6d4a5bf125f52c04eba':
Add more examples of generating/importing keys to Javadocs.
Alex Klyubin [Wed, 12 Aug 2015 05:42:29 +0000 (05:42 +0000)]
Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev
Lorenzo Colitti [Wed, 12 Aug 2015 03:44:11 +0000 (03:44 +0000)]
am
e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev
* commit '
e022cb085f6ebc2801f843bb47c9fd23f6daa3ea':
Don't attempt to stop the receive thread if we never started it.
Lorenzo Colitti [Wed, 12 Aug 2015 03:38:57 +0000 (03:38 +0000)]
Merge "Don't attempt to stop the receive thread if we never started it." into mnc-dev
Carlos Valdivia [Wed, 12 Aug 2015 01:47:42 +0000 (01:47 +0000)]
am
968fc3ab: Merge "Fix deadlock." into mnc-dev
* commit '
968fc3ab75b0de71f298c6241cab1be1e6d5c86e':
Fix deadlock.
Carlos Valdivia [Wed, 12 Aug 2015 01:42:19 +0000 (01:42 +0000)]
Merge "Fix deadlock." into mnc-dev
Julia Reynolds [Wed, 12 Aug 2015 01:25:54 +0000 (01:25 +0000)]
am
77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev
* commit '
77b0d6e9f001c5e08fa367bff3b3e501ab36cc77':
New landscape Navigation bar icons.
Julia Reynolds [Wed, 12 Aug 2015 01:19:01 +0000 (01:19 +0000)]
Merge "New landscape Navigation bar icons." into mnc-dev
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
Adrian Roos [Wed, 12 Aug 2015 00:36:43 +0000 (17:36 -0700)]
Prevent overlap of color views in landscape
Removes overlap from the color views which resulted in subotimal looks
when both color views were translucent and the nav bar was on the right
edge.
Also fixes a bug introduced in I2df7092a91eceeb815367ef917dd7289f4f2b27e
where the navigation-bar-on-right-side case got forgotten and caused
flickering in landscape when IMMERSIVE_STICKY was set but the navigation bar
was visible.
Bug:
22876533
Change-Id: I449a82eb3dc3f7b5051f26b37b362a196b4ff63a
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
Carlos Valdivia [Tue, 11 Aug 2015 01:40:06 +0000 (18:40 -0700)]
Fix deadlock.
AccountManagerService can't ever synchronize on mUsers within a block of
code locked by UserAccounts.cacheLock. That will lead to deadlocks.
This change fixes a case where we were doing that in
getAccountsInternal(). Also I have purgeOldGrantsAll() run off the the
main thread.
Bug:
23036400
Change-Id: I8634691ca54c57a6e83633baba549226fdcd1064
Eino-Ville Talvala [Tue, 11 Aug 2015 20:33:37 +0000 (13:33 -0700)]
Camera: Fix framework bugs with DEPTH-only camera devices
Mostly due to no standard stream configurations being defined,
and for the correct overrides for DEPTH_POINT_CLOUD format.
Bug:
20537722
Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
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
Mike Dodd [Tue, 11 Aug 2015 20:14:53 +0000 (13:14 -0700)]
Set default SMS/MMS app to com.android.messaging (new AOSP app).
b/
23110861
Change-Id: I5ac753264222cb617027cf13527178a7e754a80b
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
Julia Reynolds [Tue, 11 Aug 2015 14:33:04 +0000 (10:33 -0400)]
New landscape Navigation bar icons.
Bug:
22855920
Change-Id: I5127c8d0121aa90a1e52da1b51a86bac1c1b2fa1
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
Alex Klyubin [Tue, 11 Aug 2015 13:41:13 +0000 (06:41 -0700)]
Add more examples of generating/importing keys to Javadocs.
Based on developer feedback, this updates Android Keystore Javadocs
with more examples of generating and importing keys of various
algorithms. This also clarifies that key use authorizations apply to
secret and private key and do no apply to public keys.
Bug:
23102874
Change-Id: If0dc20fda4836fd23b9cd9c92490a04e71b19fc0
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
Jason Monk [Tue, 11 Aug 2015 18:18:14 +0000 (14:18 -0400)]
Fix tuner for secondary users
Bug:
23112000
Change-Id: I52aabdd1f345fb50e2c5015d233f4de3cc8d994d
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
Lorenzo Colitti [Tue, 11 Aug 2015 06:42:59 +0000 (15:42 +0900)]
Don't attempt to stop the receive thread if we never started it.
If socket initialization fails, DhcpState#exit will call
mReceiveThread#stop and crash the system with an NPE. Make sure
we don't do that if mReceiveThread is null, and properly null it
out when exiting.
Bug:
23088314
Change-Id: I4378d8280f9d8588f5eaa8bd7ade61beab1c3ce2
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.