OSDN Git Service
Bart Sears [Mon, 31 Aug 2015 22:58:08 +0000 (22:58 +0000)]
am
d66d4d1b: am
627975fc: am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
d66d4d1bea063acefae6bab5faf822d7a363b216':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:57:57 +0000 (22:57 +0000)]
am
188a33c7: am
7b7a3e75: am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
188a33c7acb53fb59364b82a41ec9270f6aef5cf':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 22:45:19 +0000 (22:45 +0000)]
am
627975fc: am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
627975fca234bfc62d60904547ba3fb2ac675ec8':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:45:15 +0000 (22:45 +0000)]
am
7b7a3e75: am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
7b7a3e75c3a107c139a7832c5a04cc0d01b7cd1f':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 22:32:22 +0000 (22:32 +0000)]
am
74890df7: (-s ours) am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
74890df7267d1c203fdbc5e90052f723a3c89f3d':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:32:17 +0000 (22:32 +0000)]
am
0bafa33f: (-s ours) am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
0bafa33fcdebeaf6bdfd36a3f75e461d630b86bc':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 22:20:06 +0000 (22:20 +0000)]
am
3cb7e91f: am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
3cb7e91f2cd1fb29e6d0926e35f90647200c1af4':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:19:58 +0000 (22:19 +0000)]
am
35c1eb9e: am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
35c1eb9e6506b407a1af40359d48bb06d884385d':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 22:03:48 +0000 (22:03 +0000)]
am
199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
* commit '
199c74eab1a30bff7db7bb4d24c161f36edb7f5b':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Tao Bao [Mon, 31 Aug 2015 22:03:44 +0000 (22:03 +0000)]
am
82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '
82b70db7dd906013d131737a5bec2ae59b41ae61':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bart Sears [Mon, 31 Aug 2015 21:53:46 +0000 (21:53 +0000)]
Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev
Tao Bao [Sat, 29 Aug 2015 00:46:20 +0000 (17:46 -0700)]
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bug:
23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
Tyler Gunn [Mon, 31 Aug 2015 21:15:09 +0000 (21:15 +0000)]
am
7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev
* commit '
7878eee8a9c20752e038f563b98b6b42c372cd0f':
Rename carrier config constant.
Tyler Gunn [Mon, 31 Aug 2015 21:01:19 +0000 (21:01 +0000)]
Merge "Rename carrier config constant." into mnc-dr-dev
Selim Cinek [Mon, 31 Aug 2015 20:37:44 +0000 (20:37 +0000)]
am
a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev
* commit '
a7cad8e8a4d698bd3880299265760f5158073e2d':
Fixed a bug where the secure camera would flash when rotated
Adrian Roos [Mon, 31 Aug 2015 20:31:13 +0000 (20:31 +0000)]
am
78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
* commit '
781953123e5b0f0f85691eabc13b3430c3054a10':
Disable fingerprint after force lock
Bart Sears [Mon, 31 Aug 2015 20:31:08 +0000 (20:31 +0000)]
am
06fb3b2d: am
0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '
06fb3b2da8a57fdc5efe24ab9464e6e890740de6':
Don't throttle "while idle" alarms while not dozing
Selim Cinek [Mon, 31 Aug 2015 20:27:48 +0000 (20:27 +0000)]
Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev
Tyler Gunn [Mon, 31 Aug 2015 20:16:21 +0000 (13:16 -0700)]
resolved conflicts for merge of
d833cb54 to mnc-vt-dev
Change-Id: Ibd74014f660e0e6c6bdab2a01a35a81733359b86
Tyler Gunn [Mon, 31 Aug 2015 20:15:27 +0000 (13:15 -0700)]
Rename carrier config constant.
Bug:
23063217
Change-Id: I0050f0009a7681df1b04edbbd9331bc2918464a2
Adrian Roos [Mon, 31 Aug 2015 20:04:46 +0000 (20:04 +0000)]
Merge "Disable fingerprint after force lock" into mnc-dr-dev
Bart Sears [Mon, 31 Aug 2015 20:02:34 +0000 (20:02 +0000)]
am
0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '
0e2e85898743a070a0c42036fa9d841694819a00':
Don't throttle "while idle" alarms while not dozing
Bart Sears [Mon, 31 Aug 2015 19:49:11 +0000 (19:49 +0000)]
Merge "Don't throttle "while idle" alarms while not dozing" into mnc-dev
Tyler Gunn [Mon, 31 Aug 2015 19:46:12 +0000 (19:46 +0000)]
Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev
Adam Lesinski [Mon, 31 Aug 2015 19:14:12 +0000 (19:14 +0000)]
am
da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
* commit '
da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95':
BatteryStats: Start using cpu power from kernel
Adam Lesinski [Mon, 31 Aug 2015 19:04:46 +0000 (19:04 +0000)]
Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
Tyler Gunn [Fri, 28 Aug 2015 21:14:11 +0000 (14:14 -0700)]
Add carrier config for allowing non-emerg calls in ECM mode.
Default value is TRUE for all carriers, meaning that non-emergency calls
are allowed even when the phone is in emergency callback mode.
Bug:
23063217
Change-Id: I4a227ce64a1e594a055560f42c7611c8eccdae0f
Svetoslav Ganov [Mon, 31 Aug 2015 17:33:19 +0000 (17:33 +0000)]
am
144c4ff0: am
4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev
* commit '
144c4ff08a0be40e6b8af1bca269b33557923d71':
Fix a NPE when shutting down instrumentation
Svetoslav Ganov [Mon, 31 Aug 2015 17:22:53 +0000 (17:22 +0000)]
am
4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev
* commit '
4cb113ed72b771d3148c00a025eb8bc949ff6a41':
Fix a NPE when shutting down instrumentation
Svetoslav Ganov [Mon, 31 Aug 2015 17:16:23 +0000 (17:16 +0000)]
Merge "Fix a NPE when shutting down instrumentation" into mnc-dev
Svet Ganov [Sun, 30 Aug 2015 17:44:39 +0000 (10:44 -0700)]
Fix a NPE when shutting down instrumentation
bug:
23657953
Change-Id: I7187c3d911de24abe20a2c462a10352dd741efed
Pavel Zhamaitsiak [Sat, 29 Aug 2015 22:41:46 +0000 (22:41 +0000)]
am
d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev
* commit '
d9efca994f99523288986f29128d696440ee4150':
Support uneditable enhanced 4g lte mode config
Geoff Mendal [Sat, 29 Aug 2015 22:41:40 +0000 (22:41 +0000)]
am
469fa946: (-s ours) Import translations. DO NOT MERGE
* commit '
469fa946132b34165ea014e2eef7cd94f59171c1':
Import translations. DO NOT MERGE
Pavel Zhamaitsiak [Sat, 29 Aug 2015 15:40:05 +0000 (15:40 +0000)]
Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev
Geoff Mendal [Sat, 29 Aug 2015 15:37:22 +0000 (08:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I770ccd06cea0e57fa92434a33e4e183d79010921
Auto-generated-cl: translation import
Jim Miller [Sat, 29 Aug 2015 01:26:37 +0000 (01:26 +0000)]
am
3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev
* commit '
3656975ef879175aa81cf6362a6a7ffc4a5a99fc':
Run callbacks from fingerprintd through handler.
Jim Miller [Sat, 29 Aug 2015 01:14:45 +0000 (01:14 +0000)]
Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev
Jim Miller [Sat, 29 Aug 2015 00:29:49 +0000 (17:29 -0700)]
Run callbacks from fingerprintd through handler.
This fixes a potential race condition on the client monitors
where an async event from fingerprintd could change the state
and disrupt communication with the clients.
Fixes bug
23633702
Change-Id: I69635ab768f1e8abefd0b0d8b8e73bb81e7b5695
Sungmin Choi [Wed, 26 Aug 2015 06:30:34 +0000 (23:30 -0700)]
Support uneditable enhanced 4g lte mode config
Bug:
23539759
Change-Id: I069d994eaef2f57c3d01ff2f36abcd274da431a5
Ian Pedowitz [Sat, 29 Aug 2015 00:38:48 +0000 (00:38 +0000)]
am
8d027e6d: am
3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev
* commit '
8d027e6d523d13a9cf2a5cf4ef901cc3e78b901d':
Show the ResolverActivity in dock mode
Ian Pedowitz [Sat, 29 Aug 2015 00:31:29 +0000 (00:31 +0000)]
am
3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev
* commit '
3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07':
Show the ResolverActivity in dock mode
Ian Pedowitz [Sat, 29 Aug 2015 00:20:27 +0000 (00:20 +0000)]
Merge "Show the ResolverActivity in dock mode" into mnc-dev
Selim Cinek [Sat, 29 Aug 2015 00:05:56 +0000 (17:05 -0700)]
Fixed a bug where the secure camera would flash when rotated
Bug:
23602571
Change-Id: I9608a004d97ad27a0f4c6da8e9d955dc644b4941
Adrian Roos [Fri, 28 Aug 2015 23:49:59 +0000 (16:49 -0700)]
Disable fingerprint after force lock
Bug:
23275072
Change-Id: Icaeffaa1fa22a4a800ddf0f38105099557c74317
Selim Cinek [Fri, 28 Aug 2015 23:18:05 +0000 (23:18 +0000)]
am
e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev
* commit '
e774bdd6f09a65886429a2d84a6af7e4b6352280':
Added animation for trusted to fingerprint error
Selim Cinek [Fri, 28 Aug 2015 23:09:19 +0000 (23:09 +0000)]
Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev
Jorim Jaggi [Fri, 28 Aug 2015 22:50:57 +0000 (22:50 +0000)]
am
acace94c: Fix race condition by guarding callbacks
* commit '
acace94c1739b08ea72dc6c2f49cf29bce6c1dac':
Fix race condition by guarding callbacks
Ruben Brunk [Fri, 28 Aug 2015 22:34:22 +0000 (22:34 +0000)]
am
96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
* commit '
96990d0cdd7f7757ba16b927766854e0dc6fa994':
Fix DngCreator default crop calculations.
Robert Greenwalt [Fri, 28 Aug 2015 22:34:16 +0000 (22:34 +0000)]
am
5799f428: am
e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
* commit '
5799f428063cec8f0b85cdff41185e0725b19b74':
Reduce CONNECTIVITY_CHANGE bcasts
Jorim Jaggi [Fri, 28 Aug 2015 18:46:10 +0000 (11:46 -0700)]
Fix race condition by guarding callbacks
Bug:
23587553
Change-Id: Ia71760013f3acbb5aeb4e30bb716683c9c672742
Ruben Brunk [Fri, 28 Aug 2015 21:42:26 +0000 (21:42 +0000)]
Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
Robert Greenwalt [Fri, 28 Aug 2015 21:36:39 +0000 (21:36 +0000)]
am
e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
* commit '
e3bcde94caf8440d5e3958a340b3d276d03f7691':
Reduce CONNECTIVITY_CHANGE bcasts
Robert Greenwalt [Fri, 28 Aug 2015 21:27:22 +0000 (21:27 +0000)]
Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
Jorim Jaggi [Fri, 28 Aug 2015 20:17:29 +0000 (20:17 +0000)]
am
b774e554: Optimize fp touch to wake: Shortcut for report next draw
* commit '
b774e554f32fd65cac30b43d1cf679403ef4af82':
Optimize fp touch to wake: Shortcut for report next draw
Jorim Jaggi [Mon, 24 Aug 2015 21:52:45 +0000 (14:52 -0700)]
Optimize fp touch to wake: Shortcut for report next draw
When telling window manager that Keyguard window is in the correct
state for a fp-touch-to-wake sequence, it takes more than 1 frame at
the moment because the signal that WM is waiting for the next draw
is delayed by one frame because it is posted at the end of the
runnable queue.
To correctly fix this, we should post it at the beginning at the
queue, but this is way too risky this late. Instead, add a isolated
SysUI hack to report it faster.
Bug:
23401557
Change-Id: Icf64101e27611c7c01d108123021b22186f1e70c
Chris Tate [Fri, 28 Aug 2015 20:07:03 +0000 (20:07 +0000)]
am
9b2f9bcb: am
82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev
* commit '
9b2f9bcb56765c52a2fc9cdcdcf11c6707403210':
Crashing the system process is inadvisable
Chong Zhang [Fri, 28 Aug 2015 20:06:56 +0000 (20:06 +0000)]
am
482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev
* commit '
482635e34d0def1682ebc644db0636862994f649':
Fix deadlock when updating rotation
Chris Tate [Fri, 28 Aug 2015 19:58:35 +0000 (19:58 +0000)]
am
82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev
* commit '
82d14d60e7a772ecf45b637fd51a2335ad2a40cf':
Crashing the system process is inadvisable
Chong Zhang [Fri, 28 Aug 2015 19:57:57 +0000 (19:57 +0000)]
Merge "Fix deadlock when updating rotation" into mnc-dr-dev
Jeff Sharkey [Fri, 28 Aug 2015 19:48:45 +0000 (19:48 +0000)]
am
71f15791: am
d88152b4: Merge "Give shell permission to move apps." into mnc-dev
* commit '
71f1579190ee3658db15f55a4e5571f03ce431b6':
Give shell permission to move apps.
Chris Tate [Fri, 28 Aug 2015 19:48:38 +0000 (19:48 +0000)]
Merge "Crashing the system process is inadvisable" into mnc-dev
Robert Greenwalt [Fri, 28 Aug 2015 19:37:54 +0000 (12:37 -0700)]
Reduce CONNECTIVITY_CHANGE bcasts
If an app uses the new api (requestNetwork) to bring up MMS, don't
mark it as a legacy request. This was done because the messaging
service had to use a combination of new API and old
(requestRouteToHost) due to api problems. This has been resolved
so don't mark these as legacy requests anymore.
The general stuff is still in for other types due to lack of testing
time but this should be removed altogether in the future.
bug:
23350688
Change-Id: I41c27efb253c39d8af1357ae7916ed5315c716db
Jeff Sharkey [Fri, 28 Aug 2015 19:36:31 +0000 (19:36 +0000)]
am
d88152b4: Merge "Give shell permission to move apps." into mnc-dev
* commit '
d88152b4d910fa5e79908dcb6f14cd56ad03b21a':
Give shell permission to move apps.
Jeff Sharkey [Fri, 28 Aug 2015 19:30:31 +0000 (19:30 +0000)]
Merge "Give shell permission to move apps." into mnc-dev
Selim Cinek [Wed, 26 Aug 2015 01:34:29 +0000 (18:34 -0700)]
Added animation for trusted to fingerprint error
Bug:
21781452
Change-Id: Ib3b229c9ebece926a68a0c6a69341d0f68166698
Jeff Sharkey [Fri, 28 Aug 2015 18:20:39 +0000 (11:20 -0700)]
Give shell permission to move apps.
Also clear identity when measuring ASEC sizes to relax a second
permission requirement.
Bug:
23600574
Change-Id: Ib3a104426758e0e8f35dff0e504fe874bed7311f
David Friedman [Fri, 28 Aug 2015 18:41:18 +0000 (18:41 +0000)]
am
8b403e8c: am
3ab2e664: Merge "Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3." into mnc-dev
* commit '
8b403e8cb1bc6bfa2e9ba627f5c48d1a0bc65738':
Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3.
David Friedman [Fri, 28 Aug 2015 18:41:12 +0000 (18:41 +0000)]
am
144020c9: am
02e5b0f2: Docs: Fixes a mistaken TOC item at top-right so it now matches the item it links to.
* commit '
144020c9ff683fd7fdcf479d71e2920d9f70b182':
Docs: Fixes a mistaken TOC item at top-right so it now matches the item it links to.
Ruben Brunk [Thu, 27 Aug 2015 21:00:03 +0000 (14:00 -0700)]
Fix DngCreator default crop calculations.
Bug:
23591407
Change-Id: I1b0e46e7371b3db63e8d68230964d09d7537c3ce
David Friedman [Fri, 28 Aug 2015 18:30:34 +0000 (18:30 +0000)]
am
3ab2e664: Merge "Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3." into mnc-dev
* commit '
3ab2e66424d6e8faabd4342da21f488f7e3bfdb5':
Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3.
David Friedman [Fri, 28 Aug 2015 18:30:30 +0000 (18:30 +0000)]
am
02e5b0f2: Docs: Fixes a mistaken TOC item at top-right so it now matches the item it links to.
* commit '
02e5b0f2ffa54c67fe5ac8229ac7e6268a8519c6':
Docs: Fixes a mistaken TOC item at top-right so it now matches the item it links to.
David Friedman [Fri, 28 Aug 2015 18:22:16 +0000 (18:22 +0000)]
Merge "Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3." into mnc-dev
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
DO NOT MERGE. 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
Christopher Tate [Fri, 28 Aug 2015 17:55:14 +0000 (10:55 -0700)]
Crashing the system process is inadvisable
When asking for the set of services published by a package, it's
quite possible that there are none, in which case the returned List<>
is null rather than valid-but-empty. Don't bother looking at it
when it's null.
Bug
23614440
Change-Id: Ibebb26b9c3f75ec810a95f1b9d2663e884cb98bc
Chong Zhang [Fri, 28 Aug 2015 17:22:36 +0000 (10:22 -0700)]
Fix deadlock when updating rotation
Post a runnable in MyOrientationListener.onProposedRotationChanged for
the updateRotation() so that it doesn't acquire WM lock while holding
WindowOrientationListener lock. It could cause deadlock if WM is
is performing a relayout and try to access WindowOrientationListener.
bug:
23507268
Change-Id: I5775f5a13cae0283fef64877801bf8a39dfc90a4
Anatol Pomazau [Fri, 28 Aug 2015 15:27:09 +0000 (15:27 +0000)]
am
34c08828: Merge "Fix NPE in AR hardware binding sequence. b/
22772433" into mnc-dr-dev
* commit '
34c0882898c3e37ea1733e4614233c8a4cb71b67':
Fix NPE in AR hardware binding sequence. b/
22772433
Anatol Pomazau [Fri, 28 Aug 2015 15:21:38 +0000 (15:21 +0000)]
Merge "Fix NPE in AR hardware binding sequence. b/
22772433" into mnc-dr-dev
destradaa [Tue, 28 Jul 2015 00:14:03 +0000 (17:14 -0700)]
Fix NPE in AR hardware binding sequence.
b/
22772433
To keep the old Watcher binding sequence backwards compatible,
it is required to ensure that the callback is only invoked if
the feature is supported by the platform, and an instance is
available.
Change-Id: I0a6335f10647184abdad3ee1583b505160a3308f
David Friedman [Fri, 28 Aug 2015 00:59:44 +0000 (17:59 -0700)]
Docs: Fixes a mistaken TOC item at top-right so it now matches the item it links to.
Change-Id: I78cf665fcf9a99aa579eda455ec34987328df445
Ashish Sharma [Thu, 27 Aug 2015 23:34:20 +0000 (23:34 +0000)]
am
ffa3d040: am
3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev
* commit '
ffa3d0408f9c3ffb5ab3ee45ef6c466d795fb2c8':
BatteryStats: Bump checkin version
Ashish Sharma [Thu, 27 Aug 2015 23:28:22 +0000 (23:28 +0000)]
am
3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev
* commit '
3883e72aeda7dcc5f76eba7ad2e95ad2cb041687':
BatteryStats: Bump checkin version
Ashish Sharma [Thu, 27 Aug 2015 23:21:16 +0000 (23:21 +0000)]
Merge "BatteryStats: Bump checkin version" into mnc-dev
Christopher Tate [Thu, 27 Aug 2015 22:09:53 +0000 (15:09 -0700)]
Show the ResolverActivity in dock mode
If there are multiple dock apps present the end result should be
the disambiguation UI, not a fast-forward to the 'normal' home
app.
Bug
23501598
Change-Id: Iebc106b136cb1e446d1e93935738335504f5b812
Christopher Tate [Thu, 27 Aug 2015 22:57:57 +0000 (15:57 -0700)]
Don't throttle "while idle" alarms while not dozing
Specifically, reduce the non-doze "while idle" minimum interval to
be the same as the generally-enforced minimum futurity of new alarms.
Bug
21602742
Change-Id: I044deaedc2daeff5d6f418f0fe091fea85f73fcf
David Friedman [Fri, 14 Aug 2015 05:32:24 +0000 (22:32 -0700)]
Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3.
Change-Id: I031bfbec9673699ef3f8680612b67dcb143882e7
Ajay Panicker [Thu, 27 Aug 2015 19:40:38 +0000 (19:40 +0000)]
am
c07701f2: am
3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev
* commit '
c07701f2764a1c09dc3e8af4321ff0ef66056fee':
Add StateMachine.removeDeferredMessages()
Ajay Panicker [Thu, 27 Aug 2015 19:33:31 +0000 (19:33 +0000)]
am
3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev
* commit '
3e5b01185c08c46b80c395ca1f9c93e45cd98ba5':
Add StateMachine.removeDeferredMessages()
Ajay Panicker [Thu, 27 Aug 2015 19:21:39 +0000 (19:21 +0000)]
Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev
Eric Laurent [Thu, 27 Aug 2015 18:35:04 +0000 (18:35 +0000)]
am
aef51d09: am
4a8034ca: AudioTrack: error reporting for getTimestamp()
* commit '
aef51d09ef33eb3f03789c71edc25a7b103728d1':
AudioTrack: error reporting for getTimestamp()
Eric Laurent [Thu, 27 Aug 2015 18:28:48 +0000 (18:28 +0000)]
am
4a8034ca: AudioTrack: error reporting for getTimestamp()
* commit '
4a8034caea13a90c01800ff554539772c6ff5523':
AudioTrack: error reporting for getTimestamp()
Adrian Roos [Thu, 27 Aug 2015 18:14:36 +0000 (18:14 +0000)]
am
16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
* commit '
16d7245b64062f4c65d55433642388d1dc9bdf70':
Prevent Fingerprint when SIM is locked
Adrian Roos [Thu, 27 Aug 2015 18:06:44 +0000 (18:06 +0000)]
Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
Eric Laurent [Thu, 2 Jul 2015 19:09:44 +0000 (12:09 -0700)]
AudioTrack: error reporting for getTimestamp()
Add a new getTimestamp() method that returns an error code.
Bug:
21886109.
Bug:
22202349.
Bug:
17548098.
Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
(cherry picked from commit
4e1ccd370fc268f3207c5baee08ac8c943c3fdf9)
Zhentao Sun [Thu, 27 Aug 2015 03:31:26 +0000 (03:31 +0000)]
am
fd538001: Merge "Added event log for camera launch gesture." into mnc-dr-dev
* commit '
fd538001f5c7f1fad68a27d8143c839bda82491b':
Added event log for camera launch gesture.
Zhentao Sun [Thu, 27 Aug 2015 03:23:46 +0000 (03:23 +0000)]
Merge "Added event log for camera launch gesture." into mnc-dr-dev
Jim Miller [Thu, 27 Aug 2015 02:52:37 +0000 (02:52 +0000)]
am
dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev
* commit '
dfb8cca04dd64dcdf1df4550f7e808360de0517d':
Don't check the keyguard PIN a second time
Jim Miller [Thu, 27 Aug 2015 02:44:18 +0000 (02:44 +0000)]
Merge "Don't check the keyguard PIN a second time" into mnc-dr-dev
Ajay Panicker [Wed, 26 Aug 2015 21:06:34 +0000 (14:06 -0700)]
Add StateMachine.removeDeferredMessages()
Bug:
23111466
Change-Id: Ifbb67d4eb080313af0968d5cb6b9508837e3458e
Rich Slogar [Thu, 27 Aug 2015 01:58:39 +0000 (01:58 +0000)]
am
9dbc35d1: am
258b56ec: am
9f37bd8a: am
0238bf24: docs: New auto Desktop Head Unit (DHU) docs
* commit '
9dbc35d10be3ac3a446e00c39d6604024e228f10':
docs: New auto Desktop Head Unit (DHU) docs
Deepanshu Gupta [Thu, 27 Aug 2015 01:58:33 +0000 (01:58 +0000)]
am
442c48b9: am
a4a1e68f: am
ebdedb47: (-s ours) am
42994097: am
a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]
* commit '
442c48b98ca8ef914fbdea3697239f6da88d551b':
LayoutLib: Update golden test images. [DO NOT MERGE]