OSDN Git Service
Michael Lentine [Wed, 23 Sep 2015 05:19:19 +0000 (05:19 +0000)]
Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev
Soonil Nagarkar [Wed, 23 Sep 2015 01:34:53 +0000 (01:34 +0000)]
Merge "Fix reintroduction of b/
10845061" into mnc-dr-dev
Jorim Jaggi [Tue, 22 Sep 2015 19:44:47 +0000 (12:44 -0700)]
Fix verifyUnlock
Bug:
23970549
Change-Id: I899d8a92050c257217fa8528c33cb4592ad6d76a
Jorim Jaggi [Tue, 22 Sep 2015 21:44:14 +0000 (14:44 -0700)]
Log time difference between power button presses for gesture
Bug:
24304031
Change-Id: Iab755268ee6d5c0c00836a6f68e65a74286074cf
Baligh Uddin [Tue, 22 Sep 2015 20:50:02 +0000 (20:50 +0000)]
Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev
Michael Lentine [Tue, 22 Sep 2015 20:02:22 +0000 (13:02 -0700)]
Dismiss color fade when it is no longer used.
Previously the color fade layers would stay active until the screen was turned
back on. After this change, the layers are dismissed as soon as color fade
completes.
Bug:
24276564
Change-Id: I1f81b397d82d518c2bc921b22f7fe9fd066fc059
Adam Lesinski [Tue, 22 Sep 2015 18:33:14 +0000 (18:33 +0000)]
Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
Andreas Gampe [Tue, 22 Sep 2015 18:27:39 +0000 (18:27 +0000)]
Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
Adam Lesinski [Mon, 21 Sep 2015 23:54:52 +0000 (16:54 -0700)]
Fix Array Index Out of Bounds in BatteryStatsImpl
If the power profile was not set yet, the default sizes of
cpu freq arrays could have been too small.
Bug:
24244089
Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00
Andreas Gampe [Mon, 21 Sep 2015 20:20:07 +0000 (13:20 -0700)]
Frameworks/base: Propagate boot status to installd
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.
Bug:
23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
Zach Jang [Mon, 21 Sep 2015 21:37:34 +0000 (21:37 +0000)]
am
fed28546: am
3e344f3f: (-s ours) am
ba80596b: am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
fed2854653d7e9d596cf1d9cb9c41ff05e744e94':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:37:30 +0000 (21:37 +0000)]
am
937141cb: am
0cae8381: (-s ours) am
b5173241: am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
937141cb75160a1a51b9568481225aec286c5a86':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:30:32 +0000 (21:30 +0000)]
am
3e344f3f: (-s ours) am
ba80596b: am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:30:27 +0000 (21:30 +0000)]
am
0cae8381: (-s ours) am
b5173241: am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
0cae8381666248e44875756e72998e55ed3f9151':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:07:04 +0000 (21:07 +0000)]
am
ba80596b: am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
ba80596bc0d51b3ddf14c1612c341992bc3ac5fc':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:06:58 +0000 (21:06 +0000)]
am
b5173241: am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
b5173241d160a5b6f4d440a01c9a9b0281ee4e66':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Jeff Sharkey [Mon, 21 Sep 2015 20:29:58 +0000 (20:29 +0000)]
am
e1a6299b: Relax locking when scanning private volumes.
* commit '
e1a6299b994bbdb304550e00d5b3b26a064bdf0c':
Relax locking when scanning private volumes.
Zach Jang [Mon, 21 Sep 2015 19:10:51 +0000 (19:10 +0000)]
am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
f8cda08986a5caa14daace69e24c82224ac5a9fc':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 19:10:46 +0000 (19:10 +0000)]
am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
e54c195a53694696e0913722fa721c882e33753e':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 18:58:27 +0000 (18:58 +0000)]
am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
b2b3cecbd3de80d40f8c207c6aa94532c3426829':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 18:58:18 +0000 (18:58 +0000)]
am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
0a8197b1e43bc3771fc3f8595619603ec8f6f641':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Robert Carr [Thu, 17 Sep 2015 17:54:58 +0000 (10:54 -0700)]
Enforce a timeout for Content Providers to be published.
ActivityManagerService: In the case where we are launching
an application on behalf of a Content Provider request,
enforce a timeout inbetween the application attaching and
the content providers being published. Consider that a defective
content provider may block in ContentProvider::onCreate
indefinitely: in such a case the PROC_START_TIMEOUT has already
been removed as the activity manager must have called bindApplication.
In these cases, there will be nothing to wake threads blocking
on the (non timed) wait for provider to be published at the end of
ActivityManagerService::getContentProviderImpl. This can cause binder
threads to block 1 by 1 until eventually AMS runs out and becomes
unresponsive.
Bug:
22141958
Change-Id: I2226da5df5c79b37f0b896423b3c1eaa4a7ecbba
(cherry picked from commit
da33c13434cb20a11b522374411a5b819503e4e0)
Soonil Nagarkar [Fri, 10 Jul 2015 18:12:30 +0000 (11:12 -0700)]
Fix reintroduction of b/
10845061
Prevent crash in case where NLP is not available. Also fix an integer
overflow bug that remained uncaught.
BUG:
22345134
Change-Id: If6ff7b12f0d15bb2fe97589f8b0be10f9ed06197
(cherry picked from commit
2ec5c5cced4bd5b9dfbb7578f573c56b3bbc7ddf)
Erik Kline [Fri, 18 Sep 2015 03:21:56 +0000 (12:21 +0900)]
Grab a wakelock while doing ARP/ND probing
Bug:
23197666
Change-Id: I5bf6e83b37fcd924f5f8e750f65bb5061f931e56
Baligh Uddin [Sat, 19 Sep 2015 02:45:29 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:45:16 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:50 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:47 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:44 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:42 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:39 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:35 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:31 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:28 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:25 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:23 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:43:21 +0000 (02:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:35:14 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:35:12 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Justin Harrison [Sat, 19 Sep 2015 00:21:41 +0000 (00:21 +0000)]
Merge "Add support for setting color transforms" into mnc-dr-dev
Tim Kilbourn [Fri, 18 Sep 2015 23:55:56 +0000 (23:55 +0000)]
Merge "Always set the usb config when modifying it." into mnc-dr-dev
Michael Wright [Mon, 14 Sep 2015 23:13:26 +0000 (00:13 +0100)]
Add support for setting color transforms
Bug:
24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
Vineeta Srivastava [Fri, 18 Sep 2015 22:19:41 +0000 (22:19 +0000)]
Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev
Adam Lesinski [Fri, 18 Sep 2015 22:15:19 +0000 (22:15 +0000)]
Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
sangjoon84.lee [Fri, 18 Sep 2015 08:50:55 +0000 (17:50 +0900)]
set config_use_sim_language_file false for SE Telia/Sweden 3G
BUG=
24184934
Change-Id: I721b3e6c29b78a792a15ab4ba72a81a3f4ce270d
Tim Kilbourn [Fri, 18 Sep 2015 21:57:28 +0000 (14:57 -0700)]
Always set the usb config when modifying it.
On some devices, setting system properties takes too long and we end up
with races where adbd gets killed and never comes back. With this
change we avoid a small optimization that checks the previous value of
the config, instead opting to set it every time.
Bug:
23631400
Change-Id: I7567cc2efb3d5d15c45334bd66b28877a2af0ac3
Adam Lesinski [Fri, 18 Sep 2015 21:56:34 +0000 (14:56 -0700)]
Fix crash when no power_profile is specified
Always connected devices don't have power_profiles,
so handle the case where the default cpu speed count of
1 is used on a device with more cpu speeds.
Bug:
23776983
Change-Id: Ifdddad2f28eea5b730833622a6b6043b3086efd2
Baligh Uddin [Fri, 18 Sep 2015 21:17:59 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I08b112bde5280593b52c7aa50b56d41092f94056
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 21:15:54 +0000 (14:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81add884ffd46b17bed8f38abb835c79aeb4752f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 21:06:53 +0000 (14:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie83919c03d360d8955701954b4888e0e7ac51aae
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 21:04:36 +0000 (14:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1a186ed5db66f57c223a432802d130165bfcb5d4
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 21:02:31 +0000 (14:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I31f62d18cace1e7b37b900f94e624e9fc1762f2f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 20:57:25 +0000 (13:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I41869ce6fb7b24530a7fd0b66eb244b9d1a7821d
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 20:55:23 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id3a7092d59391fd20c2b643551eee8a2c6cf104b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 20:53:19 +0000 (13:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccdea720e2b636f99e014f195772bff4a0afc149
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 20:51:14 +0000 (13:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibf24678007e2bdc2e06c8c1b1f3372cb3d6ccd18
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 20:49:07 +0000 (13:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5087d6db12e2b7ac013404d8d08de6561ce5b54e
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 20:47:06 +0000 (13:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I28973f9307de9323e13d9ef26b0fd652a8ffb578
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 20:44:58 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9aa0f770c1b5b738d9210fd95bab56d8ddb793e1
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 20:42:47 +0000 (13:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4a03a04f3c0915132a8dcb8102a7e203f2ecba07
Auto-generated-cl: translation import
Adam Lesinski [Fri, 18 Sep 2015 20:26:07 +0000 (20:26 +0000)]
Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
Baligh Uddin [Fri, 18 Sep 2015 17:22:02 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I61591ecfb78bae60091771b015e0898570f55abe
Auto-generated-cl: translation import
Baligh Uddin [Fri, 18 Sep 2015 17:18:08 +0000 (10:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b25c04b472923b1334df87d5a271d3164694d20
Auto-generated-cl: translation import
Adam Powell [Fri, 18 Sep 2015 16:25:30 +0000 (16:25 +0000)]
Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
Jeff Sharkey [Fri, 18 Sep 2015 01:15:10 +0000 (18:15 -0700)]
Relax locking when scanning private volumes.
Private volumes with many large apps can take a long time to scan,
which currently happens on the main thread with several large locks
held, making it likely to trigger the system-wide watchdog.
This change relaxes this locking by scanning on the PackageManager
worker thread, and by only holding locks when required. In
particular, we release the installer lock between each scan to give
other apps waiting to dexopt a chance to breathe.
Bug:
24172036
Change-Id: Ie28d3ff72d6be28fa2f72c57d5e4146c768df89d
Shishir Agrawal [Fri, 18 Sep 2015 01:49:58 +0000 (01:49 +0000)]
Merge "Allow non-persistent manual network selection." into mnc-dr-dev
Jorim Jaggi [Fri, 18 Sep 2015 00:41:31 +0000 (00:41 +0000)]
Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev
Jorim Jaggi [Wed, 16 Sep 2015 22:53:42 +0000 (15:53 -0700)]
Start fingerprint authentication in onStartedGoingToSleep
We used to start fingerprint authentication in onFinishedGoingToSleep.
This was a UX issue because then users couldn't place the finger on
the sensor immediately after pressing the power button because
onFinishedGoingToSleep is significantly delayed (around 900ms after
pressing the power button).
Bug:
23570959
Change-Id: I0bf557ebd10e6a8b033ab98a78aa338bf6538dcc
Jorim Jaggi [Wed, 16 Sep 2015 21:53:48 +0000 (14:53 -0700)]
Handle case correctly when screen times out and locking immediately
In case the the screen timed out and the setting was set to "lock now"
in case the screen times out, we locked before finished going to sleep,
leading to all kinds of state messups in Keyguard, including an empty
lockscreen when authenticating with fingerprint during that period.
Bug:
23952388
Change-Id: If1629be1171c841d51ec0555422e6108002fdb73
Zach Riggle [Thu, 17 Sep 2015 22:33:34 +0000 (22:33 +0000)]
am
ad0acf1d: am
9836b64f: am
f68b1953: am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
ad0acf1d104988238f431d874f0ecf9917a06699':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 22:25:53 +0000 (22:25 +0000)]
am
9836b64f: am
f68b1953: am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
9836b64f529238d1219f1937abf481383cd0cacd':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 22:17:11 +0000 (22:17 +0000)]
am
f68b1953: am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
f68b1953259a13562f5a2331526edafae5c1d99f':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 22:00:29 +0000 (22:00 +0000)]
am
683cd049: resolved conflicts for
521def98 to lmp-mr1-dev
* commit '
683cd049f7c762251567a0e0386ee49bb1428351':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Zach Riggle [Thu, 17 Sep 2015 21:34:08 +0000 (17:34 -0400)]
resolved conflicts for
521def98 to lmp-mr1-dev
Adam Powell [Thu, 17 Sep 2015 20:38:16 +0000 (13:38 -0700)]
Badge ChooserActivity choices with their app icon for disambig
When two or more activities with the same user-visible label are
shown, we have traditionally shown the app name or package name if the
app names also match. This was to help the user tell the difference
between multiple apps publishing similar activities and avoid
unintentionally starting the wrong one. However, in the case of
explicit choosers (e.g. ACTION_SEND sharing) a few common collisions
occur in practice and falling all the way back to package name isn't
very helpful.
Instead, we now assume that the app icon, which the user has seen
before at install time, is unique enough on its own to disambiguate
these cases and avoid user confusion. We no longer show the app name
or package name as secondary text in the chooser.
In cases where an activity has a different icon from its containing
app, we now badge the activity icon with the app icon so that the user
knows which app a potentially ambiguous choice belongs to.
Bug
24113937
Change-Id: Ie54fbf77bfcc86e50768f93be2be0e53cf2ce7b5
Zach Jang [Thu, 17 Sep 2015 20:44:41 +0000 (20:44 +0000)]
am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Thu, 17 Sep 2015 20:32:53 +0000 (20:32 +0000)]
am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
fe4cbf2b1b135b327018915a512a8e6293a96017':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Thu, 17 Sep 2015 20:24:00 +0000 (20:24 +0000)]
am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
cff4e09e26e3b976aa0273df78e89f592fc6d287':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Thu, 17 Sep 2015 20:09:55 +0000 (20:09 +0000)]
am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
bdf7f3583c637f370e97e74526df14b9c70e6493':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]
am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
1cf21e443aaf207b962f50169be28c0babe71f61':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Tim Murray [Thu, 17 Sep 2015 02:24:32 +0000 (02:24 +0000)]
Merge "Send power hint on fling gestures." into mnc-dr-dev
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings
b/
23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings
b/
23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
Michael Wright [Wed, 16 Sep 2015 22:19:26 +0000 (23:19 +0100)]
Send power hint on fling gestures.
Use the existing PointerEventListener infrastructure to listen for
gestures that look like flings and hint to the power system when they
happen. Since we don't actually have a bound for the fling like a
regular application would, limit them to five seconds and refresh
every time a new fling is seen until the five second time period is
up.
bug
24059298
Change-Id: I5757a1e88f2ab2ef08cccefa8221d809ae71bb6f
Jorim Jaggi [Thu, 10 Sep 2015 22:48:21 +0000 (15:48 -0700)]
Allow camera launch also when device is interactive
Bug:
23967648
Change-Id: If91df75e6325b3969dc2351a70af0c160d3eab04
Adam Powell [Wed, 9 Sep 2015 00:01:49 +0000 (17:01 -0700)]
Handle single-choice ChooserActivities and bound ChooserTargetServices
Fix cases where we could try to unbind from a ChooserTargetService
that is not connected. This could happen if we still had stale replies
coming back after the activity was destroyed.
Always offer users an explicit choice in ChooserActivity, don't
auto-start a single option.
Make sure we don't allow a wedged ChooserTargetService to hold a hard
reference to the ChooserActivity via its internal result callback.
Bug
23152483
Change-Id: I7c8b1fc9559dcd477702ef582011b088b07d646b
(cherry picked from commit
9761ab2a645a4643bd20619c7c148ef07e0dd39d)
Fyodor Kupolov [Wed, 16 Sep 2015 19:37:47 +0000 (19:37 +0000)]
Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
Jack Yu [Wed, 16 Sep 2015 19:15:49 +0000 (19:15 +0000)]
Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev
Chris Tate [Wed, 16 Sep 2015 17:05:07 +0000 (17:05 +0000)]
Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
Andres Morales [Wed, 16 Sep 2015 16:04:56 +0000 (16:04 +0000)]
Merge "reset lockout deadline on device reboot" into mnc-dr-dev
Zach Jang [Wed, 16 Sep 2015 02:16:04 +0000 (02:16 +0000)]
am
716c6269: am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
716c6269674474867dc4720f86f739c639c83400':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:16:00 +0000 (02:16 +0000)]
am
971ff47c: am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
971ff47c75889a2fc4ac710fbe62ba819feeaba6':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 02:06:31 +0000 (02:06 +0000)]
am
63348ae4: (-s ours) am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
63348ae4572cd9394e79fe343d2fca2b38498d1c':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 02:06:26 +0000 (02:06 +0000)]
am
1b06455e: (-s ours) am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
1b06455e44395489dcd027a170e68eabf2ebe1da':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:56:57 +0000 (01:56 +0000)]
am
11317e82: am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
11317e82cf561597bbd4e2dbf5840854e6b7a16d':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:56:52 +0000 (01:56 +0000)]
am
00db0826: am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
00db0826561b23a54db28ed5203fd7eff79c16c7':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:44:58 +0000 (01:44 +0000)]
am
32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
* commit '
32a420ea36fbae07484f6fcf718ed97865ca3158':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:44:53 +0000 (01:44 +0000)]
am
203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '
203b43547da94c9fb78931680b99f9db49fc46c9':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Wed, 16 Sep 2015 01:40:18 +0000 (01:40 +0000)]
Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
Zach Jang [Wed, 16 Sep 2015 01:38:41 +0000 (01:38 +0000)]
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
This reverts commit
3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.
Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
OSDN Git Service
