OSDN Git Service
Justin Klaassen [Thu, 11 Aug 2016 03:00:29 +0000 (03:00 +0000)]
Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev am:
609770d34b
am:
73d8feb514
Change-Id: Ib9e3312110548ade5108cac0a7c8b3324b6bc2c2
Justin Klaassen [Thu, 11 Aug 2016 03:00:20 +0000 (03:00 +0000)]
Make NightDisplayService robust to early alarms am:
4346f63dbf
am:
49b3fbabf1
Change-Id: I0e6038c6435883911501fab6b159c204807af18f
Justin Klaassen [Thu, 11 Aug 2016 02:55:36 +0000 (02:55 +0000)]
Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev
am:
609770d34b
Change-Id: I6d297a3e1714cff39b904fa9a7881e86a1c5c201
Justin Klaassen [Thu, 11 Aug 2016 02:55:33 +0000 (02:55 +0000)]
Make NightDisplayService robust to early alarms
am:
4346f63dbf
Change-Id: I0ab6422a9d3da3a673f23f3e217682710e8ae296
TreeHugger Robot [Thu, 11 Aug 2016 02:46:49 +0000 (02:46 +0000)]
Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev
Adrian Roos [Thu, 11 Aug 2016 02:44:47 +0000 (02:44 +0000)]
Merge "Only disable trust agents after lockout" into nyc-mr1-dev am:
f6487b63a1
am:
dc915e418b
Change-Id: I7b498ec9fa8ef080295bffb5eda912e5d58fa525
Adrian Roos [Thu, 11 Aug 2016 02:44:42 +0000 (02:44 +0000)]
Only disable trust agents after lockout am:
9d6fc9246b
am:
73b2f5981e
Change-Id: Idec9662345a8ed9f75605d1b5dd39f04ef488389
Adrian Roos [Thu, 11 Aug 2016 02:38:51 +0000 (02:38 +0000)]
Merge "Only disable trust agents after lockout" into nyc-mr1-dev
am:
f6487b63a1
Change-Id: Id59329047a2857697d3611cd4179dace742364c3
Adrian Roos [Thu, 11 Aug 2016 02:38:45 +0000 (02:38 +0000)]
Only disable trust agents after lockout
am:
9d6fc9246b
Change-Id: I1fd7860a5a2c452e4b3c2e3e8d1073c423c9f054
TreeHugger Robot [Thu, 11 Aug 2016 02:30:31 +0000 (02:30 +0000)]
Merge "Only disable trust agents after lockout" into nyc-mr1-dev
Andreas Gampe [Thu, 11 Aug 2016 02:16:16 +0000 (02:16 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev am:
927db408a2
am:
c9c0edfa14
Change-Id: Ief749fa39db72532fbc91d075a130751a66d11df
Andreas Gampe [Thu, 11 Aug 2016 02:16:12 +0000 (02:16 +0000)]
Zygote: allow system server compilation to fail am:
e7bc152c20
am:
8253782f5b
Change-Id: I1fc916e9db2e391975b0037853cbfda9b08c706a
Andreas Gampe [Thu, 11 Aug 2016 02:11:26 +0000 (02:11 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev
am:
927db408a2
Change-Id: I11435b1853073eca75bcff33e180fc165eb3d460
Andreas Gampe [Thu, 11 Aug 2016 02:11:21 +0000 (02:11 +0000)]
Zygote: allow system server compilation to fail
am:
e7bc152c20
Change-Id: Ibaea0c9bc3a5eb0e8a64342e4e27b7cfca21c647
TreeHugger Robot [Thu, 11 Aug 2016 02:02:08 +0000 (02:02 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev
Justin Klaassen [Mon, 8 Aug 2016 22:01:47 +0000 (15:01 -0700)]
Make NightDisplayService robust to early alarms
Bug:
30743700
Use the same time for calculating the next activated state and
scheduling the next alarm. This prevents the alarm from being scheduled
incorrectly if the activated state is updated slightly before the
scheduled start or end time.
Change-Id: I690aebddd28547a25b507c227c4527ffdd7c6a02
Christopher Tate [Thu, 11 Aug 2016 01:12:11 +0000 (01:12 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev am:
262f0186bd
am:
dd1d9baa55
Change-Id: I69200ed34995f3ce1c1a90d18912953b525cca62
Christopher Tate [Thu, 11 Aug 2016 01:12:07 +0000 (01:12 +0000)]
Base date-change alarm on 24h "hour zero," not 12h am:
afa8b980ac
am:
3303c26759
Change-Id: I145b9c4e1de61b8b1e8b456fea39ebc0ef928c18
Christopher Tate [Thu, 11 Aug 2016 01:06:00 +0000 (01:06 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev
am:
262f0186bd
Change-Id: I5182e8474d0ed481485b58d1a6a0c447859ea5dd
Christopher Tate [Thu, 11 Aug 2016 01:05:58 +0000 (01:05 +0000)]
Base date-change alarm on 24h "hour zero," not 12h
am:
afa8b980ac
Change-Id: I4dac5d4eab675fde483ab3fe821370b02a3a8b05
Adrian Roos [Thu, 11 Aug 2016 00:09:55 +0000 (17:09 -0700)]
Only disable trust agents after lockout
Previously trust agents would be disabled even after one
wrong attempt. Now we wait for the cooldown (usually 5 attempts),
the same as fingerprint.
Also adds a TrustArchive entry of when device policy changes are sent to
trust agents.
Bug:
30037948
Change-Id: I9e284d994ddae45ef66b5b8b601297c63d8ba667
TreeHugger Robot [Thu, 11 Aug 2016 00:57:25 +0000 (00:57 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev
Yin-Chia Yeh [Thu, 11 Aug 2016 00:47:32 +0000 (00:47 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev am:
58b4623d1f
am:
ffa443f431
Change-Id: I2ee72a0857d2a4e4756727d876eed227f6e68653
Yin-Chia Yeh [Thu, 11 Aug 2016 00:47:26 +0000 (00:47 +0000)]
Camera: ensure lock ordering (device->session) am:
b0025e1f68
am:
de71f83c2c
Change-Id: I0c6addd8191c9e6ebde8b5efd066f54aaad71af5
Yin-Chia Yeh [Thu, 11 Aug 2016 00:39:28 +0000 (00:39 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
am:
58b4623d1f
Change-Id: I8c92a36230ae4b838cd06f421fdf8359e9a8a966
Yin-Chia Yeh [Thu, 11 Aug 2016 00:39:26 +0000 (00:39 +0000)]
Camera: ensure lock ordering (device->session)
am:
b0025e1f68
Change-Id: Idcb9b48274ecfe9fe2f306ae201491d1e485d601
Yin-Chia Yeh [Thu, 11 Aug 2016 00:32:13 +0000 (00:32 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:21:01 +0000 (00:21 +0000)]
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev am:
938d298116
am:
3cd67ed9d2
Change-Id: I43d37ca45ed9c0a6c26799cf323c72dec5228ca9
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:20:57 +0000 (00:20 +0000)]
Use non-fast JNI for Canvas.native_drawBitmap. am:
bce8866506
am:
5d92aea521
Change-Id: I5ca2535d1220c93c0bddc714542a727ec6fae93d
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:14:05 +0000 (00:14 +0000)]
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev
am:
938d298116
Change-Id: Ie9c4ffd766ba9965ef2287a9e5a45cbe81555c58
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:14:02 +0000 (00:14 +0000)]
Use non-fast JNI for Canvas.native_drawBitmap.
am:
bce8866506
Change-Id: I58c322701cdc084aae018714f13fa9c2cf8d4cc6
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:05:17 +0000 (00:05 +0000)]
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev
Jaewan Kim [Wed, 10 Aug 2016 23:45:00 +0000 (23:45 +0000)]
Merge "PIP: Hide play/pause button by default" into nyc-mr1-dev am:
25796925d9
am:
28825f1af0
Change-Id: I488278956d22d53c08e1bd8ac1ff2d4978b7ddc5
Jaewan Kim [Wed, 10 Aug 2016 23:44:54 +0000 (23:44 +0000)]
PIP: Hide play/pause button by default am:
7000519695
am:
d5bee85ed5
Change-Id: I8336e0a601515567b2371ccd1b7816fed486ec64
Jaewan Kim [Wed, 10 Aug 2016 23:36:05 +0000 (23:36 +0000)]
Merge "PIP: Hide play/pause button by default" into nyc-mr1-dev
am:
25796925d9
Change-Id: I0c55170b259ea7f51f030456337d81bebfc6dcfe
Jaewan Kim [Wed, 10 Aug 2016 23:36:00 +0000 (23:36 +0000)]
PIP: Hide play/pause button by default
am:
7000519695
Change-Id: I82bb2fcb3ab91920c4d1ebb7d3c716b36f7e5bff
Chris Tate [Wed, 10 Aug 2016 23:35:05 +0000 (23:35 +0000)]
Merge "Fix lock wallpaper backup & restore" into nyc-mr1-dev am:
c72da3331b
am:
cdfc491693
Change-Id: I23440f9c98974e369272e8744ce33537a5e3380b
Christopher Tate [Wed, 10 Aug 2016 23:35:01 +0000 (23:35 +0000)]
Fix lock wallpaper backup & restore am:
f47eff7343
am:
7d29edf078
Change-Id: Id84a230e901c1610409508c065f821b5d17cfe3d
Chris Tate [Wed, 10 Aug 2016 23:27:05 +0000 (23:27 +0000)]
Merge "Fix lock wallpaper backup & restore" into nyc-mr1-dev
am:
c72da3331b
Change-Id: I58152c38fd478978c7fb1454537ed3fc0f8eb644
Christopher Tate [Wed, 10 Aug 2016 23:27:00 +0000 (23:27 +0000)]
Fix lock wallpaper backup & restore
am:
f47eff7343
Change-Id: I4ed7d178487cb2b1b36578dc69f13f2532c71665
Jaewan Kim [Wed, 10 Aug 2016 23:22:19 +0000 (23:22 +0000)]
Merge "PIP: Hide play/pause button by default" into nyc-mr1-dev
Chris Tate [Wed, 10 Aug 2016 23:17:07 +0000 (23:17 +0000)]
Merge "Fix lock wallpaper backup & restore" into nyc-mr1-dev
Christopher Tate [Wed, 10 Aug 2016 23:15:48 +0000 (16:15 -0700)]
Base date-change alarm on 24h "hour zero," not 12h
Bug
30628519
Change-Id: Ie504748c7fc2d43c713ddc72c39c56a976cc0df0
Alan Viverette [Wed, 10 Aug 2016 22:11:12 +0000 (22:11 +0000)]
Merge "Use localized hour when announcing selection for accessibility" into nyc-mr1-dev am:
75f7bfdc7a
am:
35af2d8672
Change-Id: Idde16aa1088b63c64d7328cf4dfe3c77d6607037
Alan Viverette [Wed, 10 Aug 2016 22:11:10 +0000 (22:11 +0000)]
Use localized hour when announcing selection for accessibility am:
66a8562c58
am:
fde654fb97
Change-Id: I8a07c4f9af6bfc31a2510dc5cc5aa7b763d77bc0
Alan Viverette [Wed, 10 Aug 2016 22:05:02 +0000 (22:05 +0000)]
Merge "Use localized hour when announcing selection for accessibility" into nyc-mr1-dev
am:
75f7bfdc7a
Change-Id: I6173deb1ca9b8d43844db798ab58cf35e80d5890
Alan Viverette [Wed, 10 Aug 2016 22:04:59 +0000 (22:04 +0000)]
Use localized hour when announcing selection for accessibility
am:
66a8562c58
Change-Id: Ieffd33d1e33fdd38e2383396b18dce8031fb1538
TreeHugger Robot [Wed, 10 Aug 2016 21:55:28 +0000 (21:55 +0000)]
Merge "Use localized hour when announcing selection for accessibility" into nyc-mr1-dev
Tim Murray [Wed, 10 Aug 2016 21:53:19 +0000 (21:53 +0000)]
Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev am:
f6fcb7b77d
am:
e4ff55a10a
Change-Id: Ieab9f9a25d4f40e34b340d4eec68045c977d2323
Tim Murray [Wed, 10 Aug 2016 21:53:10 +0000 (21:53 +0000)]
Fix exception spam in ActivityManagerService. am:
feb846c299
am:
76ac2e7a8b
Change-Id: I6701526c571967715064cc366f032d0a284a7b35
Tyler Gunn [Wed, 10 Aug 2016 21:45:10 +0000 (21:45 +0000)]
Merge "Add carrier config to indicate whether to notify of vt handover failure." into nyc-mr1-dev am:
c687f614b9
am:
47d8bc9eb3
Change-Id: I5e9d0137b540b08ad3105113a63e015c8d5221b8
Tim Murray [Wed, 10 Aug 2016 21:43:42 +0000 (21:43 +0000)]
Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev
am:
f6fcb7b77d
Change-Id: I4abc6cd03993383c0ace610a6c70b6a72b41e065
Tyler Gunn [Wed, 10 Aug 2016 21:43:42 +0000 (21:43 +0000)]
Add carrier config to indicate whether to notify of vt handover failure. am:
0f20d9343c
am:
5c88ba0d7c
Change-Id: Ib56d6233292bb6b3e35a226e50a8ff7104eef6a6
Tim Murray [Wed, 10 Aug 2016 21:43:37 +0000 (21:43 +0000)]
Fix exception spam in ActivityManagerService.
am:
feb846c299
Change-Id: I0d30d351d0c5455ebf518a36991d7772e43408ef
Robert Greenwalt [Wed, 10 Aug 2016 21:41:59 +0000 (21:41 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." am:
2438a33e54 am:
bda5769701
am:
c259624d8f
Change-Id: I7d63ae00d079ceac64429ea1a538eb58142d54bc
TreeHugger Robot [Wed, 10 Aug 2016 21:38:15 +0000 (21:38 +0000)]
Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev
Tyler Gunn [Wed, 10 Aug 2016 21:36:50 +0000 (21:36 +0000)]
Merge "Add carrier config to indicate whether to notify of vt handover failure." into nyc-mr1-dev
am:
c687f614b9
Change-Id: I5c72605839fd18a051ac00fbb499cb57140404bd
Tyler Gunn [Wed, 10 Aug 2016 21:36:44 +0000 (21:36 +0000)]
Add carrier config to indicate whether to notify of vt handover failure.
am:
0f20d9343c
Change-Id: Ibfa7d39871717ce46971b1999d9eab09fb1931c1
Robert Greenwalt [Wed, 10 Aug 2016 21:29:31 +0000 (21:29 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." am:
2438a33e54
am:
bda5769701
Change-Id: I921e50e48b0c93e31fa3d172c850629312f322e6
Tyler Gunn [Wed, 10 Aug 2016 21:28:37 +0000 (21:28 +0000)]
Merge "Add carrier config to indicate whether to notify of vt handover failure." into nyc-mr1-dev
Robert Greenwalt [Wed, 10 Aug 2016 21:20:39 +0000 (21:20 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
am:
2438a33e54
Change-Id: I5e8e5048718edf82008b58964d90b3cc10115c71
Alan Viverette [Wed, 10 Aug 2016 21:20:09 +0000 (21:20 +0000)]
Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev am:
c816320161
am:
131368be60
Change-Id: I5f1101abe31b2a820aeaf050e613978ad5ab0604
Alan Viverette [Wed, 10 Aug 2016 21:20:05 +0000 (21:20 +0000)]
Use symmetric conditions for advertising and performing ACTION_SCROLL am:
47be54bb78
am:
fd855c17b1
Change-Id: I6efe57707e22099409869c3e7c42bfa12a081ff4
Alan Viverette [Wed, 10 Aug 2016 21:08:28 +0000 (21:08 +0000)]
Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev
am:
c816320161
Change-Id: I36ce4c76617592d574def6873645be1f95df1426
Alan Viverette [Wed, 10 Aug 2016 21:08:25 +0000 (21:08 +0000)]
Use symmetric conditions for advertising and performing ACTION_SCROLL
am:
47be54bb78
Change-Id: Icdb68cd673269cbc2e41a44becbb0fa4c0ba4712
Robert Greenwalt [Wed, 10 Aug 2016 21:07:25 +0000 (21:07 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
Bill Yi [Wed, 10 Aug 2016 21:00:36 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b0e095c93d -s ours
Change-Id: I97c915d738109cad16709301bb6624af098a64eb
Bill Yi [Wed, 10 Aug 2016 21:00:31 +0000 (21:00 +0000)]
Import translations. DO NOT MERGE
am:
10540d5a5e -s ours
Change-Id: Iae734c43f78ea986a22d95083dddc1990cb07a35
Bill Yi [Wed, 10 Aug 2016 21:00:22 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
3d788faae0 -s ours
Change-Id: I9f7e5e174a392469277555dd78bea2a749ce67ea
Bill Yi [Wed, 10 Aug 2016 21:00:14 +0000 (21:00 +0000)]
Import translations. DO NOT MERGE
am:
53ae06fe10 -s ours
Change-Id: I8b15d3f8463f22e8214beed85961b09b5e2f6ca0
TreeHugger Robot [Wed, 10 Aug 2016 20:57:21 +0000 (20:57 +0000)]
Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev
TreeHugger Robot [Wed, 10 Aug 2016 20:51:24 +0000 (20:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 10 Aug 2016 20:51:07 +0000 (20:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Julius D'souza [Wed, 10 Aug 2016 20:43:00 +0000 (20:43 +0000)]
Merge "DO NOT MERGE: Make slow brightness display ramp rate configurable." into cw-f-dev
am:
b0f113535b
Change-Id: Id6fa8c5591b16bbb4e3408896fdcf6c518e1815e
Julius D'souza [Wed, 10 Aug 2016 20:42:55 +0000 (20:42 +0000)]
DO NOT MERGE: Make slow brightness display ramp rate configurable.
am:
621dc1cca2
Change-Id: I82ea2e7e205b15a8f0ea771757221389e89c0d62
Tim Murray [Mon, 8 Aug 2016 03:17:47 +0000 (20:17 -0700)]
Fix exception spam in ActivityManagerService.
If a thread that ActivityManagerService should be setting to FIFO dies,
it throws an exception. However, it is expected that threads may
die (due to LMK or app behavior), so we should suppress as much of this
as possible.
bug
30746129
Change-Id: Ief1ab8568fe8b27284ec442570b6a06677998ff1
Julius D'souza [Wed, 10 Aug 2016 20:09:26 +0000 (20:09 +0000)]
Merge "DO NOT MERGE: Make slow brightness display ramp rate configurable." into cw-f-dev
Yin-Chia Yeh [Tue, 9 Aug 2016 00:50:53 +0000 (17:50 -0700)]
Camera: ensure lock ordering (device->session)
On close/abort calls, which are more likely to run in parallel
with CameraDevice APIs.
Bug:
30742426
Change-Id: I6550283d1026373d48bb730164e65b25c7037bab
Makoto Onuki [Wed, 10 Aug 2016 19:42:01 +0000 (19:42 +0000)]
Merge "Fix two shortcut manager issues" into nyc-mr1-dev am:
fc13448507
am:
c36175ac19
Change-Id: Ic5ab1168fe12dab655eebc81836e0637b0026d91
Makoto Onuki [Wed, 10 Aug 2016 19:41:57 +0000 (19:41 +0000)]
Fix two shortcut manager issues am:
1e1732399a
am:
07974e4f56
Change-Id: I11cceb6afd91fe8b37c23bcef9f372374e68a3f6
Makoto Onuki [Wed, 10 Aug 2016 19:25:34 +0000 (19:25 +0000)]
Merge "Fix two shortcut manager issues" into nyc-mr1-dev
am:
fc13448507
Change-Id: I07dca777edd3264c7bf8d6e110804d2e7df3cc97
Makoto Onuki [Wed, 10 Aug 2016 19:25:28 +0000 (19:25 +0000)]
Fix two shortcut manager issues
am:
1e1732399a
Change-Id: Ie4ea05bbfd65c3bb2bcbefab234fa5c56443dba4
TreeHugger Robot [Wed, 10 Aug 2016 19:14:54 +0000 (19:14 +0000)]
Merge "Fix two shortcut manager issues" into nyc-mr1-dev
Julius D'souza [Fri, 5 Aug 2016 21:34:38 +0000 (14:34 -0700)]
DO NOT MERGE: Make slow brightness display ramp rate configurable.
Add overlay setting with current default value.
Bug:
30085530
Change-Id: Ib5d2448b88cfb66a97febcdf06e2118c84b16cd0
Andreas Gampe [Wed, 10 Aug 2016 03:44:04 +0000 (20:44 -0700)]
Zygote: allow system server compilation to fail
Do not terminate when the system server classpath cannot be
compiled. This can be the case in fallback mode, e.g., when
a device ran out of space.
Bug:
30765660
Change-Id: I3aca3f2f789e2201e4019e1bf04d239ab54b0d3d
Chris Tate [Wed, 10 Aug 2016 18:17:53 +0000 (18:17 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af am:
1d64d33ba8 -s ours am:
924b57b42c am:
a0a718f5db
am:
1cc68d7b70
Change-Id: I8d33080ae7a90ba73817209faefe4faf2214c2d4
Christopher Tate [Wed, 10 Aug 2016 18:17:47 +0000 (18:17 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c am:
6ea7b630c2 -s ours am:
5eac1c2544 am:
3015d9be67
am:
65a152377c
Change-Id: I32244f5f1b03c642c8b751a56111f2cb243adc67
Chris Tate [Wed, 10 Aug 2016 18:12:09 +0000 (18:12 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af am:
1d64d33ba8 -s ours am:
924b57b42c
am:
a0a718f5db
Change-Id: I9eba5c78a1cb8fb2732f3fe831a769dcfd66552a
Christopher Tate [Wed, 10 Aug 2016 18:12:06 +0000 (18:12 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c am:
6ea7b630c2 -s ours am:
5eac1c2544
am:
3015d9be67
Change-Id: If74a836b1ab67c3dd32e0a177ddc3cbc2b17c173
Chris Tate [Wed, 10 Aug 2016 18:12:05 +0000 (18:12 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af am:
1d64d33ba8 -s ours am:
924b57b42c
am:
345219f068
Change-Id: I1008c31eec5fbc8611de32324a736b4da5d7fc8e
Christopher Tate [Wed, 10 Aug 2016 18:12:01 +0000 (18:12 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c am:
6ea7b630c2 -s ours am:
5eac1c2544
am:
2ead59bd75
Change-Id: Ia3a2ab18bc17f23803c3424a2f38ea54b7db7a47
Chris Tate [Wed, 10 Aug 2016 18:04:07 +0000 (18:04 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af am:
1d64d33ba8 -s ours
am:
924b57b42c
Change-Id: Icb2821341904697bb348220bb18c668cdc8dfddb
Christopher Tate [Wed, 10 Aug 2016 18:04:00 +0000 (18:04 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c am:
6ea7b630c2 -s ours
am:
5eac1c2544
Change-Id: I2e18c58c476c63535962c294c6a63716e536310b
Chris Tate [Wed, 10 Aug 2016 18:03:40 +0000 (18:03 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af am:
1d64d33ba8 -s ours
am:
924b57b42c
Change-Id: I685f3809c34585affb6a8d2a532c4cb707f820d8
Christopher Tate [Wed, 10 Aug 2016 18:03:38 +0000 (18:03 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c am:
6ea7b630c2 -s ours
am:
5eac1c2544
Change-Id: Ibd925a475c5ae43a6ab07c0c8920167e7ce85cec
Makoto Onuki [Wed, 10 Aug 2016 17:47:13 +0000 (10:47 -0700)]
Fix two shortcut manager issues
- isUserUnlocked check is still racy
We used a local copy of each user state in mUnlockedUsers, and updated
it in the service lifecycle events. However because
SystemService.onUnlockUser() is called on Handler, there was a brief
window between when the user was actually unlocked and the shortcut
manager thought the user was unlocked.
So now check with activity manager for the latest state too. We still
check with the local copy first, because we want to consider STOPPING
as "unlocked".
- Messenger loses all bitmap icons.
Because we delay-save the shortcuts.xml file, if the device shut down
before we save the XML file but after removing the bitmap files,
we'd lose the bitmaps.
(Apparently SystemService.onCleanupUser() may not be called even when
a device is cleanly shutting down.)
So don't remove bitmap files synchronously, ever, and instead after
saving the XML just run the dangling file cleanup.
Bug
30784267
Bug
30730471
Change-Id: Ie58656efba2dca2b00582e145613bc56266a091e
Chris Tate [Wed, 10 Aug 2016 17:55:56 +0000 (17:55 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af
am:
1d64d33ba8 -s ours
Change-Id: I68bc1793b55e6e2bf660ea6c41611e819b3f5e9a
Christopher Tate [Wed, 10 Aug 2016 17:55:47 +0000 (17:55 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c
am:
6ea7b630c2 -s ours
Change-Id: Iefb7a9ad5f00b0f6e24c45fe5cf1d17cb0c97414
Dianne Hackborn [Wed, 10 Aug 2016 17:50:21 +0000 (17:50 +0000)]
Merge "A little more on issue #
30766518: Document what targeting N does" into nyc-mr1-dev am:
848c690f69
am:
83564a4a98
Change-Id: Iafccb5542ffabb2d7bbbb3b564f16c0ddc046f7f
Dianne Hackborn [Wed, 10 Aug 2016 17:50:18 +0000 (17:50 +0000)]
A little more on issue #
30766518: Document what targeting N does am:
5f1649e852
am:
6ffef759da
Change-Id: I23bde6943a153f353c8c2cc3a1f7c4db2cec00b9
OSDN Git Service
