OSDN Git Service
Jason Monk [Tue, 13 Jun 2017 22:53:33 +0000 (22:53 +0000)]
Merge "Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6 am:
304f3a74be" into oc-dr1-dev-plus-aosp
am:
872cf08a53
Change-Id: I1804d0ef43f6c22a8c92362b4a6e22bd84bcc70b
Jason Monk [Tue, 13 Jun 2017 22:48:02 +0000 (22:48 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6 am:
4764f7b5b5
am:
dc8e8d965c
Change-Id: Ibc5ed9fa199e958d83ee10ee20893ea243668fe4
Chad Brubaker [Tue, 13 Jun 2017 22:45:52 +0000 (22:45 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am:
4a0ea3e88f am:
bfd7cc4dbb
am:
f19a167b86
Change-Id: I78278c69642972bcbbd8ba975d67cc1b9dc93217
Chad Brubaker [Tue, 13 Jun 2017 22:43:40 +0000 (22:43 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am:
4a0ea3e88f am:
6d1b84bc3f
am:
8a691a3b2e
Change-Id: I03a5aa46d4ae74088d4ffe0eee32c239d044b628
Evan Laird [Tue, 13 Jun 2017 22:41:39 +0000 (22:41 +0000)]
Merge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev am:
70cb08326e
am:
f658ef8cdf
Change-Id: Ic61abc439904f1f5e722c4ef8183cd7dcc14ca99
Andreas Gampe [Tue, 13 Jun 2017 22:39:05 +0000 (22:39 +0000)]
Merge "Merge "Binder: Add more logging on Error" into oc-dev am:
ab934ae8e6 am:
807c9ae55f" into oc-dr1-dev-plus-aosp
am:
0567ce0254
Change-Id: I6d5a182fd82a08d1474fe4b570656fa093b72ac1
Andreas Gampe [Tue, 13 Jun 2017 22:34:38 +0000 (22:34 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev am:
ab934ae8e6 am:
8767655272
am:
cfe2730bd4
Change-Id: I58a1c8e50574abd5bdbbef7fe6936ff17b45bc5f
Robert Greenwalt [Tue, 13 Jun 2017 22:24:14 +0000 (22:24 +0000)]
Merge "Add updateMethod callback" am:
a0974dbc0f am:
7791ac2e28 am:
01712b1aa6
am:
c89ffbf12a
Change-Id: I77fbb003abd8d8aa7c6892dbb72ab6b5cd8798a4
yangbingqian [Tue, 13 Jun 2017 22:21:51 +0000 (22:21 +0000)]
Merge "Merge "remove the lock-use for prunePrintService in case blocking main thread" am:
b124bea782 am:
60246acdbf am:
a76f1cbd1d" into oc-dr1-dev-plus-aosp
am:
3680e34f3a
Change-Id: I7f3c6995dae7a20e523e50e248035f3eeb040fde
Tyler Gunn [Tue, 13 Jun 2017 22:18:22 +0000 (22:18 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev am:
48962fcc3b
am:
4998896d22
Change-Id: I60ba08e839f5fc4c1a27694b42dbba7ea97318a0
Pankaj Kanwar [Tue, 13 Jun 2017 22:13:57 +0000 (22:13 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am:
aadb414f02 am:
717b5bf3e0 am:
8532bc3b59
am:
f13b8a78f6 -s ours
Change-Id: I4e426aaf8a9aead120a77722659f5aef7fa110d8
TreeHugger Robot [Tue, 13 Jun 2017 21:57:40 +0000 (21:57 +0000)]
Merge "KEY_INTENT shouldn't grant permissions."
Android Build Merger (Role) [Tue, 13 Jun 2017 21:57:21 +0000 (21:57 +0000)]
Merge "Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6 am:
304f3a74be" into oc-dr1-dev-plus-aosp
Jason Monk [Tue, 13 Jun 2017 21:55:11 +0000 (21:55 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6
am:
4764f7b5b5
Change-Id: I794a40787c56048b1b0af502470621ff799a1eef
Jason Monk [Tue, 13 Jun 2017 21:54:34 +0000 (21:54 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev am:
02d5b79cf6
am:
304f3a74be
Change-Id: I2d863f2db0576b04fbbcec0c81fffb354833af1c
Jason Monk [Tue, 13 Jun 2017 21:44:03 +0000 (21:44 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
am:
02d5b79cf6
Change-Id: I9a1dbc2f382562fb8ced63fd70f1a5e1674285f0
Jason Monk [Tue, 13 Jun 2017 21:43:35 +0000 (21:43 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
am:
02d5b79cf6
Change-Id: If250b772445628e26fd73d0c81f31ea89e74f7fa
Chad Brubaker [Tue, 13 Jun 2017 21:40:44 +0000 (21:40 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am:
4a0ea3e88f
am:
bfd7cc4dbb
Change-Id: Ia50be57d9203381f39c739dddd3b52a35b761cea
Chad Brubaker [Tue, 13 Jun 2017 21:36:27 +0000 (21:36 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am:
4a0ea3e88f
am:
6d1b84bc3f
Change-Id: I6e307ac5b38732d69d6eeeed7fa155db3d215fe1
TreeHugger Robot [Tue, 13 Jun 2017 21:32:28 +0000 (21:32 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
Evan Laird [Tue, 13 Jun 2017 21:30:58 +0000 (21:30 +0000)]
Merge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev
am:
70cb08326e
Change-Id: I18d0e0af532749e7b6fcf60a69e1dfd81b70c2d9
Chad Brubaker [Tue, 13 Jun 2017 21:29:45 +0000 (21:29 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
am:
4a0ea3e88f
Change-Id: Id7b7326f819c9e0389c3ad9db2863e72ec716f83
Chad Brubaker [Tue, 13 Jun 2017 21:28:37 +0000 (21:28 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
am:
4a0ea3e88f
Change-Id: I5dcc03662ab5babbfc5559257b1ecdf9568c9d49
Android Build Merger (Role) [Tue, 13 Jun 2017 21:27:11 +0000 (21:27 +0000)]
Merge "Merge "Binder: Add more logging on Error" into oc-dev am:
ab934ae8e6 am:
807c9ae55f" into oc-dr1-dev-plus-aosp
Andreas Gampe [Tue, 13 Jun 2017 21:24:03 +0000 (21:24 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev am:
ab934ae8e6
am:
807c9ae55f
Change-Id: I510c04b8628453f37ce6098573e23e7c3e4bc29e
Andreas Gampe [Tue, 13 Jun 2017 21:23:05 +0000 (21:23 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev am:
ab934ae8e6
am:
8767655272
Change-Id: I5c77433743214db21d5d3f2992430ec8bbab7151
TreeHugger Robot [Tue, 13 Jun 2017 21:19:14 +0000 (21:19 +0000)]
Merge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev
Chad Brubaker [Tue, 13 Jun 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
Andreas Gampe [Tue, 13 Jun 2017 21:14:52 +0000 (21:14 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
am:
ab934ae8e6
Change-Id: I6e320f34429c82ece01a946ecda96cf17252a701
Andreas Gampe [Tue, 13 Jun 2017 21:12:33 +0000 (21:12 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
am:
ab934ae8e6
Change-Id: I7cdc522995f3b10d70cd6dced7dd4850eb542c71
Robert Greenwalt [Tue, 13 Jun 2017 21:11:43 +0000 (21:11 +0000)]
Merge "Add updateMethod callback" am:
a0974dbc0f am:
7791ac2e28
am:
01712b1aa6
Change-Id: I4b5b26081030f71e90022495e7a5cbb7811e5974
TreeHugger Robot [Tue, 13 Jun 2017 21:03:38 +0000 (21:03 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 20:59:52 +0000 (20:59 +0000)]
Merge "Merge "remove the lock-use for prunePrintService in case blocking main thread" am:
b124bea782 am:
60246acdbf am:
a76f1cbd1d" into oc-dr1-dev-plus-aosp
yangbingqian [Tue, 13 Jun 2017 20:59:12 +0000 (20:59 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" am:
b124bea782 am:
60246acdbf
am:
a76f1cbd1d
Change-Id: I952759d6fcf072f36b7cf0a896eeb03702b6014d
Robert Greenwalt [Tue, 13 Jun 2017 20:59:09 +0000 (20:59 +0000)]
Merge "Add updateMethod callback" am:
a0974dbc0f
am:
7791ac2e28
Change-Id: I3402217fddc77d03b191ac7af0d938c6fa931486
Tyler Gunn [Tue, 13 Jun 2017 20:55:58 +0000 (20:55 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev
am:
48962fcc3b
Change-Id: I6734494a42629f67829cb93e6d11d1b11277d3fb
Robert Greenwalt [Tue, 13 Jun 2017 20:51:39 +0000 (20:51 +0000)]
Merge "Add updateMethod callback"
am:
a0974dbc0f
Change-Id: I9dc2564d0856db617c0deb6bff35ca3cf6b6010c
Pankaj Kanwar [Tue, 13 Jun 2017 20:50:15 +0000 (20:50 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am:
aadb414f02 am:
717b5bf3e0
am:
8532bc3b59
Change-Id: Idd49ae115d660cb21ed7baf4e66f5ec0f89e3e53
Adam Lesinski [Tue, 13 Jun 2017 20:48:19 +0000 (20:48 +0000)]
Merge "AAPT2: Disable locale domination for deduping"
Tyler Gunn [Tue, 13 Jun 2017 20:48:12 +0000 (20:48 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev
yangbingqian [Tue, 13 Jun 2017 20:48:10 +0000 (20:48 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" am:
b124bea782
am:
60246acdbf
Change-Id: If773ac8166bee1e92168f4df7a9de2dd7cea190f
TreeHugger Robot [Tue, 13 Jun 2017 20:46:48 +0000 (20:46 +0000)]
Merge "ASM Priority Boost Tool"
yangbingqian [Tue, 13 Jun 2017 20:41:03 +0000 (20:41 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread"
am:
b124bea782
Change-Id: Ie93b79dfff5787cb9835c4ba86e3aa586e0d2ad8
Robert Greenwalt [Tue, 13 Jun 2017 20:38:49 +0000 (20:38 +0000)]
Merge "Add updateMethod callback"
Pankaj Kanwar [Tue, 13 Jun 2017 20:38:46 +0000 (20:38 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am:
aadb414f02
am:
717b5bf3e0
Change-Id: I8133ca2e269f74dd2c7b8a17f81de24567fcdc2e
Alan Viverette [Tue, 13 Jun 2017 20:33:16 +0000 (20:33 +0000)]
Merge "Federate platform docs against support library API file"
Treehugger Robot [Tue, 13 Jun 2017 20:30:37 +0000 (20:30 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread"
Pankaj Kanwar [Tue, 13 Jun 2017 20:30:36 +0000 (20:30 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
am:
aadb414f02
Change-Id: I2f2189aa6483dfe17fe6ed7f42e8b23166c67444
Pankaj Kanwar [Tue, 13 Jun 2017 20:22:22 +0000 (20:22 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Also fix ordering bug in general-purpose security check that was
allowing FLAG_GRANT_PERSISTABLE to bypass it.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Adrian Roos [Tue, 13 Jun 2017 19:42:02 +0000 (19:42 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev am:
2402522553
am:
3aa77a330e
Change-Id: Iccaaedf0c74f0b2b11659d625c03e3907c5d93dc
TreeHugger Robot [Tue, 13 Jun 2017 19:35:50 +0000 (19:35 +0000)]
Merge "Add accessibility titles to PopupWindow"
Andreas Gampe [Tue, 13 Jun 2017 19:27:54 +0000 (19:27 +0000)]
Merge "Merge "Binder: Add more logging on Error" am:
d9f3a3cf37 am:
e3bda6170d am:
6d908413bd" into oc-dr1-dev-plus-aosp
am:
a01f079bc3
Change-Id: Ia6f8824f0394b33b76ff0243312092cf96f65dc1
Adrian Roos [Tue, 13 Jun 2017 19:25:52 +0000 (19:25 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
am:
2402522553
Change-Id: I22486ede65b6a07683cea4b8f5c48de94ae7a148
Bryce Lee [Tue, 13 Jun 2017 19:19:37 +0000 (19:19 +0000)]
Merge "Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145 am:
c717e603b1" into oc-dr1-dev-plus-aosp
am:
137d09aa07
Change-Id: I98d23f7b5d87bb09dc5287319e4f94e6236f0027
TreeHugger Robot [Tue, 13 Jun 2017 19:17:37 +0000 (19:17 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
Bryce Lee [Tue, 13 Jun 2017 19:16:30 +0000 (19:16 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145 am:
fb385a6c15
am:
b64e5067f0
Change-Id: I8854c7fd8c55641324c1bcd3191154cc2d77c1f4
Android Build Merger (Role) [Tue, 13 Jun 2017 19:09:50 +0000 (19:09 +0000)]
Merge "Merge "Binder: Add more logging on Error" am:
d9f3a3cf37 am:
e3bda6170d am:
6d908413bd" into oc-dr1-dev-plus-aosp
Evan Laird [Tue, 13 Jun 2017 19:09:21 +0000 (15:09 -0400)]
Change SlashDrawable semantics to fix QS crash
SlashDrawable wraps a reference to Drawable in order to store the
intended Drawable and optionally draw a slash over it. As such, it
should probably have similar semantics to Drawable, in that it either
exists or doesn't; if you set SlashImageView's drawable to `null`, you'd
expect that the drawable goes away, not that the SlashDrawable's
contained Drawable goes away but the slash stays.
Test: runtest systemui
Change-Id: I34b92716cc60ba5043ab68ae09954f5a5e97e562
Fixes:
62525439
Andreas Gampe [Tue, 13 Jun 2017 19:08:54 +0000 (19:08 +0000)]
Merge "Binder: Add more logging on Error" am:
d9f3a3cf37 am:
e3bda6170d
am:
6d908413bd
Change-Id: I828b2dca2109334d27f43f9bc04c00214d14ba1e
Android Build Merger (Role) [Tue, 13 Jun 2017 19:08:22 +0000 (19:08 +0000)]
Merge "Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145 am:
c717e603b1" into oc-dr1-dev-plus-aosp
Bryce Lee [Tue, 13 Jun 2017 19:07:25 +0000 (19:07 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145
am:
c717e603b1
Change-Id: I584661bb20175ef11e761ce87c629de9f7b29dc6
Bryce Lee [Tue, 13 Jun 2017 19:03:56 +0000 (19:03 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev am:
8ab4d11145
am:
fb385a6c15
Change-Id: I384de2479a69df5a6463586d87eb3cd5b2eebcbe
Andreas Gampe [Tue, 13 Jun 2017 19:02:21 +0000 (19:02 +0000)]
Merge "Binder: Add more logging on Error" am:
d9f3a3cf37
am:
e3bda6170d
Change-Id: Iec158813e6892fba5449219e32a7201fae142037
Bryce Lee [Tue, 13 Jun 2017 18:56:53 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am:
8ab4d11145
Change-Id: If9ec8e8492ed8249cc99dfe05e97a0cf62ff8dd8
Bryce Lee [Tue, 13 Jun 2017 18:56:52 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am:
8ab4d11145
Change-Id: I5eec6ff604056b7095ac07afd9721a5223a584d8
Bryce Lee [Tue, 13 Jun 2017 18:50:57 +0000 (18:50 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
Andreas Gampe [Tue, 13 Jun 2017 18:45:27 +0000 (18:45 +0000)]
Merge "Binder: Add more logging on Error"
am:
d9f3a3cf37
Change-Id: I58eb483fff9fa9c4f2519fbd842172f48f1052e9
Andreas Gampe [Tue, 13 Jun 2017 18:34:45 +0000 (18:34 +0000)]
Merge "Binder: Add more logging on Error"
Eugene Susla [Tue, 13 Jun 2017 18:14:29 +0000 (18:14 +0000)]
Merge "Serialize all standard actions as bit mask"
Adam Lesinski [Mon, 12 Jun 2017 21:55:58 +0000 (14:55 -0700)]
AAPT2: Disable locale domination for deduping
Locale deduping isn't straightforward, as parenting rules
change between platform versions and the selection
preference of a specific locale variant over the default
configuration lead to incorrect results at runtime.
Bug:
62409213
Test: make aapt2_tests
Change-Id: Iec8f1cfba7ae43c847d163529891fdc15f3db826
Jeff Sharkey [Tue, 13 Jun 2017 17:40:51 +0000 (17:40 +0000)]
Merge "Revert "Hide APIs not intended to ship in DR.""
Tyler Gunn [Fri, 26 May 2017 20:30:09 +0000 (13:30 -0700)]
Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT.
Used in handovers to tell the account we're handing over to which account
the call is from.
Test: Manual
Bug:
38027075
Change-Id: I9b61a5fce3e4f7344174a1b81f4964ca02b71ccd
TreeHugger Robot [Tue, 13 Jun 2017 17:29:08 +0000 (17:29 +0000)]
Merge "BatteryStats: Cleanup external stats collection"
Adrian Roos [Fri, 2 Jun 2017 19:50:38 +0000 (12:50 -0700)]
AOD: Use double tap coordinates to trigger Ambient Indication
Bug:
38386446
Test: Double tap on AOD, verify that it still works. On device that supports double tap coordinates, verify that double tapping on ambient music opens ambient music.
Change-Id: Ic75ba731a980c9598c85927e83d2032f01da4822
(cherry picked from commit
44198f5124743f0d603eb4efa3b436bd96f32144)
Mark Goldstein [Tue, 13 Jun 2017 16:56:08 +0000 (16:56 +0000)]
Merge "Fix a few typos in audiofx doc strings."
Jason Monk [Tue, 13 Jun 2017 16:49:55 +0000 (12:49 -0400)]
Fix sysui depending on slow bt calls
Move calls to a background thread and cache the results to avoid
slowing down sysui when there are too many bluetooth devices.
Test: runtest systemui
Change-Id: Ica10e86ca6b2783c30ed9de68f1a91dc5cfdf068
Fixes:
38118549
Andreas Gampe [Mon, 12 Jun 2017 17:43:05 +0000 (10:43 -0700)]
Binder: Add more logging on Error
Try to add the Error's message to the abort, so that it shows up
when the logcat is missing.
Sample message:
'jni_internal.cc:508] JNI FatalError called: java.lang.Error thrown during binder transaction: java.lang.LinkageError: This is a test.'
(cherry picked from commit
58383ba095f552a58ed416736fe049126c647ffd)
Bug:
62514767
Test: m
Change-Id: I12026bb7a8ec9438db493f135ed5d0177187f702
Narayan Kamath [Tue, 13 Jun 2017 16:02:13 +0000 (16:02 +0000)]
Merge changes I73ae8de1,I58260902 am:
6f11744adc am:
a506180804 am:
d1941e51a6
am:
fec2aa40de
Change-Id: Ia939f79a7ec50d390bbe05734321e8e9ae91a7ee
Narayan Kamath [Tue, 13 Jun 2017 15:53:15 +0000 (15:53 +0000)]
Merge changes I73ae8de1,I58260902 am:
6f11744adc am:
a506180804
am:
d1941e51a6
Change-Id: I0b5e2850cd3710638660d0c58ed7c9cde869726f
Narayan Kamath [Tue, 13 Jun 2017 15:45:48 +0000 (15:45 +0000)]
Merge changes I73ae8de1,I58260902 am:
6f11744adc
am:
a506180804
Change-Id: I572de6f022670cd14223ada2f5fe6cf6f7a87a98
Tomasz Wasilczyk [Tue, 13 Jun 2017 15:42:20 +0000 (15:42 +0000)]
Merge "Implement remaining ITunerCallback methods."
Narayan Kamath [Tue, 13 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge changes I73ae8de1,I58260902
am:
6f11744adc
Change-Id: I9b47ae1d3953280a627584902b3bc099e1f907c8
pkanwar [Mon, 22 May 2017 22:23:38 +0000 (15:23 -0700)]
Radio Interface changes to pass the encryption object, including the
key,to the modem.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG:
35606429
Test: manual
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
Treehugger Robot [Tue, 13 Jun 2017 15:27:09 +0000 (15:27 +0000)]
Merge changes I73ae8de1,I58260902
* changes:
Binder: Log details of pending exception.
Binder: Be forceful about a forceful exit.
Bryce Lee [Mon, 12 Jun 2017 21:12:29 +0000 (14:12 -0700)]
Address issues surrounding freezing by display.
The first issue is the animating a display as a consequence of the
freezing due to configuration change during construction. This
additional animation is not expected and interferes with tests
expecting for the original display contents to be shown intact. This
CL addresses the issue by not freezing while the display is not ready
(before construction is finished).
The second problem addressed is book-keeping for
DisplayContentsAnimators in WindowAnimator. Currently, a getter
method is used internally to reference these animators, which
generates them if not present and adds them to the animation
iteration. In the case we set an animation on a display that no
longer exists (which can be the case after unfreezing), we end up
recreating this object. This can lead to us trying to animate a
non-existent DisplayContent. This CL prevents creating an animator
for a non-existent display and adjusts the methods using this getter
to handle this case.
Fixes:
62460846
Fixes:
62461229
Bug:
35486733
Bug:
62541591
Test: go/wm-smoke
Test: open and close projected android auto mode repeatedly and
ensure display correctness
Test: cts-tradefed run singleCommand cts-dev --module CtsMediaTestCases --test android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay
Change-Id: I60ade6f97440c8fa01b10e36c019865cf1fd0730
Narayan Kamath [Tue, 13 Jun 2017 11:38:41 +0000 (11:38 +0000)]
Merge "BatteryStatsImpl: Keep less history around for low mem devices."
Narayan Kamath [Tue, 13 Jun 2017 10:59:24 +0000 (10:59 +0000)]
Merge "Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde am:
7ba9c4dc62" into oc-dr1-dev-plus-aosp
am:
bf841692cd
Change-Id: Icbc38c7b742407ed54f3551df50502b0da695d2c
Narayan Kamath [Tue, 13 Jun 2017 10:57:20 +0000 (10:57 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde am:
17652d85ec
am:
6ca3567674
Change-Id: I12390e4bb27b5480cad7623db8ea09fa1ccc48e9
Android Build Merger (Role) [Tue, 13 Jun 2017 10:52:24 +0000 (10:52 +0000)]
Merge "Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde am:
7ba9c4dc62" into oc-dr1-dev-plus-aosp
Narayan Kamath [Tue, 13 Jun 2017 10:50:44 +0000 (10:50 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde
am:
17652d85ec
Change-Id: Ieb233fb57cddf68e282779ce0eb193abd1300de6
Narayan Kamath [Tue, 13 Jun 2017 10:50:43 +0000 (10:50 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde
am:
7ba9c4dc62
Change-Id: I57639e4d18b04adf94d4da235cce5e957e88641e
Narayan Kamath [Tue, 13 Jun 2017 10:40:48 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am:
c7ea7effde
Change-Id: Ice68d0de34795a23d9d7364244d564bc48a7d436
Narayan Kamath [Tue, 13 Jun 2017 10:40:46 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am:
c7ea7effde
Change-Id: Iff55674bc989986e14d0bcea3c71bad5751d4dcb
Narayan Kamath [Tue, 13 Jun 2017 10:39:03 +0000 (10:39 +0000)]
Merge "LocalLog: Use LocalDateTime.now() instead of a Calendar."
Narayan Kamath [Tue, 13 Jun 2017 10:32:22 +0000 (10:32 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
Narayan Kamath [Mon, 12 Jun 2017 12:34:29 +0000 (13:34 +0100)]
Eagerly serialize historical sessions
mHistoricalSessions maintained a strong reference to a PackageInstallerSession,
which in turn kept references to Bitmaps and other heavy-weight objects around.
Since this field is primarily used for debugging, this change replaces it with
a String dump of the session in question. Each dump takes about 600bytes, which
is comparable to the sizes of the un-serialized raw objects.
Bug:
62485552
Test: Manual
Change-Id: I4949a64b538ab4a97384f4f8bc9a6ef155a4b128
Narayan Kamath [Tue, 13 Jun 2017 09:43:18 +0000 (09:43 +0000)]
Merge "ActivityManagerService: Prune old stack traces."
Erik Kline [Tue, 13 Jun 2017 08:49:46 +0000 (08:49 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am:
30a1cf96bb am:
cfaeabb3e3 am:
4bcce2b2ef
am:
72240b9eeb
Change-Id: If45443143777e1446c812563742ae8af68d8f73e
Erik Kline [Tue, 13 Jun 2017 08:42:44 +0000 (08:42 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am:
30a1cf96bb am:
cfaeabb3e3
am:
4bcce2b2ef
Change-Id: Ifeb49f1b19ab36e438763b569c78a335b094f7d0