OSDN Git Service
Tim Kilbourn [Thu, 27 Aug 2015 01:44:02 +0000 (01:44 +0000)]
am
3b7b06a1: am
487cdebd: am
8f1ea834: Handle the -a flag for dumpsys appops.
* commit '
3b7b06a1c7ab0cd65dd87001d55f4b3ad7dc0ea0':
Handle the -a flag for dumpsys appops.
Tim Kilbourn [Thu, 27 Aug 2015 01:35:34 +0000 (01:35 +0000)]
am
487cdebd: am
8f1ea834: Handle the -a flag for dumpsys appops.
* commit '
487cdebd9038e2fe76165498e98dee2c08a9f11c':
Handle the -a flag for dumpsys appops.
Tim Kilbourn [Thu, 27 Aug 2015 01:15:58 +0000 (01:15 +0000)]
am
8f1ea834: Handle the -a flag for dumpsys appops.
* commit '
8f1ea834f9af5ccf6cea1f529f63e727cd13b6a8':
Handle the -a flag for dumpsys appops.
Tim Kilbourn [Wed, 26 Aug 2015 22:07:37 +0000 (15:07 -0700)]
Handle the -a flag for dumpsys appops.
Bug:
23017449
Change-Id: I6ce9ac368e2739153867c246893eb544d052834f
Roshan Pius [Wed, 26 Aug 2015 21:31:31 +0000 (21:31 +0000)]
am
9df996ed: am
6ad12315: Merge "Reformat local Korean numbers in national format." into mnc-dr-dev
* commit '
9df996ed4151354da07c6057c621b54117190dee':
Reformat local Korean numbers in national format.
Daniel Estrada Alva [Wed, 26 Aug 2015 21:26:42 +0000 (21:26 +0000)]
am
243095c9: am
47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev
* commit '
243095c9cae6c5a3d7c24a88f1156aee13ecc96f':
Disable AR HW when client binder dies.
Roshan Pius [Wed, 26 Aug 2015 21:25:04 +0000 (21:25 +0000)]
am
6ad12315: Merge "Reformat local Korean numbers in national format." into mnc-dr-dev
* commit '
6ad123156e762a62616de63617ee11afb3cde334':
Reformat local Korean numbers in national format.
Daniel Estrada Alva [Wed, 26 Aug 2015 21:19:53 +0000 (21:19 +0000)]
am
47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev
* commit '
47ee2ecf82958f211c775a4125968fbf505fe594':
Disable AR HW when client binder dies.
Roshan Pius [Wed, 26 Aug 2015 21:15:16 +0000 (21:15 +0000)]
Merge "Reformat local Korean numbers in national format." into mnc-dr-dev
Daniel Estrada Alva [Wed, 26 Aug 2015 21:09:50 +0000 (21:09 +0000)]
Merge "Disable AR HW when client binder dies." into mnc-dr-dev
Alan Viverette [Wed, 26 Aug 2015 21:07:11 +0000 (21:07 +0000)]
am
12874d2d: am
b9b57225: am
95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
* commit '
12874d2de40a4772f33a6e5e7f82a815053ad875':
Avoid NPE when getPositionForView() is called on detached view
Alan Viverette [Wed, 26 Aug 2015 20:56:42 +0000 (20:56 +0000)]
am
b9b57225: am
95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
* commit '
b9b57225c28cdec5a8b7c2a6353f40a66010c0ed':
Avoid NPE when getPositionForView() is called on detached view
Alan Viverette [Wed, 26 Aug 2015 20:45:26 +0000 (20:45 +0000)]
am
95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
* commit '
9513785715e2325ee3a3269fbfe7b1f4409eff5c':
Avoid NPE when getPositionForView() is called on detached view
Alan Viverette [Wed, 26 Aug 2015 20:38:53 +0000 (20:38 +0000)]
Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
Deepanshu Gupta [Sat, 22 Aug 2015 00:23:50 +0000 (17:23 -0700)]
LayoutLib: Fix true transparency in status bar.
Change-Id: Ieedf23cde9ab3e36c77501d30cc7e808e66a4782
Chien-Yu Chen [Wed, 26 Aug 2015 19:24:13 +0000 (19:24 +0000)]
am
aebc3cce: am
fd059b34: am
e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit '
aebc3cce3cb0527de23201ad58bcef35c8cc3d30':
Camera: Update for reprocess session
Alan Viverette [Wed, 26 Aug 2015 19:21:39 +0000 (15:21 -0400)]
Avoid NPE when getPositionForView() is called on detached view
Bug:
23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20
Chien-Yu Chen [Wed, 26 Aug 2015 19:15:49 +0000 (19:15 +0000)]
am
fd059b34: am
e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit '
fd059b34fa81552934a194f845f114d1d89f87db':
Camera: Update for reprocess session
Chien-Yu Chen [Wed, 26 Aug 2015 19:07:52 +0000 (19:07 +0000)]
am
e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit '
e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
Camera: Update for reprocess session
Chien-Yu Chen [Wed, 26 Aug 2015 18:56:15 +0000 (18:56 +0000)]
Merge "Camera: Update for reprocess session" into mnc-dev
Nicholas Sauer [Wed, 26 Aug 2015 18:53:07 +0000 (18:53 +0000)]
am
6c97bb1b: am
59af87c2: am
7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
* commit '
6c97bb1b744ff67ad5ec3d590bbf511c165672ee':
Add GET_APP_OPS_STATS to Shell
Selim Cinek [Wed, 26 Aug 2015 18:53:01 +0000 (18:53 +0000)]
am
9b4b427a: am
e67268e6: Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev
* commit '
9b4b427a4b7906a16e5f0ca15099446004d8df75':
Migrate camera vibration to the systemUI
Nicholas Sauer [Wed, 26 Aug 2015 18:31:33 +0000 (18:31 +0000)]
am
59af87c2: am
7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
* commit '
59af87c2b694fad361c5f7e053a19bf9e1483afa':
Add GET_APP_OPS_STATS to Shell
Selim Cinek [Wed, 26 Aug 2015 18:31:27 +0000 (18:31 +0000)]
am
e67268e6: Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev
* commit '
e67268e66d5507832fa0c53dc7e08a72662610bc':
Migrate camera vibration to the systemUI
Nicholas Sauer [Wed, 26 Aug 2015 18:25:26 +0000 (18:25 +0000)]
am
7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
* commit '
7c17ec5fa5cb51d12713016622e4b5a939c8bb76':
Add GET_APP_OPS_STATS to Shell
Selim Cinek [Wed, 26 Aug 2015 18:25:07 +0000 (18:25 +0000)]
Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev
Nicholas Sauer [Wed, 26 Aug 2015 18:17:03 +0000 (18:17 +0000)]
Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
Daniel Estrada Alva [Wed, 26 Aug 2015 17:48:05 +0000 (17:48 +0000)]
am
f440fe06: am
8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
* commit '
f440fe06f529d817102f6b9d9f6b2e9e21fa79af':
Cherry-pick: Add callback-based support for HW Activity Recognition.
Daniel Estrada Alva [Wed, 26 Aug 2015 17:37:15 +0000 (17:37 +0000)]
am
8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
* commit '
8ff73b596e7c59f32a3f0df503ae8a9e5adbced5':
Cherry-pick: Add callback-based support for HW Activity Recognition.
Selim Cinek [Wed, 26 Aug 2015 17:36:34 +0000 (17:36 +0000)]
am
8f7a7e01: am
a07177f0: Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev
* commit '
8f7a7e01938a1649b49741abcaf93072c441a7fa':
Launching the camera now from systemUI including animations
Daniel Estrada Alva [Wed, 26 Aug 2015 17:30:09 +0000 (17:30 +0000)]
Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
Selim Cinek [Wed, 26 Aug 2015 17:27:17 +0000 (17:27 +0000)]
am
a07177f0: Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev
* commit '
a07177f0ad362ab3e03029cf774e55579ea025cf':
Launching the camera now from systemUI including animations
Selim Cinek [Wed, 26 Aug 2015 17:20:50 +0000 (17:20 +0000)]
Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev
Selim Cinek [Wed, 26 Aug 2015 02:03:48 +0000 (19:03 -0700)]
Migrate camera vibration to the systemUI
Also make sure the device is awake before vibrating.
Bug:
23200352
Change-Id: I63d04a82a4b8d9fa3e8f9deff5dd71295c82c930
Selim Cinek [Fri, 14 Aug 2015 20:19:37 +0000 (13:19 -0700)]
Launching the camera now from systemUI including animations
The GestureLaunchService now informs systemUI that a launch
has been requested and the systemUI, depending on its state
will launch the Camera in the correct mode, including
animations.
Bug:
22957192
Bug:
22958025
Change-Id: I815437c8bd33638245ac61a750f64af74fe3e1e3
Roshan Pius [Tue, 25 Aug 2015 18:23:49 +0000 (11:23 -0700)]
Reformat local Korean numbers in national format.
Korean carriers don't want the country codes displayed for local calls.
However the network returns the entire phone number including the
country code for Volte calls. According to the Koean phone numbering
scheme (https://en.wikipedia.org/wiki/Telephone_numbers_in_South_Korea),
we need to replace the country code +82 with a 0 prepended to the
carrier code to format it as a national number.
BUG:
22862845
Change-Id: Ifbb9eb8d5379608b4ea9d95ae7744779340b188e
Geoff Mendal [Wed, 26 Aug 2015 16:46:09 +0000 (16:46 +0000)]
am
9e974a89: (-s ours) am
a67f961f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
9e974a89366a935031a3cab98a1a71addfd30024':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 16:32:28 +0000 (16:32 +0000)]
am
a67f961f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a67f961f4fbfed081bb87880a2251564642fd32a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Aug 2015 16:18:32 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 26 Aug 2015 16:10:31 +0000 (11:10 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ia70a231f9cb167baec336984d4531137c833b48f
Auto-generated-cl: translation import
Michael Wright [Wed, 26 Aug 2015 13:19:34 +0000 (13:19 +0000)]
am
3d74e1f2: am
09952195: Merge "Update rotation without holding the WOL lock." into mnc-dr-dev
* commit '
3d74e1f23c713414af1b6028d50ae24fa69d95d1':
Update rotation without holding the WOL lock.
Michael Wright [Wed, 26 Aug 2015 13:14:09 +0000 (13:14 +0000)]
am
09952195: Merge "Update rotation without holding the WOL lock." into mnc-dr-dev
* commit '
09952195f8d9cdb1f6f1f9c793cc392f00dcc5fe':
Update rotation without holding the WOL lock.
Michael Wright [Wed, 26 Aug 2015 13:08:25 +0000 (13:08 +0000)]
Merge "Update rotation without holding the WOL lock." into mnc-dr-dev
Adrian Roos [Wed, 26 Aug 2015 00:59:09 +0000 (00:59 +0000)]
am
5bc2a2c0: am
d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev
* commit '
5bc2a2c0ce2002f28147bba92abd4de40f8b7f3d':
Disable fingerprint after user lockout
Adrian Roos [Wed, 26 Aug 2015 00:51:02 +0000 (00:51 +0000)]
am
d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev
* commit '
d56892da195b183bb5205a0c526bd730fb8a672f':
Disable fingerprint after user lockout
Todd Kennedy [Wed, 26 Aug 2015 00:48:43 +0000 (00:48 +0000)]
am
388e6854: am
81d0325f: am
5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev
* commit '
388e6854469f4755d763ade46a1915bdb3f93c25':
Allow extra slop in battery stats
Adrian Roos [Wed, 26 Aug 2015 00:43:31 +0000 (00:43 +0000)]
Merge "Disable fingerprint after user lockout" into mnc-dr-dev
Todd Kennedy [Wed, 26 Aug 2015 00:41:00 +0000 (00:41 +0000)]
am
81d0325f: am
5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev
* commit '
81d0325ffe57c4a9296d84ded436d8fcff4b9201':
Allow extra slop in battery stats
Chris Tate [Wed, 26 Aug 2015 00:35:43 +0000 (00:35 +0000)]
am
e49dcfed: am
9b7a4ac5: am
e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
* commit '
e49dcfed5ac1226ccbf2a3d139b5ea8ebf611f72':
Teach Pm about the "always ask" link-handling state
Todd Kennedy [Wed, 26 Aug 2015 00:35:42 +0000 (00:35 +0000)]
am
5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev
* commit '
5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb':
Allow extra slop in battery stats
Todd Kennedy [Wed, 26 Aug 2015 00:27:46 +0000 (00:27 +0000)]
Merge "Allow extra slop in battery stats" into mnc-dev
Todd Kennedy [Wed, 26 Aug 2015 00:26:57 +0000 (17:26 -0700)]
Allow extra slop in battery stats
Current slop of 30ms was causing too many WTFs to be thrown. Increase the slop
to 750ms.
Bug:
23391894
Change-Id: Ica5be9b00745bfe58872d43be8c32f8c147075ed
Chris Tate [Wed, 26 Aug 2015 00:25:53 +0000 (00:25 +0000)]
am
9b7a4ac5: am
e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
* commit '
9b7a4ac5846baf2da8b800c24a770669cfa735aa':
Teach Pm about the "always ask" link-handling state
Chris Tate [Wed, 26 Aug 2015 00:20:50 +0000 (00:20 +0000)]
am
e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
* commit '
e62421f1fbc1ea44e7737989e134fdf9fc1ec4cc':
Teach Pm about the "always ask" link-handling state
Chris Tate [Wed, 26 Aug 2015 00:10:23 +0000 (00:10 +0000)]
Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
Raph Levien [Tue, 25 Aug 2015 23:52:46 +0000 (23:52 +0000)]
am
04531d5c: am
f03c090f: am
8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev
* commit '
04531d5cfc83a6f77ab33479f7ab99d4164282a1':
Truncate and ellipsize app name if too long for dialog.
Raph Levien [Tue, 25 Aug 2015 23:43:54 +0000 (23:43 +0000)]
am
f03c090f: am
8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev
* commit '
f03c090f3e41a80282e4febd85ca53c681649f86':
Truncate and ellipsize app name if too long for dialog.
Jim Miller [Tue, 25 Aug 2015 23:36:30 +0000 (23:36 +0000)]
am
919a3fdf: am
01c5bf54: Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev
* commit '
919a3fdf9c92aa232f6304c32227cf0fe99cb8f3':
Handle driver errors from remove, enroll and auth.
Raph Levien [Tue, 25 Aug 2015 23:35:37 +0000 (23:35 +0000)]
am
8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev
* commit '
8304c6c0f9d4b8624ab9cf5cfe5dce15db64c4de':
Truncate and ellipsize app name if too long for dialog.
Jim Miller [Tue, 25 Aug 2015 23:29:40 +0000 (23:29 +0000)]
am
01c5bf54: Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev
* commit '
01c5bf5470a8c1c75f74792d8be1dada3a6f7b8a':
Handle driver errors from remove, enroll and auth.
Raph Levien [Tue, 25 Aug 2015 23:25:10 +0000 (23:25 +0000)]
Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev
Jim Miller [Tue, 25 Aug 2015 23:22:29 +0000 (23:22 +0000)]
Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev
Jorim Jaggi [Tue, 25 Aug 2015 23:09:59 +0000 (23:09 +0000)]
am
4816d7d5: am
e30e8980: Merge "Disable RT animations for header ripple" into mnc-dr-dev
* commit '
4816d7d58c7717a5a89c75fee17ce6202c7b1bea':
Disable RT animations for header ripple
Jorim Jaggi [Tue, 25 Aug 2015 23:02:24 +0000 (23:02 +0000)]
am
e30e8980: Merge "Disable RT animations for header ripple" into mnc-dr-dev
* commit '
e30e8980a1ceeacdc7ecafd36a622cc93d7ab3fc':
Disable RT animations for header ripple
Adrian Roos [Tue, 25 Aug 2015 22:59:00 +0000 (15:59 -0700)]
Disable fingerprint after user lockout
Bug:
22677859
Change-Id: I38b918d2e40b5bb423f2e5c171fe65bed8d440a6
Jorim Jaggi [Tue, 25 Aug 2015 22:54:34 +0000 (22:54 +0000)]
Merge "Disable RT animations for header ripple" into mnc-dr-dev
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
Truncate and ellipsize app name if too long for dialog.
If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.
Bug:
23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584
Michael Wright [Tue, 25 Aug 2015 20:15:12 +0000 (21:15 +0100)]
Update rotation without holding the WOL lock.
We need to make sure to only ever update the orientation of the
device from WindowOrientationListener when we're not holding the WOL
class lock, otherwise we can deadlock when WMS calls into us to set
the orientation based on an apps preference.
Bug:
23491348
Change-Id: Ifeded4d5d1dc923fa2ce0473bc4b7fe950dc0cfd
Christopher Tate [Tue, 25 Aug 2015 19:39:04 +0000 (12:39 -0700)]
Teach Pm about the "always ask" link-handling state
Bug
23511867
Change-Id: I74b3c8222a7d22541a96b698edd1a175d378e48f
Zach Johnson [Tue, 25 Aug 2015 19:22:16 +0000 (19:22 +0000)]
am
5d636c8c: Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev
* commit '
5d636c8c50cc4a26492095b3df61801f3935424f':
Fix AudioAttributes.usageToString() string return values
Zach Johnson [Tue, 25 Aug 2015 19:22:11 +0000 (19:22 +0000)]
am
3f62358b: Merge "*ring ring* Who is it? Destiny? I\'ve been expecting your call..." into cw-e-dev
* commit '
3f62358b7e3a35f6f9c68aac09889e5d47bc6d2a':
*ring ring* Who is it? Destiny? I've been expecting your call...
Zach Johnson [Tue, 25 Aug 2015 19:16:59 +0000 (19:16 +0000)]
Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev
Zach Johnson [Tue, 25 Aug 2015 19:16:43 +0000 (19:16 +0000)]
Merge "*ring ring* Who is it? Destiny? I've been expecting your call..." into cw-e-dev
Chien-Yu Chen [Tue, 25 Aug 2015 18:31:58 +0000 (11:31 -0700)]
Camera: Update for reprocess session
Document that some devices may not support submitting multiple
outputs in a single reprocess capture requests. Remove the
guaranteed reprocess session configurations that are less common
and may not be supported by all devices.
Bug:
23422291
Change-Id: I1c869612e9a83ef480113ca2628f68511a150b64
Wei Liu [Tue, 25 Aug 2015 18:32:47 +0000 (18:32 +0000)]
am
30275c19: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '
30275c1924b2bd45b05bd9c98f8648ecbc71374f':
Refactor UidDetailProvider and its dependencies to SettingsLib.
Zach Johnson [Mon, 24 Aug 2015 23:33:16 +0000 (16:33 -0700)]
Fix AudioAttributes.usageToString() string return values
Change-Id: I75642d043d647c921259dad20df504dd2e551644
Zach Johnson [Mon, 24 Aug 2015 22:38:27 +0000 (15:38 -0700)]
*ring ring* Who is it? Destiny? I've been expecting your call...
https://www.youtube.com/watch?v=7VFPtY7hiGw
Allow USAGE_NOTIFICATION_RINGTONE regardless of effect supression
component, because otherwise we can't use the system implementation of
ringtones (audio or vibration). If a platform wishes to turn supress this,
it can be disabled through the default zen configuration if necessary.
Change-Id: I02a89376b40c6eecde2468c93898b4a821315e64
Wei Liu [Tue, 25 Aug 2015 18:07:17 +0000 (18:07 +0000)]
am
37e1db23: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
* commit '
37e1db2320acd850e0738f3972d3ba4334f59949':
Move SummaryForAllUidLoader to SettingsLib.
Wei Liu [Tue, 25 Aug 2015 00:35:49 +0000 (17:35 -0700)]
Refactor UidDetailProvider and its dependencies to SettingsLib.
so that it can be reused by Wear app data usage.
Change-Id: Ifd5709647ba031bb38b2293c35def01bcdee1448
Nicolas Prevot [Tue, 25 Aug 2015 17:57:28 +0000 (17:57 +0000)]
am
ae2880a6: am
26b555d4: am
d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.
* commit '
ae2880a62881b08eb692978a869a226fcc692c78':
Don't set a null filter to a cross-profile ResolveInfo.
Wei Liu [Tue, 25 Aug 2015 17:55:32 +0000 (17:55 +0000)]
Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
Nicolas Prevot [Tue, 25 Aug 2015 17:49:18 +0000 (17:49 +0000)]
am
26b555d4: am
d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.
* commit '
26b555d42ce2cf78d42ebcc9806447bf83df9318':
Don't set a null filter to a cross-profile ResolveInfo.
Nicolas Prevot [Tue, 25 Aug 2015 17:39:24 +0000 (17:39 +0000)]
am
d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.
* commit '
d34ecae444867b78be06bb5a6b0fb2a66c2e30aa':
Don't set a null filter to a cross-profile ResolveInfo.
Nicholas Sauer [Tue, 25 Aug 2015 15:47:50 +0000 (08:47 -0700)]
Add GET_APP_OPS_STATS to Shell
bug:
23397072
Change-Id: I9f60f175380048e0f3888d866069f8f76166c732
Chris Wren [Tue, 25 Aug 2015 14:22:24 +0000 (14:22 +0000)]
am
d267c3b3: am
83d83194: Merge "instrument fingerprint crypto token service" into mnc-dr-dev
* commit '
d267c3b3212f804a1507947f98233230af9413b4':
instrument fingerprint crypto token service
Chris Wren [Tue, 25 Aug 2015 14:14:41 +0000 (14:14 +0000)]
am
83d83194: Merge "instrument fingerprint crypto token service" into mnc-dr-dev
* commit '
83d83194c3e68740593800ee2c295247d2bf2e06':
instrument fingerprint crypto token service
Chris Wren [Tue, 25 Aug 2015 14:10:20 +0000 (14:10 +0000)]
Merge "instrument fingerprint crypto token service" into mnc-dr-dev
Nicolas Prevot [Tue, 25 Aug 2015 12:01:43 +0000 (13:01 +0100)]
Don't set a null filter to a cross-profile ResolveInfo.
ResolverActivity expects the filter not to be null.
BUG:
23395395
Change-Id: Ie7081daba1ad138b1a3903ef9dd1b649806c8d0e
Erik Wolsheimer [Tue, 25 Aug 2015 05:22:22 +0000 (05:22 +0000)]
am
49eb98e7: add permissions strings that have to be altered from framework originals for use in Wear BUG:
23223527
* commit '
49eb98e783e2f8e8e5fe2db4844babdc31553be6':
add permissions strings that have to be altered from framework originals for use in Wear BUG:
23223527
Erik Wolsheimer [Tue, 25 Aug 2015 05:14:50 +0000 (22:14 -0700)]
add permissions strings that have to be altered from framework originals for use in Wear
BUG:
23223527
Change-Id: I5c175f3867d72e1dd1a539bec454ac60d2d501d7
Jorim Jaggi [Tue, 25 Aug 2015 05:13:47 +0000 (05:13 +0000)]
am
2ef327ed: am
2cb70049: Scale notifications on lockscreen for 420 dpi devices
* commit '
2ef327ede9f9b5f5da90a2d54eceee2a0e9c4406':
Scale notifications on lockscreen for 420 dpi devices
Jorim Jaggi [Tue, 25 Aug 2015 05:07:12 +0000 (05:07 +0000)]
am
2cb70049: Scale notifications on lockscreen for 420 dpi devices
* commit '
2cb7004928e4bb34022e3ced112c2917fc5362f9':
Scale notifications on lockscreen for 420 dpi devices
Vinod Krishnan [Tue, 25 Aug 2015 05:03:03 +0000 (05:03 +0000)]
am
46814fbf: Merge "Override Body Sensors string for watches" into cw-e-dev
* commit '
46814fbfc842d80033f4b1a8ae702f25eb8fd5d2':
Override Body Sensors string for watches
Jorim Jaggi [Mon, 24 Aug 2015 21:52:45 +0000 (14:52 -0700)]
Scale notifications on lockscreen for 420 dpi devices
Bug:
23299488
Change-Id: Ied4505532aad41a3a1469efce2464a491661fb6c
Vinod Krishnan [Tue, 25 Aug 2015 04:51:05 +0000 (04:51 +0000)]
Merge "Override Body Sensors string for watches" into cw-e-dev
Vinod Krishnan [Tue, 25 Aug 2015 04:47:45 +0000 (21:47 -0700)]
Override Body Sensors string for watches
Change-Id: Ie967f7ae5444b9ce92a46cd30a85896814c8fd17
Jaewan Kim [Tue, 25 Aug 2015 01:40:11 +0000 (01:40 +0000)]
Merge "Add documentation for media router's palette dependency." into mnc-ub-dev
Eino-Ville Talvala [Mon, 24 Aug 2015 23:31:49 +0000 (23:31 +0000)]
am
cd05509a: am
6393275f: am
2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit '
cd05509a81fff64e28dd1d7a2f482af5f269c6fc':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Eino-Ville Talvala [Mon, 24 Aug 2015 23:21:16 +0000 (23:21 +0000)]
am
6393275f: am
2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit '
6393275f5f8daa2d14dbc3fbd6511a78978999cd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Eino-Ville Talvala [Mon, 24 Aug 2015 23:12:16 +0000 (23:12 +0000)]
am
2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit '
2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices