OSDN Git Service
Geoff Mendal [Sat, 25 Jul 2015 08:41:38 +0000 (03:41 -0500)]
Import translations. DO NOT MERGE
Change-Id: I0e1bbb09bf26900df54dd55b5b9b8a320173a16f
Auto-generated-cl: translation import
Jeff Sharkey [Sat, 25 Jul 2015 02:20:25 +0000 (02:20 +0000)]
am
8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
* commit '
8be305dd6582f154c5a5894034a35fc8ec225b71':
Also check app-ops on path-permissions.
Jeff Sharkey [Sat, 25 Jul 2015 02:05:56 +0000 (02:05 +0000)]
Merge "Also check app-ops on path-permissions." into mnc-dev
Selim Cinek [Sat, 25 Jul 2015 01:54:26 +0000 (01:54 +0000)]
am
d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
* commit '
d9f1a0c3a42bcc1f7b8cd82be8eed60f5438f091':
Fixed wake to unlock when the device has never been unlocked
Jorim Jaggi [Sat, 25 Jul 2015 01:54:21 +0000 (01:54 +0000)]
am
f3255489: Fix ambient display
* commit '
f325548992d449a2da564216191edb5ad2773bfd':
Fix ambient display
Selim Cinek [Sat, 25 Jul 2015 01:48:16 +0000 (01:48 +0000)]
Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
Jorim Jaggi [Fri, 24 Jul 2015 19:32:42 +0000 (12:32 -0700)]
Fix ambient display
Due to a refactoring for touch, wake and unlock for fingerprint
devices PhoneWindowManager now waits for Keyguard to draw its first
frame in all cases, including when screen turns on for pulsing.
However, since in this case the device is not awake, we need to check
for screen on instead of awakeness when proceeding with the wake-up
sequence. Without this change, screen on was blocked forever in the
pulsing case.
Bug:
22605235
Change-Id: Ib6089fd14b673e62347f2c9108d9a6783caa26b7
Adam Lesinski [Sat, 25 Jul 2015 01:26:44 +0000 (01:26 +0000)]
am
2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
* commit '
2a493532e6ce44fd6dec07a22c3a016de80ccc46':
BatteryStats: Decode wakeup reasons in Java
Selim Cinek [Sat, 25 Jul 2015 01:15:43 +0000 (18:15 -0700)]
Fixed wake to unlock when the device has never been unlocked
Previously the fingerprint could still unlock the device
when waking up with the fingerprint sensor, since we were not
checking if it is allowed.
Bug:
22622999
Change-Id: I039a4e0701c1f161f227cf6f1d25e8147548db47
Adam Lesinski [Sat, 25 Jul 2015 01:14:07 +0000 (01:14 +0000)]
Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
Selim Cinek [Sat, 25 Jul 2015 00:59:57 +0000 (00:59 +0000)]
am
f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
* commit '
f8acd1d8d698f367bc267699a0a84c21f7c7d548':
Adapted the behavior when unlocking with fingerprint is not allowed
Chris Banes [Sat, 25 Jul 2015 00:59:23 +0000 (00:59 +0000)]
am
c174de0a: am
5442932a: am
7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
* commit '
c174de0ab353e2ecaf6e1728e6899bffcfefe48e':
v22.2.1 support api diff
Adrian Roos [Sat, 25 Jul 2015 00:59:17 +0000 (00:59 +0000)]
am
384b5d20: am
a65de4fd: am
b2f8c716: am
50ed152a: am
7f63ef38: am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
384b5d20b64c279f29eb494bae37d039c652f492':
Prevent insanely long passwords from crashing SystemUI
John Reck [Sat, 25 Jul 2015 00:53:01 +0000 (00:53 +0000)]
am
68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
* commit '
68fbd6a4968eb6e5f3d74f471387c5e62981fba2':
Use process state to filter >= UI_HIDDEN
Selim Cinek [Sat, 25 Jul 2015 00:33:14 +0000 (00:33 +0000)]
Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
Chris Banes [Fri, 24 Jul 2015 22:41:35 +0000 (22:41 +0000)]
am
5442932a: am
7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
* commit '
5442932a4befd66394fb155ae95a2eaadd2001a9':
v22.2.1 support api diff
Adrian Roos [Fri, 24 Jul 2015 22:41:26 +0000 (22:41 +0000)]
am
a65de4fd: am
b2f8c716: am
50ed152a: am
7f63ef38: am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
a65de4fde99c84ae7c7cab242e8e1e46ee6c0a5d':
Prevent insanely long passwords from crashing SystemUI
Jeff Sharkey [Fri, 24 Jul 2015 22:10:20 +0000 (15:10 -0700)]
Also check app-ops on path-permissions.
Any place that we check permissions we also need to check any
app-ops associated with those permissions. In the case of providers
with both <provider> and <path-permission> permissions, track and
report the strongest app-ops denial.
Bug:
22718722
Change-Id: I45e62de39b04d16d071558ad980b701667cfcb9a
John Reck [Fri, 24 Jul 2015 22:15:47 +0000 (22:15 +0000)]
Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
Adrian Roos [Fri, 24 Jul 2015 21:57:16 +0000 (21:57 +0000)]
am
4629f1c5: Merge "Fix janky add guest transition" into mnc-dev
* commit '
4629f1c58c00480b0dbd5a541a26b703b0770bf4':
Fix janky add guest transition
Adrian Roos [Fri, 24 Jul 2015 21:42:46 +0000 (21:42 +0000)]
Merge "Fix janky add guest transition" into mnc-dev
Andreas Gampe [Fri, 24 Jul 2015 21:39:24 +0000 (21:39 +0000)]
am
9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
* commit '
9a755e3650270439861f5ac1e0c51caa7c4a7d3d':
Frameworks/base: Hand fingerprint to ART
Andreas Gampe [Fri, 24 Jul 2015 21:25:09 +0000 (21:25 +0000)]
Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
Andreas Gampe [Fri, 24 Jul 2015 21:19:44 +0000 (14:19 -0700)]
Frameworks/base: Hand fingerprint to ART
To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.
Bug:
22693991
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
Chris Banes [Fri, 24 Jul 2015 20:19:09 +0000 (20:19 +0000)]
am
7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
* commit '
7b099152b6bd5844c30464a7c08dde2e22124491':
v22.2.1 support api diff
Robert Greenwalt [Fri, 24 Jul 2015 20:06:31 +0000 (20:06 +0000)]
am
f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev
* commit '
f0bead280154fd9a5d2c07b1186e10fcfeed55fc':
DO NOT MERGE Enhance local log.
Adam Lesinski [Fri, 24 Jul 2015 01:13:38 +0000 (18:13 -0700)]
BatteryStats: Decode wakeup reasons in Java
Wakeup reasons come from drivers and sometimes are malformed UTF-8.
Decode them in Java so we can easily replace malformed characters
and still have user visible strings.
Bug:
22368519
Change-Id: Ifade1a7fcdf6545e7e344d74390200c329430e14
Robert Greenwalt [Fri, 24 Jul 2015 19:54:07 +0000 (19:54 +0000)]
Merge "DO NOT MERGE Enhance local log." into mnc-dev
Adrian Roos [Fri, 24 Jul 2015 19:45:24 +0000 (19:45 +0000)]
am
b2f8c716: am
50ed152a: am
7f63ef38: am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
b2f8c716e8d2cf575c690b5a360c4efdd9f06bc8':
Prevent insanely long passwords from crashing SystemUI
Robert Greenwalt [Fri, 24 Jul 2015 19:44:03 +0000 (12:44 -0700)]
DO NOT MERGE Enhance local log.
to be reverted with ag/733658
bug:
22632129
Change-Id: Id3899ee8e987ccc469394dd4d0c41465c48dc37e
Amith Yamasani [Fri, 24 Jul 2015 19:31:59 +0000 (19:31 +0000)]
am
2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev
* commit '
2c5aeeaaaaa0e048817dd04d41ae9f396bb76fb6':
Require permission for internal broadcast
Amith Yamasani [Fri, 24 Jul 2015 19:12:16 +0000 (19:12 +0000)]
Merge "Require permission for internal broadcast" into mnc-dev
Fyodor Kupolov [Fri, 24 Jul 2015 18:03:12 +0000 (18:03 +0000)]
am
a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
* commit '
a5e25f33a530eb76c7b0fb77111eeedd6bd1f879':
Added ACCESS_COARSE_LOCATION permission for BT
Fyodor Kupolov [Fri, 24 Jul 2015 17:54:14 +0000 (17:54 +0000)]
Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
Andrei Stingaceanu [Fri, 24 Jul 2015 14:47:48 +0000 (14:47 +0000)]
am
45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev
* commit '
45794910031ce2a0e2df3d1694783da7e3c4352b':
Disallow dragging text in extracted mode
Julia Reynolds [Fri, 24 Jul 2015 14:47:43 +0000 (14:47 +0000)]
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.
Andrei Stingaceanu [Fri, 24 Jul 2015 14:35:48 +0000 (14:35 +0000)]
Merge "Disallow dragging text in extracted mode" into mnc-dev
Julia Reynolds [Fri, 24 Jul 2015 14:34:02 +0000 (14:34 +0000)]
Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
Jim Miller [Fri, 24 Jul 2015 02:53:54 +0000 (02:53 +0000)]
am
abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
abd35bfc81ae231656c6fba67d43cfbb76f3db0d':
Add FEATURE_FINGERPRINT to PackageManager's feature list
Jim Miller [Fri, 24 Jul 2015 02:41:00 +0000 (02:41 +0000)]
Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev
John Reck [Fri, 24 Jul 2015 01:27:09 +0000 (18:27 -0700)]
Use process state to filter >= UI_HIDDEN
Bug:
22701182
Change-Id: Ia192016397c8115a19a0dca409aa70dea154c41e
Jean-Michel Trivi [Fri, 24 Jul 2015 01:02:26 +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:21 +0000 (01:02 +0000)]
am
6b66a4a8: use findProcess instead of getProcess
* commit '
6b66a4a8a342b8156f73d83771caa1db2f866529':
use findProcess instead of getProcess
Amith Yamasani [Fri, 24 Jul 2015 00:15:45 +0000 (17:15 -0700)]
Require permission for internal broadcast
It was possible for other apps to request removal of the guest user
that was handled by an internal receiver in SystemUI.
Fix requires the broadcast sender to have an internal permission
so that only SystemUI can send that broadcast (PendingIntent).
Bug:
22671268
Change-Id: I63a8ced692e6d1cb2872b962ad247a827dbafbc6
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:12 +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:32 +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:27 +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:23 +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:02:18 +0000 (00:02 +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:39:27 +0000 (23:39 +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:49 +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:46 +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
Deepanshu Gupta [Thu, 23 Jul 2015 18:35:25 +0000 (11:35 -0700)]
LayoutLib: translucent sys ui bars
Change-Id: I9c294329fc78418c505a5115bc9c07da29595af2
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
Selim Cinek [Mon, 20 Jul 2015 21:39:25 +0000 (14:39 -0700)]
Adapted the behavior when unlocking with fingerprint is not allowed
We now keep the fingerprint running and switch to the bouncer when
the user successfully authenticated.
Bug:
21618072
Change-Id: If00061cb3914afd4d7a7d75964594484c792a890
Tim Kilbourn [Thu, 23 Jul 2015 22:12:36 +0000 (22:12 +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.
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
Svetoslav Ganov [Thu, 23 Jul 2015 22:01:20 +0000 (22:01 +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:01:14 +0000 (22:01 +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 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
Adrian Roos [Thu, 23 Jul 2015 21:31:41 +0000 (21:31 +0000)]
am
50ed152a: am
7f63ef38: am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
50ed152ab646b00714947a9cf75e01e618b16c02':
Prevent insanely long passwords from crashing SystemUI
Tim Kilbourn [Thu, 23 Jul 2015 20:51:57 +0000 (20:51 +0000)]
am
cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev
* commit '
cc855ad737e61fc02a057e811f2e6e34bbff0e37':
Properly synchronize interactivity state.
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:36:16 +0000 (20:36 +0000)]
am
157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
* commit '
157ad64dbeedd43a444d3eb1cc538ee975ed2d59':
Fix emergency only when no sims
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:19:59 +0000 (20:19 +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.
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
Fyodor Kupolov [Thu, 23 Jul 2015 19:47:06 +0000 (12:47 -0700)]
Added ACCESS_COARSE_LOCATION permission for BT
It is required to receive BluetoothDevice.ACTION_FOUND intents
Bug:
21852542
Change-Id: I0437c74c753567e8c6beb4bf70a30ddf0aaa4f3b
Jorim Jaggi [Thu, 23 Jul 2015 19:32:37 +0000 (19:32 +0000)]
am
1d071ce9: Make sure expandingFinished gets called when going into QS
* commit '
1d071ce9b1810fbcf231fd17c4cb5621e68ff419':
Make sure expandingFinished gets called when going into QS
Wenchao Tong [Thu, 23 Jul 2015 19:20:51 +0000 (19:20 +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:20:47 +0000 (19:20 +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:20:41 +0000 (19:20 +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:20:32 +0000 (19:20 +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:20:27 +0000 (19:20 +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 19:20:22 +0000 (19:20 +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 19:20:17 +0000 (19:20 +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 19:20:12 +0000 (19:20 +0000)]
am
13edc160: (-s ours) Import translations. DO NOT MERGE
* commit '
13edc1609ed634130720142045d47315a39ea037':
Import translations. DO NOT MERGE
Nick Kralevich [Thu, 23 Jul 2015 19:20:05 +0000 (19:20 +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 19:20:01 +0000 (19:20 +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
Adam Lesinski [Thu, 23 Jul 2015 19:19:56 +0000 (19:19 +0000)]
am
f90ed330: Merge "UsageStats: Reduce log spam during time change" into mnc-dev
* commit '
f90ed330a0c7f54b963ef651a53be946f6d463ce':
UsageStats: Reduce log spam during time change
Dianne Hackborn [Thu, 23 Jul 2015 19:19:51 +0000 (19:19 +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 19:19:47 +0000 (19:19 +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 19:19:43 +0000 (19:19 +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