OSDN Git Service
Jiyong Park [Tue, 1 May 2018 14:56:12 +0000 (23:56 +0900)]
Shared lib def for org.apache.http.legacy comes from java_sdk_library
org.apache.http.legacy is now built using java_sdk_library. Since the
share lib defintion file for the lib is automatically created and
installed, we don't need to have duplicated entry for the lib.
Bug:
77577799
Test: m -j
Test: adb shell cmd package list libraries shows an entry for
org.apache.http.legacy
Merged-In: I06b356c2ba08abc6c1cece81daf7c1773ed93ed0
Change-Id: I06b356c2ba08abc6c1cece81daf7c1773ed93ed0
(cherry picked from commit
49c0a869550dc6a80f75fb08fd38e11ee84bc33d)
Annie Meng [Tue, 22 May 2018 10:03:21 +0000 (03:03 -0700)]
Merge "Check settings validators for NPE" into pi-dev
am:
3a95d0bb94
Change-Id: I75fe10196f29f10f80631f2a11ceda9e8a6d5d87
Annie Meng [Tue, 22 May 2018 09:55:48 +0000 (09:55 +0000)]
Merge "Check settings validators for NPE" into pi-dev
David Brazdil [Tue, 22 May 2018 09:50:58 +0000 (02:50 -0700)]
Merge "Add more hidden API usages into greylist" into pi-dev
am:
9b2938d253
Change-Id: Ie09f6aea0754247d9f94f4c356bae1e254a08cd7
David Brazdil [Tue, 22 May 2018 09:41:15 +0000 (09:41 +0000)]
Merge "Add more hidden API usages into greylist" into pi-dev
Remi NGUYEN VAN [Tue, 22 May 2018 08:09:08 +0000 (01:09 -0700)]
Merge "Move CaptivePortalProbeResult to its own file" into pi-dev
am:
fd12af848a
Change-Id: Ia48b32307a51a66f2672d7112f71166dd6db41b1
Chalard Jean [Tue, 22 May 2018 08:01:39 +0000 (01:01 -0700)]
Merge "Fix setCapabilities." into pi-dev
am:
d1d4cc94ba
Change-Id: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1
Remi NGUYEN VAN [Tue, 22 May 2018 08:00:56 +0000 (08:00 +0000)]
Merge "Move CaptivePortalProbeResult to its own file" into pi-dev
Chalard Jean [Tue, 22 May 2018 07:51:09 +0000 (07:51 +0000)]
Merge "Fix setCapabilities." into pi-dev
Dianne Hackborn [Tue, 22 May 2018 07:35:07 +0000 (00:35 -0700)]
Merge "Add new hidden-for-now AppOpsManager APIs to greylist." into pi-dev
am:
7b8ac80db5
Change-Id: I6ae9e668f5c3df80e1017b45c7e02299ed35cfb1
TreeHugger Robot [Tue, 22 May 2018 07:18:27 +0000 (07:18 +0000)]
Merge "Add new hidden-for-now AppOpsManager APIs to greylist." into pi-dev
felkachang [Tue, 22 May 2018 06:14:41 +0000 (23:14 -0700)]
Clock notification text was cut off
am:
e8a3536660
Change-Id: Ieab07607cf1379704dadecad8fbd60eafe7fc005
felkachang [Fri, 18 May 2018 12:11:38 +0000 (20:11 +0800)]
Clock notification text was cut off
The root cause is that HeadsUpStatusBarView doesn't considerate the
Cut Out situation. The Cut Out situation can use
getRootWindowInsets().getDisplayCutout().getSafeInsetLeft() to get
the the value.
There are two parts need to handle Cut out.
The one part is to handle the padding. It needs to considerate both of
mLeftInset and mLeftCutOutInset because it use getLocationOnScreen to
count the location.
The other part is to handle the HeadsUpStatusBarView.translationX.
It only needs to considerate mLeftCutOutInset because landscape
degree 90 has the left side cut out and translationX by the distance
between screen left boundary and scroller's left boundary. The
distance include Cut Out so it need minus mCutOutInsetLeft in the
setPanelTranslation.
Cut Out has 4 mode: Disable, Corner, Double, and Tall. Disable and
Double are handled by the same way. Corner and Tall are handled
by the same way.
Bug:
78113562
Test: atest SystemUITests
Change-Id: Ic2a272c43f65eed8c4b3749787637f5fb848bb8a
Fix:
78113562
Lucas Dupin [Tue, 22 May 2018 05:53:27 +0000 (22:53 -0700)]
Merge "Add content description to zenmode" into pi-dev
am:
adc1534453
Change-Id: I5cd398157fb641b88145a0f90766161e5b8124f0
TreeHugger Robot [Tue, 22 May 2018 05:44:33 +0000 (05:44 +0000)]
Merge "Add content description to zenmode" into pi-dev
Jian Jin [Tue, 22 May 2018 04:52:31 +0000 (21:52 -0700)]
Merge "Bugfix: PIN keyguard is clipped in Car" into pi-dev
am:
90101793e5
Change-Id: I19579cada6c7505a4691e81e693f1f1cabc45259
Jian Jin [Tue, 22 May 2018 04:43:21 +0000 (04:43 +0000)]
Merge "Bugfix: PIN keyguard is clipped in Car" into pi-dev
Tracy Zhou [Tue, 22 May 2018 03:39:22 +0000 (20:39 -0700)]
Merge "Show swipe-up tip with exponential backoff" into pi-dev
am:
ef59d80730
Change-Id: I5b87b8eb375377540cb4fbe3dc55a02e71a5e96f
TreeHugger Robot [Tue, 22 May 2018 03:28:13 +0000 (03:28 +0000)]
Merge "Show swipe-up tip with exponential backoff" into pi-dev
Tracy Zhou [Mon, 21 May 2018 22:30:31 +0000 (15:30 -0700)]
Show swipe-up tip with exponential backoff
Change-Id: Icd32c0bd98623173322e5e33bd5400e679a01a10
Fixes:
79985309
Test: Manual test
Jian Jin [Mon, 21 May 2018 22:20:40 +0000 (15:20 -0700)]
Bugfix: PIN keyguard is clipped in Car
Car is a multi-user system. There's a cancel button on the Keyguard
that allows the user to cancel the Keyguard to go back to user
switcher. Because different user may have different security mode,
the container must be resized when the security mode changes. The fix
is to destroy the old bouncer view on cancel.
Screenshot of clipped view: https://screenshot.googleplex.com/0VWdDtrLkAr
Fix:
79202566
Test: In the head unit
Change-Id: Ife33c53785ed96778f08c8f5886885e2b9d29749
Lucas Dupin [Tue, 22 May 2018 01:13:27 +0000 (18:13 -0700)]
Merge "Bouncer shouldn't be translated when occluded" into pi-dev
am:
553fc8b8e0
Change-Id: I74a1d7a75b4b632cdacc6fbbe8cd88cea449f0f1
Remi NGUYEN VAN [Tue, 22 May 2018 00:58:19 +0000 (09:58 +0900)]
Move CaptivePortalProbeResult to its own file
This is necessary to resolve visibility issues for the next change.
Bug: b/
79499239
Test: runtest frameworks-net
Change-Id: I50bc96afe6ae88c8f58a693f0a4e821f1f9b3299
TreeHugger Robot [Tue, 22 May 2018 00:59:29 +0000 (00:59 +0000)]
Merge "Bouncer shouldn't be translated when occluded" into pi-dev
Lucas Dupin [Tue, 22 May 2018 00:58:05 +0000 (17:58 -0700)]
Add content description to zenmode
Test: manual
Change-Id: Ic478e8a6fcd2088d198b2cee2e70ab8376b4709d
Fixes:
79686343
Lucas Dupin [Tue, 22 May 2018 00:36:02 +0000 (17:36 -0700)]
Merge "Measure text in 1 pass" into pi-dev
am:
322d934e02
Change-Id: Iee665e6974331ea343fc84ae0643640e9b904d9f
Jaewan Kim [Tue, 22 May 2018 00:29:35 +0000 (17:29 -0700)]
Merge "Differentiate MediaController in a process for MediaSession" into pi-dev
am:
43688e8f2f
Change-Id: I8deb492fa82dcb2bec04d85a65a0aa267be830a4
Lucas Dupin [Tue, 22 May 2018 00:16:36 +0000 (00:16 +0000)]
Merge "Measure text in 1 pass" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 00:11:49 +0000 (00:11 +0000)]
Merge "Differentiate MediaController in a process for MediaSession" into pi-dev
Matthew Fritze [Mon, 21 May 2018 23:52:58 +0000 (16:52 -0700)]
Merge "Add utility methods to AmbientDisplayConfig" into pi-dev
am:
758cfd63db
Change-Id: Ie4b339c20f7392211142152b34584683072c191d
Lucas Dupin [Mon, 21 May 2018 23:44:28 +0000 (16:44 -0700)]
Bouncer shouldn't be translated when occluded
Only checking if the bouncer should be scrimmed isn't enough
since it might have been initialized for performance reasons,
but is hidden at the bottom of the keyguard.
Change-Id: If92083e2c385d51febe0ec3a5e5d3484476caf81
Fixes:
80101176
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Test: manual
TreeHugger Robot [Mon, 21 May 2018 23:37:24 +0000 (23:37 +0000)]
Merge "Add utility methods to AmbientDisplayConfig" into pi-dev
Lucas Dupin [Mon, 21 May 2018 22:39:40 +0000 (15:39 -0700)]
Merge "Pulse state should always show ambient wallpaper" into pi-dev
am:
52ecba88d1
Change-Id: I9dfcdf1c70fc3ee2059cc5e9312458bcfa07f0a4
Android Build Merger (Role) [Mon, 21 May 2018 22:35:35 +0000 (22:35 +0000)]
Merge "Merge "FingerprintService: requires ro.product.first_api_level" into pi-dev am:
908b548f3c" into pi-dev-plus-aosp
Yifan Hong [Mon, 21 May 2018 22:35:13 +0000 (15:35 -0700)]
Merge "FingerprintService: requires ro.product.first_api_level" into pi-dev
am:
908b548f3c
Change-Id: Id568f13a8f143e0c05c0efe482e0a05158127114
Colin Cross [Mon, 21 May 2018 22:34:27 +0000 (15:34 -0700)]
Merge "Use AAPT2 for modules with manifest validation errors" am:
59fa1bcf69
am:
0cdc6edb51
Change-Id: I89da1d4e4a4ba1a9aba87f0c66f459e4ed39b82b
Beverly [Mon, 21 May 2018 22:30:15 +0000 (15:30 -0700)]
Merge "Setup mAreChannelsBypassingDnd from notifPolicy" into pi-dev
am:
88bdf18545
Change-Id: I9b4798307a260ffaeb7bc26e970fdd7c79d90910
Colin Cross [Mon, 21 May 2018 22:20:43 +0000 (15:20 -0700)]
[automerger skipped] Merge changes from topic "aapt2-warn-manifest-validation" am:
61f92e7e13
am:
8fd234045d -s ours
Change-Id: Ic87193813a8f87ef37556026b0e19f2632464112
TreeHugger Robot [Mon, 21 May 2018 22:18:47 +0000 (22:18 +0000)]
Merge "Pulse state should always show ambient wallpaper" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 22:18:42 +0000 (22:18 +0000)]
Merge "FingerprintService: requires ro.product.first_api_level" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 22:17:52 +0000 (22:17 +0000)]
Merge "Setup mAreChannelsBypassingDnd from notifPolicy" into pi-dev
Adam Lesinski [Mon, 21 May 2018 22:16:56 +0000 (15:16 -0700)]
[automerger skipped] AAPT2: Better error messages for ManifestFixer am:
b2b20f26db
am:
6671fe5c8e -s ours
Change-Id: Ibf21d14fd06c84ec2bcf92e58b8e4c95659cf333
Adam Lesinski [Mon, 21 May 2018 22:12:18 +0000 (15:12 -0700)]
[automerger skipped] AAPT2: Differentiate between Android and Java package names am:
ef506c73bb
am:
5cc5fdd0dc -s ours
Change-Id: Ie50856b30994185dbf5ff706349296efcac5d24d
Dianne Hackborn [Mon, 21 May 2018 19:31:51 +0000 (12:31 -0700)]
Add new hidden-for-now AppOpsManager APIs to greylist.
Bug:
78480444
Test: manual
Change-Id: I2a9c2040279df3d875b96edb4a686006f5114a76
Merged-In: I2a9c2040279df3d875b96edb4a686006f5114a76
Lucas Dupin [Mon, 21 May 2018 21:41:52 +0000 (14:41 -0700)]
Measure text in 1 pass
Before we were setting the text again using setText, and this
would trigger a second measure/layout pass, which is unnecessary.
Now we're using the same mesure pass to calculate the view's
best line break.
Fixes:
79714443
Test: manual. set various meeting names animated or static
Change-Id: Ia911fae8f820b703ca385a10211073bae37f3258
Adam Lesinski [Mon, 21 May 2018 22:08:25 +0000 (15:08 -0700)]
[automerger skipped] Merge "Change ownership of AAPT2 and libandroidfw" am:
1e0a5d397d
am:
06eb87271d -s ours
Change-Id: I01c79f94b57cdd64a97670e4b7a2e163000487ac
Colin Cross [Mon, 21 May 2018 21:51:40 +0000 (14:51 -0700)]
Merge "Use AAPT2 for modules with manifest validation errors"
am:
59fa1bcf69
Change-Id: I1ae5e646a5c519860450ef1bbef72aacb2c1e915
Jordan Liu [Mon, 21 May 2018 21:48:41 +0000 (14:48 -0700)]
Merge "Change directory where apns-conf.xml is stored" am:
d25198f62f
am:
d15962b260
Change-Id: Ib0416da63f166b5e3a0ac2ef4210d92eaa39a9ab
Colin Cross [Mon, 21 May 2018 21:40:05 +0000 (14:40 -0700)]
Merge changes from topic "aapt2-warn-manifest-validation"
am:
61f92e7e13
Change-Id: Idb04f6750abd4dbdce62979794f68833a39e4c3b
Adam Lesinski [Mon, 21 May 2018 21:35:28 +0000 (14:35 -0700)]
AAPT2: Better error messages for ManifestFixer
am:
b2b20f26db
Change-Id: I1d661e2d11e929ae0930863d5ed2e344c97a9e28
Yifan Hong [Mon, 21 May 2018 19:38:10 +0000 (12:38 -0700)]
FingerprintService: requires ro.product.first_api_level
Test: fingerprint registration works
Bug:
79950359
Change-Id: I1c75b9258a5c63b23fa2c546f002a596c9d55dc3
Adam Lesinski [Mon, 21 May 2018 21:30:41 +0000 (14:30 -0700)]
AAPT2: Differentiate between Android and Java package names
am:
ef506c73bb
Change-Id: I7b5dd69303106eba5959684dc3b6a4af24876c94
Adam Lesinski [Mon, 21 May 2018 21:24:37 +0000 (14:24 -0700)]
Merge "Change ownership of AAPT2 and libandroidfw"
am:
1e0a5d397d
Change-Id: I3a3dcce247b9eae100df4b3b6a89b02ef163e87d
Jordan Liu [Mon, 21 May 2018 21:20:34 +0000 (14:20 -0700)]
Merge "Change directory where apns-conf.xml is stored"
am:
d25198f62f
Change-Id: I33db5a97978e17d82da98344c25788fc3bb42e89
Lucas Dupin [Fri, 18 May 2018 19:57:47 +0000 (12:57 -0700)]
Pulse state should always show ambient wallpaper
Otherwise wallpaper wouldn't be set to AOD when the device pulses
and always on is off.
Bug:
78606979
Test: manual
Test: atest packages/SystemUI/tests/src/com/android/systemui/doze/DozeWallpaperStateTest.java
Change-Id: Ic40c18252cd6cb06ff6fd0d79ec3f1de16a1add5
Beverly [Mon, 21 May 2018 20:14:15 +0000 (16:14 -0400)]
Setup mAreChannelsBypassingDnd from notifPolicy
Test: atest RankingHelperTest
Change-Id: I34d9c8dfb5924bab0e496e37d5b93715c48b78ad
Fixes:
80078295
Ying Zheng [Mon, 21 May 2018 20:54:58 +0000 (13:54 -0700)]
Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev
am:
ab38e73af6
Change-Id: I99bed9c05a1cb49757f3f330d672f6dc4d10615f
Ying Zheng [Mon, 21 May 2018 20:44:23 +0000 (20:44 +0000)]
Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev
Stanley Tng [Mon, 21 May 2018 20:39:49 +0000 (13:39 -0700)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev
am:
aef6efeef5
Change-Id: Ic4ac46d5de65f83ca9e5b27bef44de17c5b94fe8
Mike Digman [Mon, 21 May 2018 20:25:56 +0000 (13:25 -0700)]
Merge "Extend rotation button timeout duration" into pi-dev
am:
4b0351d53f
Change-Id: Ia6c3008ac77389e9e04a9ce1cab7d0a49c6d29d3
Svet Ganov [Mon, 21 May 2018 20:20:56 +0000 (13:20 -0700)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev
am:
c81ed627ab
Change-Id: I7fe9c3d9eb3f291698501ef23fdd449f41d0e3d1
TreeHugger Robot [Mon, 21 May 2018 20:20:31 +0000 (20:20 +0000)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev
Matthew Fritze [Mon, 21 May 2018 20:12:36 +0000 (13:12 -0700)]
Add utility methods to AmbientDisplayConfig
The added utility methods are to enable increased
granularity in determinining the availability of gesture
settings dependant on Always on Display.
Bug:
79779562
Test: robotests
Change-Id: Ib54a867ca554d44ee4190706805fa8545aec9fa0
Suprabh Shukla [Mon, 21 May 2018 20:11:40 +0000 (13:11 -0700)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev
am:
d0897f2b65
Change-Id: Ia624b12b32d06b7e341f7023231000ffb1fb530b
Mike Digman [Mon, 21 May 2018 20:09:24 +0000 (20:09 +0000)]
Merge "Extend rotation button timeout duration" into pi-dev
Svetoslav Ganov [Mon, 21 May 2018 20:04:51 +0000 (13:04 -0700)]
Merge "Make RemoteCallback test API" into pi-dev
am:
a757fd7827
Change-Id: Iea481e8a4716bddf48a64d9370d248ffa7871158
TreeHugger Robot [Mon, 21 May 2018 20:03:10 +0000 (20:03 +0000)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 20:01:36 +0000 (20:01 +0000)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev
Svetoslav Ganov [Mon, 21 May 2018 19:55:12 +0000 (19:55 +0000)]
Merge "Make RemoteCallback test API" into pi-dev
Treehugger Robot [Mon, 21 May 2018 19:53:38 +0000 (19:53 +0000)]
Merge "Use AAPT2 for modules with manifest validation errors"
Colin Cross [Fri, 18 May 2018 16:50:29 +0000 (09:50 -0700)]
Use AAPT2 for modules with manifest validation errors
Add LOCAL_AAPT_FLAGS += --warn-manifest-validation to the modules
that have manifests that AAPT2 can't parse.
Bug:
79755007
Test: m checkbuild
Change-Id: I357fcba75909495ba2b46b9ed1b532e65fee3fe1
Colin Cross [Mon, 21 May 2018 19:52:24 +0000 (19:52 +0000)]
Merge changes from topic "aapt2-warn-manifest-validation"
* changes:
AAPT2: treat manifest validation errors as warnings when asked
AAPT2: Better error messages for ManifestFixer
AAPT2: Differentiate between Android and Java package names
Izabela Orlowska [Tue, 19 Dec 2017 16:22:42 +0000 (16:22 +0000)]
AAPT2: treat manifest validation errors as warnings when asked
Bug:
65670329
Test: updated
Change-Id: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9
Merged-In: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9
(cherry picked from commit
ad9e1324ff2c459d0ee6ee571d4a3e458c02cc81)
Adam Lesinski [Thu, 2 Nov 2017 19:07:08 +0000 (12:07 -0700)]
AAPT2: Better error messages for ManifestFixer
AAPT2 will now print the XML hierarchy where it found an unexpected
element.
Test: make aapt2_tests
Change-Id: Iac7918b2f344fab874f0a3e7aa9c6936ecde8913
Merged-In: Iac7918b2f344fab874f0a3e7aa9c6936ecde8913
(cherry picked from commit
ed37f4842ad838792b16bf19768ed9b2519b0194)
Adam Lesinski [Mon, 6 Nov 2017 18:44:46 +0000 (10:44 -0800)]
AAPT2: Differentiate between Android and Java package names
Android package names are more strict (ASCII only) than Java package names.
Also fixed an issue where trailing underscores were disallowed in Android
package names.
(cherry picked from commit
96ea08f1e737e0d19e274e9a29f71c387d81b09a)
Also includes part of I357fb84941bfbb3892a8c46feb47f55b865b6649 to remove
usage of FindNonAlphaNumericAndNotInSet.
Bug:
79481102
Test: make aapt2_tests
Change-Id: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Merged-In: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Treehugger Robot [Mon, 21 May 2018 19:46:00 +0000 (19:46 +0000)]
Merge "Change ownership of AAPT2 and libandroidfw"
Chenbo Feng [Mon, 21 May 2018 19:44:23 +0000 (12:44 -0700)]
Merge "Check for bpf support at NetworkStatsService start" into pi-dev
am:
6555a9fa16
Change-Id: If2fd9e040e4717f1040c16e4b5f6c61cfc14e140
Lucas Dupin [Mon, 21 May 2018 19:36:44 +0000 (12:36 -0700)]
Merge "Keep scrim black when "always on" is off" into pi-dev
am:
402e2a2b6f
Change-Id: Iecc4ff6e4f1861e8adec33e912d71be051ccb98d
Yohei Yukawa [Mon, 21 May 2018 19:29:13 +0000 (12:29 -0700)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev
am:
711a8f7f28
Change-Id: I7ac74ec1076ad7160475b9595e00db85eea9f818
TreeHugger Robot [Mon, 21 May 2018 19:19:59 +0000 (19:19 +0000)]
Merge "Check for bpf support at NetworkStatsService start" into pi-dev
Jordan Liu [Mon, 21 May 2018 19:06:54 +0000 (19:06 +0000)]
Merge "Change directory where apns-conf.xml is stored"
Yangster-mac [Mon, 21 May 2018 19:01:32 +0000 (12:01 -0700)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev
am:
76cb7fe2f6
Change-Id: I4bb331330c505396427bb72ff7b69c2b6653ba97
Ryan Mitchell [Mon, 21 May 2018 18:53:56 +0000 (11:53 -0700)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
am:
fd37ec90b8
Change-Id: I3030d62104142b33dfb9844faa2fcb9840d8ee61
Bill Yi [Mon, 21 May 2018 18:42:56 +0000 (11:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
35426e5e69 -s ours
Change-Id: I9ca85e02a0ab28401d9c5715180e8b0323d75c30
Bill Yi [Mon, 21 May 2018 18:32:41 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
346e04785d -s ours
Change-Id: I6f15d6341bd4574d65dd9c0eb08fc80482386beb
Andreas Gampe [Mon, 21 May 2018 18:25:06 +0000 (11:25 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping" am:
923208e8c9
am:
2d47ac0df7
Change-Id: Ie4274380bb66a35a6ba12d0f868ae78ef80f4b0d
Lucas Dupin [Mon, 21 May 2018 18:23:59 +0000 (18:23 +0000)]
Merge "Keep scrim black when "always on" is off" into pi-dev
Mike Digman [Mon, 21 May 2018 18:23:56 +0000 (11:23 -0700)]
Extend rotation button timeout duration
Moving from 6s to 10s timeout when navbar is visible.
Change-Id: I3a7067c37f254698ae53fdb9208576f3e486c8ce
Fixes:
79981820
Test: manual
Ying Zheng [Thu, 10 May 2018 20:02:07 +0000 (13:02 -0700)]
DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper.
Test: Build
Bug:
79417730
Change-Id: I52c9b0f5ba01b85e36242b112ef9bbcc54a08e48
Bill Yi [Mon, 21 May 2018 18:18:24 +0000 (11:18 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
f28ef47762 -s ours
Change-Id: Ieed9e65080e7aba8701d23ef5b416fc4b896ea7f
Andreas Gampe [Mon, 21 May 2018 18:17:24 +0000 (11:17 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping"
am:
923208e8c9
Change-Id: Ifed1ed567587b7616880f3b640d3162c57a40644
Bill Yi [Mon, 21 May 2018 18:17:01 +0000 (11:17 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
3743438f5e -s ours
Change-Id: I92b0c74b35b8b5d6e98053202d8529e25fee3eaf
TreeHugger Robot [Mon, 21 May 2018 18:15:43 +0000 (18:15 +0000)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev
Bill Yi [Mon, 21 May 2018 18:13:26 +0000 (11:13 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
998221a361 -s ours
Change-Id: I85f9d555bfdf76d0b0ebcfc25c351304c208b9ef
Bill Yi [Mon, 21 May 2018 18:11:36 +0000 (11:11 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
addcc20dd4 -s ours
Change-Id: Id0247616a981fcc59b0956bf0ba29f0e96d7980a
TreeHugger Robot [Mon, 21 May 2018 18:05:00 +0000 (18:05 +0000)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev
Bill Yi [Mon, 21 May 2018 18:04:38 +0000 (11:04 -0700)]
Merge changes from topic "am-
d326b840-2575-4e69-8ec2-
5cfa14046328" into oc-dev am:
99e6aa1b1e am:
d88c6877da am:
aa55d5db76
am:
b138eaa7b7
Change-Id: Idf0ba5b3480762902f3df610bd313653c2111550
TreeHugger Robot [Mon, 21 May 2018 17:59:35 +0000 (17:59 +0000)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
Bill Yi [Mon, 21 May 2018 17:57:38 +0000 (10:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb skipped:
ea0127f477 am:
4f1f428661 -s ours am:
a53d91e485 -s ours am:
5e1f17a880 -s ours
am:
91d2623fe0 -s ours
Change-Id: I66d8b302db8bd7f2397cfeff65a73fa96f6c28fa
TreeHugger Robot [Mon, 21 May 2018 17:57:26 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
OSDN Git Service
