OSDN Git Service
Jorim Jaggi [Thu, 24 Sep 2015 02:29:01 +0000 (02:29 +0000)]
am
27f26df6: am
05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit '
27f26df629e7a5c2ea87ad46708dc4678c11d27a':
Update message in SIM PIN view when configuration changes
Jorim Jaggi [Thu, 24 Sep 2015 02:20:37 +0000 (02:20 +0000)]
am
05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit '
05b11bf357be9546a2cbdd3f37c32fc9567f4767':
Update message in SIM PIN view when configuration changes
Jorim Jaggi [Thu, 24 Sep 2015 00:23:47 +0000 (00:23 +0000)]
Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
Deepanshu Gupta [Wed, 23 Sep 2015 23:05:06 +0000 (23:05 +0000)]
Merge "Fix TypedArray.getTextArray()" into mnc-ub-dev
Deepanshu Gupta [Wed, 23 Sep 2015 22:57:43 +0000 (15:57 -0700)]
Fix TypedArray.getTextArray()
Change-Id: Ic55b52840892fbf2a4258ba97ed31ca0283da8ed
Jorim Jaggi [Wed, 23 Sep 2015 19:03:26 +0000 (19:03 +0000)]
am
1bcb3472: am
6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '
1bcb3472669529edc991a31e6cbf7866a385383e':
Do not go over handler to dispatch keyguard visibility
Jorim Jaggi [Wed, 23 Sep 2015 18:55:38 +0000 (18:55 +0000)]
am
6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '
6a15d528c0a4501389008ef945dec38b5ca6919a':
Do not go over handler to dispatch keyguard visibility
Jorim Jaggi [Wed, 23 Sep 2015 18:52:12 +0000 (11:52 -0700)]
Update message in SIM PIN view when configuration changes
Bug:
24273807
Change-Id: I497fcd2ee527ec22d14ff1b6c30be4ef9a878980
Jorim Jaggi [Tue, 22 Sep 2015 22:55:33 +0000 (15:55 -0700)]
Do not go over handler to dispatch keyguard visibility
When going over the handler, it could happen with a bad interleaving
we thought that Keyguard was not showing when getting the
onFinishedGoingToSleep message, so we stopped fingerprint
authentication. For some reason our state machine for canceling
/restarting authentication didn't work correctly so the fingerprint
listening state was not correct.
Bug:
24178814
Change-Id: I2a4731f195982395244c12e4d33b2b7d561c5671
Todd Kennedy [Wed, 23 Sep 2015 18:12:03 +0000 (18:12 +0000)]
am
898e6973: am
739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
* commit '
898e6973ca198f327059d331b4d83b1d183d5fb1':
save "retain loader" state
Todd Kennedy [Wed, 23 Sep 2015 18:05:58 +0000 (18:05 +0000)]
am
739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
* commit '
739bb7c694aee521995100c456cf1c8341820bec':
save "retain loader" state
Todd Kennedy [Wed, 23 Sep 2015 17:56:52 +0000 (17:56 +0000)]
Merge "save "retain loader" state" into mnc-dr-dev
Paul Jensen [Wed, 23 Sep 2015 17:42:53 +0000 (17:42 +0000)]
am
d737f715: am
4b7b8117: am
9971167f: am
5ebe8e26: am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
d737f715d1188abf89891f4c38308fee04ae2e73':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 17:42:46 +0000 (17:42 +0000)]
am
6a728e17: am
83ce299c: am
62bb1897: am
554cecea: (-s ours) am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
6a728e1744749a6b27e22d696b5327909e57d126':
Fix NOT_RESTRICTED network capability and enforce it.
Baligh Uddin [Wed, 23 Sep 2015 17:42:40 +0000 (17:42 +0000)]
am
eb1e4b14: (-s ours) am
9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
eb1e4b14c979b36abbd6869ee300ec69936afb55':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:42:34 +0000 (17:42 +0000)]
am
981c592d: (-s ours) am
18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
981c592d2a6eaf3e43a8cab274fbcb4c58b99eab':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:42:28 +0000 (17:42 +0000)]
am
c31d6b70: (-s ours) am
d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
c31d6b705c1dfb1f85f5cdfd54593a88c858a2c5':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:42:22 +0000 (17:42 +0000)]
am
a58143b4: (-s ours) am
a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a58143b41ce92c425dbdc0abd6a6961cf571a083':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:42:16 +0000 (17:42 +0000)]
am
0b97b8cf: (-s ours) am
64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
0b97b8cf7954d76c5f6d6d21a7808bbcff524b99':
Import translations. DO NOT MERGE
Paul Jensen [Wed, 23 Sep 2015 17:25:49 +0000 (17:25 +0000)]
am
4b7b8117: am
9971167f: am
5ebe8e26: am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
4b7b81178482029f7f58d64cea8620574294ce78':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 17:25:45 +0000 (17:25 +0000)]
am
83ce299c: am
62bb1897: am
554cecea: (-s ours) am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
83ce299c6a676819351985c379661ae1f98e806c':
Fix NOT_RESTRICTED network capability and enforce it.
Baligh Uddin [Wed, 23 Sep 2015 17:25:26 +0000 (17:25 +0000)]
am
9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
9c5e49b713db3ddf12d90d8cff9c2e8191a3667d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:25:22 +0000 (17:25 +0000)]
am
18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
18daf48f1af38a75c2fb2a67204fc0852121ade2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:25:18 +0000 (17:25 +0000)]
am
d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
d213d28807c07e7030ae506413fbb0d2c6a9c6b9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:25:08 +0000 (17:25 +0000)]
am
a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a6928d4d2673f38e4c4110f1d27537044540a7aa':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:25:04 +0000 (17:25 +0000)]
am
64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
64f17a522ab39bec570e96c6bab7442f6026b902':
Import translations. DO NOT MERGE
Paul Jensen [Wed, 23 Sep 2015 14:50:45 +0000 (14:50 +0000)]
am
9971167f: am
5ebe8e26: am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
9971167fbe7f3b356ba7fd89d91271376a56d235':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 14:50:40 +0000 (14:50 +0000)]
am
62bb1897: am
554cecea: (-s ours) am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
62bb18976f3a79405897bf44bdec8f0abd855b9f':
Fix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Wed, 23 Sep 2015 14:42:02 +0000 (14:42 +0000)]
am
5ebe8e26: am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
5ebe8e26f2c9517ce321a0fbcbed6efe2960da47':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 14:41:57 +0000 (14:41 +0000)]
am
554cecea: (-s ours) am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
554cecea4c5e39c25efb721258366ce12e6b861c':
Fix NOT_RESTRICTED network capability and enforce it.
Baligh Uddin [Wed, 23 Sep 2015 14:15:57 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:15:31 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:15:25 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:12:25 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:12:06 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Paul Jensen [Wed, 23 Sep 2015 11:33:18 +0000 (11:33 +0000)]
am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
4cbfe3316fd1105b697a9838ef7bafaebf5080a2':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 11:33:13 +0000 (11:33 +0000)]
am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
10a7d7449dae2aabf4f22f980e7efabf274a939a':
Fix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Wed, 23 Sep 2015 11:21:27 +0000 (11:21 +0000)]
am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
773d71e7c45d12810267bb24735360da6e5b258d':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 11:21:22 +0000 (11:21 +0000)]
am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
Fix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Wed, 23 Sep 2015 11:13:48 +0000 (11:13 +0000)]
am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
962c3a0f2dd46d55ea591671c0a90c1c40214af7':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 11:13:40 +0000 (11:13 +0000)]
am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
635f871132449bea7489f6a61276979beeee5591':
Fix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Wed, 23 Sep 2015 11:06:32 +0000 (11:06 +0000)]
am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 11:06:27 +0000 (11:06 +0000)]
am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
a9e98343146244b71e236d82c95a8d0fa30a41c1':
Fix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Wed, 23 Sep 2015 10:59:31 +0000 (10:59 +0000)]
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 10:58:57 +0000 (10:58 +0000)]
Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Baligh Uddin [Wed, 23 Sep 2015 08:54:57 +0000 (01:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e80237aa0c299f831687de31cb85cf2658d3f3f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Sep 2015 08:44:04 +0000 (01:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4dc7584743f13b1c0c8661b483af51cc10101a3
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Sep 2015 08:31:31 +0000 (01:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c5c75590f30ee06cd8171bffb04da5073c394dc
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Sep 2015 08:23:51 +0000 (01:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia019f181e358d2925493075488bea307f7131215
Auto-generated-cl: translation import
Justin Harrison [Wed, 23 Sep 2015 06:18:04 +0000 (06:18 +0000)]
am
184440ce: am
47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev
* commit '
184440cea399d2332b5dc138a9e8a47e9cde3398':
Extended the maximum pulsing duration when dozing
Justin Harrison [Wed, 23 Sep 2015 06:07:47 +0000 (06:07 +0000)]
am
47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev
* commit '
47cae24077015c5226f5b2d00ebe841ccbaed2d6':
Extended the maximum pulsing duration when dozing
Justin Harrison [Wed, 23 Sep 2015 06:00:24 +0000 (06:00 +0000)]
Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev
Michael Lentine [Wed, 23 Sep 2015 05:33:05 +0000 (05:33 +0000)]
am
0d93002a: am
17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev
* commit '
0d93002af027044070a554d553ab524564404b18':
Dismiss color fade when it is no longer used.
Michael Lentine [Wed, 23 Sep 2015 05:25:58 +0000 (05:25 +0000)]
am
17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev
* commit '
17a764431a71ff91cbd9272d592fdcd15a9c7539':
Dismiss color fade when it is no longer used.
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
Baligh Uddin [Wed, 23 Sep 2015 04:42:46 +0000 (21:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45408b967515cd8e66d922507127a392dacbdf4f
Auto-generated-cl: translation import
Soonil Nagarkar [Wed, 23 Sep 2015 02:06:09 +0000 (02:06 +0000)]
am
fd5cb76e: am
79490dba: Merge "Fix reintroduction of b/
10845061" into mnc-dr-dev
* commit '
fd5cb76ed654998df466147c19ec985115749e70':
Fix reintroduction of b/
10845061
Jorim Jaggi [Wed, 23 Sep 2015 02:06:03 +0000 (02:06 +0000)]
am
6da88610: am
302475e9: Fix verifyUnlock
* commit '
6da88610cea1e5f815e2d56979f54808c02a652f':
Fix verifyUnlock
Jorim Jaggi [Wed, 23 Sep 2015 02:05:56 +0000 (02:05 +0000)]
am
7ef6b8d7: am
1b68e8b7: Log time difference between power button presses for gesture
* commit '
7ef6b8d7449c1cf629e227a948f72bf73fcddb57':
Log time difference between power button presses for gesture
Soonil Nagarkar [Wed, 23 Sep 2015 01:58:11 +0000 (01:58 +0000)]
am
79490dba: Merge "Fix reintroduction of b/
10845061" into mnc-dr-dev
* commit '
79490dbacd90a851ed8d03d64acedbf3616adba4':
Fix reintroduction of b/
10845061
Jorim Jaggi [Wed, 23 Sep 2015 01:58:01 +0000 (01:58 +0000)]
am
302475e9: Fix verifyUnlock
* commit '
302475e93ce00287770aba9668acbe86e8b20a05':
Fix verifyUnlock
Jorim Jaggi [Wed, 23 Sep 2015 01:57:55 +0000 (01:57 +0000)]
am
1b68e8b7: Log time difference between power button presses for gesture
* commit '
1b68e8b711281a65c73006f10fdc2fdf2379ad60':
Log time difference between power button presses for gesture
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
Mojtaba Seyedhosseini [Tue, 22 Sep 2015 21:51:07 +0000 (21:51 +0000)]
am
6e7cbb7c: Merge "Add logs for the ungaze gesture." into cw-e-dev
* commit '
6e7cbb7c73b501eac6704ab407ec60f4d839bb6b':
Add logs for the ungaze gesture.
Mojtaba Seyedhosseini [Tue, 22 Sep 2015 21:41:48 +0000 (21:41 +0000)]
Merge "Add logs for the ungaze gesture." into cw-e-dev
Mojtaba [Fri, 18 Sep 2015 23:35:24 +0000 (16:35 -0700)]
Add logs for the ungaze gesture.
-We add logs to track how much screen time we save with the ungaze feature.
Change-Id: I02bce959ce7ed5bc6c848e51256063c946ff3e87
Baligh Uddin [Tue, 22 Sep 2015 21:02:25 +0000 (21:02 +0000)]
am
2c08546a: am
d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev
* commit '
2c08546afb01c938e3778a155488b15e326703f1':
Enforce a timeout for Content Providers to be published.
Baligh Uddin [Tue, 22 Sep 2015 20:56:05 +0000 (20:56 +0000)]
am
d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev
* commit '
d2b597d1fdc99c512f1addfc817eea8d375a84ec':
Enforce a timeout for Content Providers to be published.
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:50:56 +0000 (18:50 +0000)]
am
dbca76cd: am
1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
* commit '
dbca76cda1a2a6fa95c592654f8649cb30b65833':
Fix Array Index Out of Bounds in BatteryStatsImpl
Andreas Gampe [Tue, 22 Sep 2015 18:44:47 +0000 (18:44 +0000)]
am
9ce68b24: am
b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
* commit '
9ce68b24440a7bc326cad2d09940ccf750eb2b2a':
Frameworks/base: Propagate boot status to installd
Adam Lesinski [Tue, 22 Sep 2015 18:42:33 +0000 (18:42 +0000)]
am
1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
* commit '
1b57758a1bb814c3a00ec864fe164bfe7861a9ab':
Fix Array Index Out of Bounds in BatteryStatsImpl
Andreas Gampe [Tue, 22 Sep 2015 18:36:43 +0000 (18:36 +0000)]
am
b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
* commit '
b49245f96233b7f89fb5d4ba52576131ca6fb47a':
Frameworks/base: Propagate boot status to installd
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
Todd Kennedy [Thu, 10 Sep 2015 20:58:01 +0000 (13:58 -0700)]
save "retain loader" state
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.
Bug:
23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
Diego Perez [Tue, 22 Sep 2015 10:08:35 +0000 (11:08 +0100)]
Avoid calling scrollBy(0,0) on render
Usually scrollBy(0, 0) won't have any effect but when called on the
NumberPicker but, in some cases, it seems to cause an endless loop.
When called from layoutlib, this will hold the read lock causing all
operations trying to acquire the write lock to block forever.
Bug: http://b.android.com/182506
Change-Id: Ib25427d3f32d804d1c481d979795eee71fbdbc6d
Selim Cinek [Tue, 22 Sep 2015 08:05:29 +0000 (10:05 +0200)]
Extended the maximum pulsing duration when dozing
Change-Id: Ib0f4cb4c7a011ce6df4100189b79ed4c2476c2c6
Todd Kennedy [Thu, 10 Sep 2015 20:58:01 +0000 (13:58 -0700)]
save "retain loader" state DO NOT MERGE
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.
Bug:
23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
(cherry picked from commit
c5ac16f531504d5bde7c87f8e3088652daeb543f)
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:52:55 +0000 (21:52 +0000)]
am
ef44f99d: am
88f92ec5: 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 '
ef44f99d90e81de4dff92d7cdbdb58e6b38fcbd4':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:52:49 +0000 (21:52 +0000)]
am
4a9ccd15: am
c53f18b7: 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 '
4a9ccd15bd42cfb600d180ae6b7a5ddbebaffc59':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:45:09 +0000 (21:45 +0000)]
am
88f92ec5: 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 '
88f92ec5a76c94dcb084ffcc8a4fc36a66bb9ca2':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:45:05 +0000 (21:45 +0000)]
am
c53f18b7: 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 '
c53f18b7b3cea030983e23fbf0d49dfcda77b249':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
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:48:56 +0000 (20:48 +0000)]
am
b7b17fa6: am
281a868c: am
e1a6299b: Relax locking when scanning private volumes.
* commit '
b7b17fa6a14a6916f12568f02360a1ec1792f256':
Relax locking when scanning private volumes.
Jeff Sharkey [Mon, 21 Sep 2015 20:40:08 +0000 (20:40 +0000)]
am
281a868c: am
e1a6299b: Relax locking when scanning private volumes.
* commit '
281a868c69e0915efc16eb3c65f669bbf0df69df':
Relax locking when scanning private volumes.
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
OSDN Git Service
