Fyodor Kupolov
5ddefc174c
am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
...
* commit 'a5e25f33a530eb76c7b0fb77111eeedd6bd1f879':
Added ACCESS_COARSE_LOCATION permission for BT
2015-07-24 18:03:15 +00:00
Fyodor Kupolov
a5e25f33a5
Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
2015-07-24 17:54:14 +00:00
Andrei Stingaceanu
da90571750
am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
...
* commit '45794910031ce2a0e2df3d1694783da7e3c4352b':
Disallow dragging text in extracted mode
2015-07-24 14:47:50 +00:00
Julia Reynolds
71a7651abd
am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
...
* commit 'ea00f320ee9caad53d63a3eaaee2d4733c9dca50':
Prevent lockscreen album art from flickering on metadata change.
2015-07-24 14:47:39 +00:00
Andrei Stingaceanu
4579491003
Merge "Disallow dragging text in extracted mode" into mnc-dev
2015-07-24 14:35:48 +00:00
Julia Reynolds
ea00f320ee
Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
2015-07-24 14:34:02 +00:00
Jim Miller
a8bc790a60
am abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
...
* commit 'abd35bfc81ae231656c6fba67d43cfbb76f3db0d':
Add FEATURE_FINGERPRINT to PackageManager's feature list
2015-07-24 02:50:12 +00:00
Jim Miller
abd35bfc81
Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev
2015-07-24 02:41:00 +00:00
Ying Wang
25e10e353d
am 802da28f: am 430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
...
* commit '802da28f22f2869c810531b95ac90f7fa446df93':
Add phony source target in the generated dependency file of aidl.
2015-07-24 01:11:22 +00:00
Jean-Michel Trivi
e14a2f3355
am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
...
* commit '7b9968538b122225bb321de9995a8f55d3de4455':
MediaPlayer subtitle controller: use debug log instead of warning
2015-07-24 01:02:48 +00:00
John Reck
549dfccc35
am 6b66a4a8: use findProcess instead of getProcess
...
* commit '6b66a4a8a342b8156f73d83771caa1db2f866529':
use findProcess instead of getProcess
2015-07-24 01:02:41 +00:00
Ying Wang
802da28f22
am 430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
...
* commit '430c8c3e48b361f75d29d05b8fda3aac22ceb1f9':
Add phony source target in the generated dependency file of aidl.
2015-07-24 00:54:53 +00:00
Jean-Michel Trivi
7b9968538b
Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
2015-07-24 00:46:15 +00:00
Ying Wang
430c8c3e48
Merge "Add phony source target in the generated dependency file of aidl."
2015-07-24 00:38:08 +00:00
John Reck
6b66a4a8a3
use findProcess instead of getProcess
...
Bug: 22701182
Change-Id: I2ec56c55c49401f2f213bbd318e867fd73b37672
2015-07-24 00:37:23 +00:00
Amit Mahajan
83c7c06d05
am eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev
...
* commit 'eea9892d9ec24a5a9c4911efec8fe28e3d1af968':
UICC : discard language setting of SIM
2015-07-24 00:12:16 +00:00
Adrian Roos
30a03425b2
am 0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
...
* commit '0063e0bcd55d1ed3b6c37c6616c0c858e0784a07':
Disable Keyguard affordances before setup is completed
2015-07-24 00:02:22 +00:00
Svetoslav Ganov
056b71c05f
am 28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev
...
* commit '28762e61e2e45a7e30af02c6fa840a065a645b68':
Keep default permission grants uninstalling a sys package upgrade
2015-07-24 00:02:14 +00:00
John Reck
1f4b21b94c
am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
...
* commit '8b1154c487c25388107dc024376435f3b0ae2385':
Move updateMatrix() call to animateCommon
2015-07-24 00:02:08 +00:00
Deepanshu Gupta
fe4ff64a3b
am f199ac84: Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev
...
* commit 'f199ac84f39ee92f314f5c8740b13a21a14fada9':
Set support flag for custom layouts for RecyclerView.
2015-07-24 00:01:59 +00:00
Amit Mahajan
eea9892d9e
Merge "UICC : discard language setting of SIM" into mnc-dev
2015-07-23 23:59:40 +00:00
Adrian Roos
0063e0bcd5
Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
2015-07-23 23:56:37 +00:00
Svetoslav Ganov
28762e61e2
Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev
2015-07-23 23:56:31 +00:00
John Reck
8b1154c487
Merge "Move updateMatrix() call to animateCommon" into mnc-dev
2015-07-23 23:48:40 +00:00
Svet Ganov
315c4ac1b6
Keep default permission grants uninstalling a sys package upgrade
...
bug:22665508
Change-Id: I1cb1e53a8643ddad77f0be9e40d5b504501e06de
2015-07-23 16:47:40 -07:00
Deepanshu Gupta
f199ac84f3
Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev
2015-07-23 23:47:10 +00:00
Deepanshu Gupta
f7712d3524
Set support flag for custom layouts for RecyclerView.
...
Change-Id: I3a0349c0482ae45e226b2016a0f24707c85edff4
2015-07-23 16:40:23 -07:00
Yohei Yukawa
0e235f4753
am 0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev
...
* commit '0526ee529812b4fd9743aa46d87198043a59d2ab':
Don't rely on broadcast intent for waking up input method.
2015-07-23 23:40:06 +00:00
Yohei Yukawa
0526ee5298
Merge "Don't rely on broadcast intent for waking up input method." into mnc-dev
2015-07-23 23:24:58 +00:00
Deepanshu Gupta
b8719e27eb
am 49fcfdd4: Merge changes I9c294329,Ie4db5d28 into mnc-dev
...
* commit '49fcfdd4ba6b9e19139b0650542d573cf493dc5b':
LayoutLib: translucent sys ui bars
Move the layout code out of RenderSessionImpl.
2015-07-23 23:18:48 +00:00
Deepanshu Gupta
a6d25c84cd
am f33c0f85: Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev
...
* commit 'f33c0f8516768b0259c750fdb14946f5a9b68647':
CalendarView rendering: use R.styleable to find attr.
2015-07-23 23:18:41 +00:00
Jean-Michel Trivi
cab361c9bb
MediaPlayer subtitle controller: use debug log instead of warning
...
Don't use warning log for debug message.
Bug 22698299
Change-Id: Ibe3526fffffc9a7bdcda83c02fd745325db1238b
2015-07-23 23:03:45 +00:00
Deepanshu Gupta
49fcfdd4ba
Merge changes I9c294329,Ie4db5d28 into mnc-dev
...
* changes:
LayoutLib: translucent sys ui bars
Move the layout code out of RenderSessionImpl.
2015-07-23 23:02:57 +00:00
Deepanshu Gupta
f33c0f8516
Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev
2015-07-23 23:02:46 +00:00
Stephen Hines
b3a1674a47
am ed3ffe0f: am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."
...
* commit 'ed3ffe0fc86de016ff2b4231e2fcc74a6119f6c7':
RenderScript: implement a Script entry point for calling a reduce-style kernel.
2015-07-23 22:54:59 +00:00
Deepanshu Gupta
fc8f4aad73
LayoutLib: translucent sys ui bars
...
Change-Id: I9c294329fc78418c505a5115bc9c07da29595af2
2015-07-23 15:54:26 -07:00
Tim Kilbourn
43250dd37f
am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
...
* commit 'a2bf7616044051769df86cf5f0bb4b21dedd5269':
Add a wm command to dismiss the keyguard.
2015-07-23 22:42:49 +00:00
Svetoslav Ganov
29e3f76669
am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
...
* commit '607bc34f93a8c074d1982861273d210291eae34d':
Reset permissions and app links when clearing app preferences - framework
2015-07-23 22:42:42 +00:00
Svetoslav Ganov
bb8bdd7168
am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
...
* commit '258e630a6bc876c57ac97c6da3e5414d0e7eb036':
Shut down UiAutomationConnection without a lock held
2015-07-23 22:42:35 +00:00
Tim Kilbourn
99bad6f0c7
am cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev
...
* commit 'cc855ad737e61fc02a057e811f2e6e34bbff0e37':
Properly synchronize interactivity state.
2015-07-23 22:42:20 +00:00
Jason Monk
dbb0f24cd0
am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
...
* commit '157ad64dbeedd43a444d3eb1cc538ee975ed2d59':
Fix emergency only when no sims
2015-07-23 22:42:14 +00:00
Julia Reynolds
621b487003
am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev
...
* commit 'c2df1ab48d4d12fc0e1f68fe6b5cc505e681b9f4':
Set 'the' media notification to the notification actually playing.
2015-07-23 22:42:03 +00:00
Jorim Jaggi
09596431d0
am 1d071ce9: Make sure expandingFinished gets called when going into QS
...
* commit '1d071ce9b1810fbcf231fd17c4cb5621e68ff419':
Make sure expandingFinished gets called when going into QS
2015-07-23 22:41:46 +00:00
Stephen Hines
ed3ffe0fc8
am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."
...
* commit '6430812a9381af01b0c7b48cedd6a11c1add6942':
RenderScript: implement a Script entry point for calling a reduce-style kernel.
2015-07-23 22:39:29 +00:00
John Reck
49dec430e8
Move updateMatrix() call to animateCommon
...
Bug: 22667315
HWUI internally always assumes that RenderNode->properties()
has a fully-baked matrix. However, RenderThread animations violate
this and will perform an update of that matrix after they run. This
was missing in the fallback scenario where an animation was
running on a View that is detached from the tree.
If a RenderThread animation is started on an attached view, it becomes
detached, and is then re-attached it will crash in the staging
properties push. The fix for this is to move the call to updateMatrix
from animate() to animateCommon() so that the animateNoDamage()
path will similarly perform the necessary matrix update.
Change-Id: I4c899a6f68659342a6515f1d7f20d3c4af65caf0
2015-07-23 22:37:21 +00:00
duho.ro
6b711c9230
UICC : discard language setting of SIM
...
Some carrier card has incorrect language file.
This is to disable loading language setting from SIM card.
BUG=22255379
Change-Id: I217a530758c8f9b3ee85c8a277096155e95bb060
2015-07-23 15:36:03 -07:00
Stephen Hines
6430812a93
Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."
2015-07-23 22:26:05 +00:00
Yohei Yukawa
fa6e0a80e2
Don't rely on broadcast intent for waking up input method.
...
Basically this is a copy of Iabef96921dd554ce3768fb18619cefc
for InputMethodManagerService.
As described in JavaDoc of Intent#ACTION_SCREEN_OFF and
Intent#ACTION_SCREEN_ON, one can use those Intents to be
notified when the device becomes non-interactive and
interactive. IMMS has relied on them to enable and disable
InputConnection between the IME and the application so as not
to allow IMEs to update text when the user does not present.
This is actually our design goal as documented in JavaDoc of
InputMethodManager.
An IME can never interact with an InputConnection while
the screen is off. This is enforced by making all clients
inactive while the screen is off, and prevents bad IMEs from
driving the UI when the user can not be aware of its
behavior.
The goal of this CL is to improve the timeliness of above
mechianism by introducing a direct communication channel from
PowerManagerService to InputMethodManagerService via Notifier.
Actually this is what InputManager has been doing since
Iabef96921dd554ce3768fb18619cefc3230b5fb0.
Reasons behind this change are:
1. There are several bugreports that imply those Intents can
dispatch tens of seconds after it is enqueued. This is
indeed problematic because the user cannot type password
to unlock their devices until queued
Intent#ACTION_SCREEN_ON is dispatched. This CL addresses
such an issue without waiting for figuring out the root
cause of the delay.
2. Intent#ACTION_SCREEN_OFF and Intent#ACTION_SCREEN_ON are
sent as a ordered broadcast, which may not be suitable for
tasks that require a certain level of timeliness, and what
IMMS wants is to enable users to start typing immediately
after the system.
This CL was originally authored by Seigo Nonaka.
Bug: 22423200
Bug: 22555778
Change-Id: I747c37ff6dd8f233faef43f2b5713a4320e848eb
2015-07-23 15:08:59 -07:00
Tim Kilbourn
a2bf761604
Merge "Add a wm command to dismiss the keyguard." into mnc-dev
2015-07-23 21:58:01 +00:00
Tim Kilbourn
f40c66d1a1
Add a wm command to dismiss the keyguard.
...
If the user has a screen lock, the user is prompted to authenticate.
Otherwise the keyguard is dismissed.
Bug: 22694837
Change-Id: I783fc6f08fb21977aa4f1e884b0a4354a3154805
2015-07-23 14:51:41 -07:00