OSDN Git Service
Jean-Michel Trivi [Fri, 24 Jul 2015 01:02:48 +0000 (01:02 +0000)]
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
John Reck [Fri, 24 Jul 2015 01:02:41 +0000 (01:02 +0000)]
am
6b66a4a8: use findProcess instead of getProcess
* commit '
6b66a4a8a342b8156f73d83771caa1db2f866529':
use findProcess instead of getProcess
Jean-Michel Trivi [Fri, 24 Jul 2015 00:46:15 +0000 (00:46 +0000)]
Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
John Reck [Fri, 24 Jul 2015 00:36:13 +0000 (17:36 -0700)]
use findProcess instead of getProcess
Bug:
22701182
Change-Id: I2ec56c55c49401f2f213bbd318e867fd73b37672
Amit Mahajan [Fri, 24 Jul 2015 00:12:16 +0000 (00:12 +0000)]
am
eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev
* commit '
eea9892d9ec24a5a9c4911efec8fe28e3d1af968':
UICC : discard language setting of SIM
Adrian Roos [Fri, 24 Jul 2015 00:02:22 +0000 (00:02 +0000)]
am
0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
* commit '
0063e0bcd55d1ed3b6c37c6616c0c858e0784a07':
Disable Keyguard affordances before setup is completed
Svetoslav Ganov [Fri, 24 Jul 2015 00:02:14 +0000 (00:02 +0000)]
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
John Reck [Fri, 24 Jul 2015 00:02:08 +0000 (00:02 +0000)]
am
8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
* commit '
8b1154c487c25388107dc024376435f3b0ae2385':
Move updateMatrix() call to animateCommon
Deepanshu Gupta [Fri, 24 Jul 2015 00:01:59 +0000 (00:01 +0000)]
am
f199ac84: Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev
* commit '
f199ac84f39ee92f314f5c8740b13a21a14fada9':
Set support flag for custom layouts for RecyclerView.
Amit Mahajan [Thu, 23 Jul 2015 23:59:40 +0000 (23:59 +0000)]
Merge "UICC : discard language setting of SIM" into mnc-dev
Adrian Roos [Thu, 23 Jul 2015 23:56:37 +0000 (23:56 +0000)]
Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
Svetoslav Ganov [Thu, 23 Jul 2015 23:56:31 +0000 (23:56 +0000)]
Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev
John Reck [Thu, 23 Jul 2015 23:48:40 +0000 (23:48 +0000)]
Merge "Move updateMatrix() call to animateCommon" into mnc-dev
Svet Ganov [Thu, 23 Jul 2015 23:44:05 +0000 (16:44 -0700)]
Keep default permission grants uninstalling a sys package upgrade
bug:
22665508
Change-Id: I1cb1e53a8643ddad77f0be9e40d5b504501e06de
Deepanshu Gupta [Thu, 23 Jul 2015 23:47:10 +0000 (23:47 +0000)]
Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev
Deepanshu Gupta [Thu, 23 Jul 2015 23:40:23 +0000 (16:40 -0700)]
Set support flag for custom layouts for RecyclerView.
Change-Id: I3a0349c0482ae45e226b2016a0f24707c85edff4
Yohei Yukawa [Thu, 23 Jul 2015 23:40:06 +0000 (23:40 +0000)]
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.
Yohei Yukawa [Thu, 23 Jul 2015 23:24:58 +0000 (23:24 +0000)]
Merge "Don't rely on broadcast intent for waking up input method." into mnc-dev
Deepanshu Gupta [Thu, 23 Jul 2015 23:18:48 +0000 (23:18 +0000)]
am
49fcfdd4: Merge changes I9c294329,Ie4db5d28 into mnc-dev
* commit '
49fcfdd4ba6b9e19139b0650542d573cf493dc5b':
LayoutLib: translucent sys ui bars
Move the layout code out of RenderSessionImpl.
Deepanshu Gupta [Thu, 23 Jul 2015 23:18:41 +0000 (23:18 +0000)]
am
f33c0f85: Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev
* commit '
f33c0f8516768b0259c750fdb14946f5a9b68647':
CalendarView rendering: use R.styleable to find attr.
Jean-Michel Trivi [Thu, 23 Jul 2015 17:53:37 +0000 (10:53 -0700)]
MediaPlayer subtitle controller: use debug log instead of warning
Don't use warning log for debug message.
Bug
22698299
Change-Id: Ibe3526fffffc9a7bdcda83c02fd745325db1238b
Deepanshu Gupta [Thu, 23 Jul 2015 23:02:57 +0000 (23:02 +0000)]
Merge changes I9c294329,Ie4db5d28 into mnc-dev
* changes:
LayoutLib: translucent sys ui bars
Move the layout code out of RenderSessionImpl.
Deepanshu Gupta [Thu, 23 Jul 2015 23:02:46 +0000 (23:02 +0000)]
Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev
Stephen Hines [Thu, 23 Jul 2015 22:54:59 +0000 (22:54 +0000)]
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.
Deepanshu Gupta [Thu, 23 Jul 2015 18:35:25 +0000 (11:35 -0700)]
LayoutLib: translucent sys ui bars
Change-Id: I9c294329fc78418c505a5115bc9c07da29595af2
Tim Kilbourn [Thu, 23 Jul 2015 22:42:49 +0000 (22:42 +0000)]
am
a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit '
a2bf7616044051769df86cf5f0bb4b21dedd5269':
Add a wm command to dismiss the keyguard.
Svetoslav Ganov [Thu, 23 Jul 2015 22:42:42 +0000 (22:42 +0000)]
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
Svetoslav Ganov [Thu, 23 Jul 2015 22:42:35 +0000 (22:42 +0000)]
am
258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
* commit '
258e630a6bc876c57ac97c6da3e5414d0e7eb036':
Shut down UiAutomationConnection without a lock held
Tim Kilbourn [Thu, 23 Jul 2015 22:42:20 +0000 (22:42 +0000)]
am
cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev
* commit '
cc855ad737e61fc02a057e811f2e6e34bbff0e37':
Properly synchronize interactivity state.
Jason Monk [Thu, 23 Jul 2015 22:42:14 +0000 (22:42 +0000)]
am
157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
* commit '
157ad64dbeedd43a444d3eb1cc538ee975ed2d59':
Fix emergency only when no sims
Julia Reynolds [Thu, 23 Jul 2015 22:42:03 +0000 (22:42 +0000)]
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.
Jorim Jaggi [Thu, 23 Jul 2015 22:41:46 +0000 (22:41 +0000)]
am
1d071ce9: Make sure expandingFinished gets called when going into QS
* commit '
1d071ce9b1810fbcf231fd17c4cb5621e68ff419':
Make sure expandingFinished gets called when going into QS
Stephen Hines [Thu, 23 Jul 2015 22:39:29 +0000 (22:39 +0000)]
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.
John Reck [Thu, 23 Jul 2015 22:33:12 +0000 (15:33 -0700)]
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
duho.ro [Thu, 16 Jul 2015 11:05:00 +0000 (20:05 +0900)]
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
Stephen Hines [Thu, 23 Jul 2015 22:26:05 +0000 (22:26 +0000)]
Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."
Yohei Yukawa [Thu, 23 Jul 2015 22:08:59 +0000 (15:08 -0700)]
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
Tim Kilbourn [Thu, 23 Jul 2015 21:58:01 +0000 (21:58 +0000)]
Merge "Add a wm command to dismiss the keyguard." into mnc-dev
Tim Kilbourn [Thu, 23 Jul 2015 21:51:41 +0000 (14:51 -0700)]
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
Svetoslav Ganov [Thu, 23 Jul 2015 21:46:53 +0000 (21:46 +0000)]
Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev
Svetoslav Ganov [Thu, 23 Jul 2015 21:44:58 +0000 (21:44 +0000)]
Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
Tim Kilbourn [Thu, 23 Jul 2015 20:39:44 +0000 (20:39 +0000)]
Merge "Properly synchronize interactivity state." into mnc-dev
Jason Monk [Thu, 23 Jul 2015 20:24:32 +0000 (20:24 +0000)]
Merge "Fix emergency only when no sims" into mnc-dev
Julia Reynolds [Thu, 23 Jul 2015 20:08:33 +0000 (20:08 +0000)]
Merge "Set 'the' media notification to the notification actually playing." into mnc-dev
Kenny Root [Thu, 23 Jul 2015 19:06:26 +0000 (19:06 +0000)]
Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev-plus-aosp
Colin Cross [Thu, 23 Jul 2015 19:01:39 +0000 (19:01 +0000)]
am
bbcc914b: am
01efd7e8: Merge "Use build_number from file"
* commit '
bbcc914b18a5b2ea57e25e6e79336c5c75d49421':
Use build_number from file
Wenchao Tong [Thu, 23 Jul 2015 19:00:33 +0000 (19:00 +0000)]
am
bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev
* commit '
bf3a24d5ec004a46cc75b947226fb7c23e4a0ed1':
Ignore the active network scorer when checking for idleness
John Reck [Thu, 23 Jul 2015 19:00:24 +0000 (19:00 +0000)]
am
2abf0f24: Fix a race condition that could cause lockup
* commit '
2abf0f24af60b8644d5b61eed9666793083546ee':
Fix a race condition that could cause lockup
Amith Yamasani [Thu, 23 Jul 2015 19:00:17 +0000 (19:00 +0000)]
am
b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev
* commit '
b3e407609f567884f9322e7b34461baa14e3f3ae':
Avoid a deadlock between PMS and AppOpsService
Alex Klyubin [Thu, 23 Jul 2015 19:00:09 +0000 (19:00 +0000)]
am
304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev
* commit '
304b01c2493f16c2537563b3e00e4770765942a2':
Document what algorithms Android Keystore supports.
Junda Liu [Thu, 23 Jul 2015 19:00:01 +0000 (19:00 +0000)]
am
859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
* commit '
859551f7c0acdc8fa9f9d5ffaf0efc69441d5e47':
Remove volte_feature_disabled as carrier config handled it.
Jean-Michel Trivi [Thu, 23 Jul 2015 18:59:54 +0000 (18:59 +0000)]
am
7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
* commit '
7f9e9012f4bbcdd880e16212be9d90b50607c74d':
RingtoneManager: query results depend on caller permission
Jack Yu [Thu, 23 Jul 2015 18:59:47 +0000 (18:59 +0000)]
am
e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
* commit '
e21722a3daf0562bb7711d3dd38657b5a348ce4e':
Allow carriers to force disable ETWS/CMAS test messages.
Geoff Mendal [Thu, 23 Jul 2015 18:59:40 +0000 (18:59 +0000)]
am
13edc160: (-s ours) Import translations. DO NOT MERGE
* commit '
13edc1609ed634130720142045d47315a39ea037':
Import translations. DO NOT MERGE
Nick Kralevich [Thu, 23 Jul 2015 18:59:33 +0000 (18:59 +0000)]
am
06b93a48: Merge "Revert "UsbDeviceManager: fix b/
21429947 regression"" into mnc-dev
* commit '
06b93a48ad0d2274ff41683e08b8a1429045b0a9':
Revert "UsbDeviceManager: fix b/
21429947 regression"
Svetoslav Ganov [Thu, 23 Jul 2015 18:59:25 +0000 (18:59 +0000)]
am
492fc648: Merge "Grant record audio to system reco service by default" into mnc-dev
* commit '
492fc6483184a0e82d5d1a77634a38c10c7577ac':
Grant record audio to system reco service by default
Deepanshu Gupta [Wed, 22 Jul 2015 01:27:40 +0000 (18:27 -0700)]
Move the layout code out of RenderSessionImpl.
Also, switch to using a RelativeLayout from a LinearLayout. The change
will help in future when enabling transparent status and nav bar.
Change-Id: Ie4db5d28313f1c5ef775603788598a56409f92c7
Adam Lesinski [Thu, 23 Jul 2015 18:59:16 +0000 (18:59 +0000)]
am
f90ed330: Merge "UsageStats: Reduce log spam during time change" into mnc-dev
* commit '
f90ed330a0c7f54b963ef651a53be946f6d463ce':
UsageStats: Reduce log spam during time change
Deepanshu Gupta [Fri, 17 Jul 2015 01:32:54 +0000 (18:32 -0700)]
CalendarView rendering: use R.styleable to find attr.
Not all attr are added to R.attr. This results in some attr not being
found and hence a broken rendering. Fix the issue by adding all attr
referenced in R.styleable to the map of attr before adding any remaining
values from R.attr.
Change-Id: I1ebf8a394b9e1edbf7490e011833d20a00d38317
Dianne Hackborn [Thu, 23 Jul 2015 18:59:08 +0000 (18:59 +0000)]
am
4a368659: Merge "Fix issue #
22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev
* commit '
4a368659baf8f86b522a6b2679bb2b2a9fd0a997':
Fix issue #
22414729: Checkin start clock time is different from hsitory reset time
Adrian Roos [Thu, 23 Jul 2015 18:59:01 +0000 (18:59 +0000)]
am
f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev
* commit '
f21706440499df8076f6cd14955e09cb461baf2d':
Fix cut off charging indication in certain scripts
Dianne Hackborn [Thu, 23 Jul 2015 18:58:53 +0000 (18:58 +0000)]
am
5507bb41: Merge "Fix issue #
22653116: Google App crashing on NYT app" into mnc-dev
* commit '
5507bb41b0cb11fe36573d59dc4ec8ed03cf7715':
Fix issue #
22653116: Google App crashing on NYT app
Svetoslav Ganov [Thu, 23 Jul 2015 18:58:46 +0000 (18:58 +0000)]
am
41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev
* commit '
41a62e111d8de8e64ffc61c176add6cc6217b960':
Do not show normal permissions in sideloading UI
Fyodor Kupolov [Thu, 23 Jul 2015 18:58:38 +0000 (18:58 +0000)]
am
a0a71d8a: Merge "Fixed a typo" into mnc-dev
* commit '
a0a71d8a221d4f3896c7b0d3b2b87eba4e7a77f7':
Fixed a typo
Adam Lesinski [Thu, 23 Jul 2015 18:58:31 +0000 (18:58 +0000)]
am
05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev
* commit '
05f5cb45997fdc8831798bb84e50854cdfab2bcb':
UsageStats: Gracefully handle corrupt filenames
Adrian Roos [Thu, 23 Jul 2015 18:58:23 +0000 (18:58 +0000)]
am
7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev
* commit '
7748ea5fcd0fc32eeae1475e1871835a5aa39a5a':
Protect demo mode commands with permission
Jae Seo [Thu, 23 Jul 2015 18:58:16 +0000 (18:58 +0000)]
am
eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev
* commit '
eec3d9e368328d6ca6942ae2fbd94711ecd7adc8':
TIF: Enable hardware acceleration on overlay
Svetoslav Ganov [Thu, 23 Jul 2015 18:58:07 +0000 (18:58 +0000)]
am
3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev
* commit '
3d6f606031da248a3b1fd6f0f569ac33a26c0b5e':
Add a privileged permission to get user accounts
John Reck [Thu, 23 Jul 2015 18:58:00 +0000 (18:58 +0000)]
am
3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev
* commit '
3f2c51084b9d9578532c8a88e7a5444eeedc86c2':
Fix ATLAS_MAP_ENTRY_FIELD_COUNT
Adam Lesinski [Thu, 23 Jul 2015 18:57:52 +0000 (18:57 +0000)]
am
6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
* commit '
6625047a3ba26ecc52bb2757eb7576027949e435':
BatteryStats: Use English locale for dump and checkin data
Nick Kralevich [Thu, 23 Jul 2015 18:57:45 +0000 (18:57 +0000)]
am
3b0bbd7b: Merge "UsbDeviceManager: fix b/
21429947 regression" into mnc-dev
* commit '
3b0bbd7b96568f0d0121136fcac9d4e1a5ffd237':
UsbDeviceManager: fix b/
21429947 regression
Chris Wren [Thu, 23 Jul 2015 18:57:39 +0000 (18:57 +0000)]
am
db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
* commit '
db2b4ba69db391c3703277ccb986524c072be5f5':
Don't crash sysui when advisory calls fail.
Tim Kilbourn [Thu, 23 Jul 2015 18:57:32 +0000 (18:57 +0000)]
am
1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
* commit '
1aadfc2bc46a14b6c95dc45ec11c4191cac5062d':
Miss USB device Interface from UsbManager.getDeviceList().
Alan Viverette [Thu, 23 Jul 2015 18:57:24 +0000 (18:57 +0000)]
am
9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
* commit '
9478bf0e6f9618b8a5b844deaf548fc5ad1ff024':
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
Fyodor Kupolov [Thu, 23 Jul 2015 18:57:17 +0000 (18:57 +0000)]
am
5ef70b02: Merge "Added a note about location permission" into mnc-dev
* commit '
5ef70b02ead0a1e164370fefaff27bfd1ce0d492':
Added a note about location permission
xin He [Thu, 23 Jul 2015 18:57:10 +0000 (18:57 +0000)]
am
15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
* commit '
15a45e02c3372ad5deae0a260f782cd3e5a81d58':
Angler Should Not Use Channel 11 for SoftAP
Jeff Sharkey [Thu, 23 Jul 2015 18:57:02 +0000 (18:57 +0000)]
am
f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
* commit '
f6e9a3ede53ae487838c19714ad62f25a4a6ca4c':
More info to support CTS, fix reconcile bug.
Jason Monk [Thu, 23 Jul 2015 18:56:53 +0000 (18:56 +0000)]
am
4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
* commit '
4fc1b707442451f4a826929fc7e72967d443c73f':
Add metrics to tuner
Move tuner enable point to QS
Jorim Jaggi [Thu, 23 Jul 2015 18:56:47 +0000 (18:56 +0000)]
am
ac73f1ef: Partially fix that beginning of animation is skipped
* commit '
ac73f1efea0cb23881571e18e87ffc7f388af7ad':
Partially fix that beginning of animation is skipped
Dianne Hackborn [Thu, 23 Jul 2015 18:56:39 +0000 (18:56 +0000)]
am
6f64e737: Merge "Fix issue #
22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
* commit '
6f64e737f046cd9ae13e260027781acfabaa4cba':
Fix issue #
22612630: Ensure SMS/Call delivery during Doze
Jorim Jaggi [Wed, 22 Jul 2015 21:05:06 +0000 (14:05 -0700)]
Make sure expandingFinished gets called when going into QS
Bug:
22351040
Bug:
22306637
Change-Id: I8d1f9fb400b328753bd8444bf3b4a744ad23a53a
Colin Cross [Thu, 23 Jul 2015 18:48:22 +0000 (18:48 +0000)]
am
01efd7e8: Merge "Use build_number from file"
* commit '
01efd7e820edb9677491f28af999d825f21711a4':
Use build_number from file
Colin Cross [Thu, 23 Jul 2015 18:23:06 +0000 (18:23 +0000)]
Merge "Use build_number from file"
Jason Monk [Wed, 22 Jul 2015 20:34:36 +0000 (16:34 -0400)]
Fix emergency only when no sims
Need to look at a ServiceState to determine if we are actually in
a emergency only state.
Bug:
22619451
Change-Id: I06a2a6fab85ed2ce41d8f7cbb98a1f169ec61b33
Wenchao Tong [Thu, 23 Jul 2015 18:14:47 +0000 (18:14 +0000)]
Merge "Ignore the active network scorer when checking for idleness" into mnc-dev
Michael Wright [Thu, 23 Jul 2015 16:04:40 +0000 (17:04 +0100)]
Properly synchronize interactivity state.
Volatile doesn't provide any guarantees with respect to write
visibility, so it's possible that PowerManager will tell InputManager
about a change in interactivity state, but the actual dispatching
thread will never observe it.
Also, add logging about NativeInputManager state.
Bug:
22422588
Change-Id: Ifc3add992b9009d920d80a0315ff89c9574be20d
Svet Ganov [Thu, 23 Jul 2015 16:32:26 +0000 (09:32 -0700)]
Reset permissions and app links when clearing app preferences - framework
bug:
22359132
Change-Id: I198c0b1cd6c3dcb91fe560874a8502eb6b5f65b3
John Reck [Thu, 23 Jul 2015 17:27:30 +0000 (10:27 -0700)]
Fix a race condition that could cause lockup
Bug:
22676664
If a task is queued on a worker thread that is busy
processing a task AND a trim memory signal comes along
prior to the initial task being completed then the
tasks that were queued prior to the exit request will
never be processed.
This is bad, as when those futures are used later on, such
as in trying to delete them from the cache, they will block
waiting for the orphaned task to be finished.
Simple fix is to just never stop the worker threads. Increase
RAM usage slightly as we won't reclaim that stack space, but
this cost is fairly small
Change-Id: I818b011f9bc6ba06942fdad81c27656bd97b42d4
Amith Yamasani [Thu, 23 Jul 2015 17:22:29 +0000 (17:22 +0000)]
Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev
Alex Klyubin [Thu, 23 Jul 2015 16:23:59 +0000 (16:23 +0000)]
Merge "Document what algorithms Android Keystore supports." into mnc-dev
Junda Liu [Thu, 23 Jul 2015 16:20:35 +0000 (16:20 +0000)]
Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
Jean-Michel Trivi [Thu, 23 Jul 2015 15:59:20 +0000 (15:59 +0000)]
Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
Jack Yu [Thu, 23 Jul 2015 15:51:13 +0000 (15:51 +0000)]
Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
Geoff Mendal [Thu, 23 Jul 2015 07:28:45 +0000 (00:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: If02d6e590724181954e4b3f890f1fd5a132f392d
Auto-generated-cl: translation import
Jack Yu [Wed, 22 Jul 2015 20:36:42 +0000 (13:36 -0700)]
Allow carriers to force disable ETWS/CMAS test messages.
This feature can be enabled in carrier config XML. When enabled, the user will not see
ETWS/CMAS enable/disable option in emergency broadcast preference menu.
bug:
22396039
Change-Id: I6ad6fa39852d3b13faeef968a1963b3e0a4a6e61
Adrian Roos [Thu, 23 Jul 2015 01:13:04 +0000 (18:13 -0700)]
Disable Keyguard affordances before setup is completed
Bug:
22665279
Change-Id: I5d3c62a5b6896b808d55026df67022192f0b8bfd
Elliott Hughes [Thu, 23 Jul 2015 02:06:52 +0000 (02:06 +0000)]
am
f9a82218: am
86d5fc28: Merge "aapt: expat exports its header files now."
* commit '
f9a8221810a0b5aaa4050becaa0aa9d492035ff3':
aapt: expat exports its header files now.
Svet Ganov [Thu, 23 Jul 2015 01:58:32 +0000 (18:58 -0700)]
Shut down UiAutomationConnection without a lock held
bug:
22599759
Change-Id: I90bca614960522269497127658c16b0bb6ec0476
Nick Kralevich [Thu, 23 Jul 2015 01:46:38 +0000 (01:46 +0000)]
Merge "Revert "UsbDeviceManager: fix b/
21429947 regression"" into mnc-dev
Nick Kralevich [Thu, 23 Jul 2015 01:43:23 +0000 (01:43 +0000)]
Revert "UsbDeviceManager: fix b/
21429947 regression"
This causes various problems with our testing infrastructure.
This reverts commit
b210026e3d5c955628ca8b8b9191ade08891e9ef.
Bug:
22447614
Bug:
21429947
Change-Id: I57623e3d993e65b6ad89e7a7d28e9575cf638994