OSDN Git Service
Jordan Liu [Fri, 11 May 2018 17:58:29 +0000 (10:58 -0700)]
[automerger skipped] Merge "Add Carriers.APN_SET_ID and NO_SET_SET" am:
cdb29f97db am:
87a0844d12 -s ours
am:
e9a3356c31 -s ours
Change-Id: I00f345b9f69d47a7dd8f33326bdd50bf4d1d75e3
Jordan Liu [Fri, 11 May 2018 17:29:53 +0000 (10:29 -0700)]
[automerger skipped] Merge "Add Carriers.APN_SET_ID and NO_SET_SET" am:
cdb29f97db
am:
87a0844d12 -s ours
Change-Id: I4e67d7d71d1eb8dda13a4f25e505f4b8708f3afd
Bo Zhu [Fri, 11 May 2018 17:08:47 +0000 (10:08 -0700)]
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev am:
90dbb0ed72
am:
542dbb9734
Change-Id: I953c5cf4f2475dc0d371e4b3fb3f9ad7520c60ad
Jordan Liu [Fri, 11 May 2018 17:04:19 +0000 (10:04 -0700)]
Merge "Add Carriers.APN_SET_ID and NO_SET_SET"
am:
cdb29f97db
Change-Id: I6b004476c47e105b35ec0d3884c660f6b10b8697
Bo Zhu [Fri, 11 May 2018 16:59:59 +0000 (09:59 -0700)]
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev
am:
90dbb0ed72
Change-Id: I96ddaa531db00ec6e925b276e5ba137af51bfed5
Riddle Hsu [Fri, 11 May 2018 16:59:38 +0000 (09:59 -0700)]
Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev am:
eacc2163d3
am:
fb9bfe3fdc
Change-Id: Ie2fa660ad8b350c5a46dc40d66e5ffbfe8e3d2bf
Riddle Hsu [Fri, 11 May 2018 16:50:20 +0000 (09:50 -0700)]
Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev
am:
eacc2163d3
Change-Id: If4e5a875e57edfecb574c7137446b87b44718001
Bo Zhu [Fri, 11 May 2018 16:46:16 +0000 (16:46 +0000)]
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev
Riddle Hsu [Fri, 11 May 2018 16:36:29 +0000 (16:36 +0000)]
Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev
John Reck [Fri, 11 May 2018 16:32:59 +0000 (16:32 +0000)]
Merge "A better HW Bitmap uploader"
Mathew Inwood [Fri, 11 May 2018 16:07:24 +0000 (09:07 -0700)]
Merge "Add APIs from public requests." into pi-dev am:
7692904a7b
am:
2b46441438
Change-Id: I4146edfc20788e3403f7582d7c31c8dccd837058
Mathew Inwood [Fri, 11 May 2018 15:58:18 +0000 (08:58 -0700)]
Merge "Add APIs from public requests." into pi-dev
am:
7692904a7b
Change-Id: I0eff161e25938a9bb823f730a9c208b94ac2dbac
Jordan Liu [Fri, 11 May 2018 15:57:16 +0000 (15:57 +0000)]
Merge "Add Carriers.APN_SET_ID and NO_SET_SET"
Mathew Inwood [Fri, 11 May 2018 15:44:53 +0000 (15:44 +0000)]
Merge "Add APIs from public requests." into pi-dev
Ryan Mitchell [Fri, 11 May 2018 15:41:00 +0000 (08:41 -0700)]
Merge "AAPT2: Insert platformBuild information" into pi-dev am:
91d2f87d0e
am:
78e0e6aa2e
Change-Id: I6fb1af5b521c5a887ee494c745b83592e48228de
David Brazdil [Fri, 11 May 2018 15:34:18 +0000 (08:34 -0700)]
Merge "Include in hidden API dark greylist based on package name" into pi-dev am:
f36144f575
am:
bad3bf6c22
Change-Id: I812fd5913e65f8573dad636251c6c217c6c1883f
Ryan Mitchell [Fri, 11 May 2018 15:30:35 +0000 (08:30 -0700)]
Merge "AAPT2: Insert platformBuild information" into pi-dev
am:
91d2f87d0e
Change-Id: Ifa673f17cb3ee1ecb146aaafab7c3c71b47f7154
David Brazdil [Fri, 11 May 2018 15:24:12 +0000 (08:24 -0700)]
Merge "Include in hidden API dark greylist based on package name" into pi-dev
am:
f36144f575
Change-Id: I2f1e1ccd9de49b95f1c5439b13134cc166645612
Ryan Mitchell [Fri, 11 May 2018 15:18:56 +0000 (15:18 +0000)]
Merge "AAPT2: Insert platformBuild information" into pi-dev
David Brazdil [Fri, 11 May 2018 15:11:23 +0000 (15:11 +0000)]
Merge "Include in hidden API dark greylist based on package name" into pi-dev
Jason Monk [Fri, 11 May 2018 14:58:57 +0000 (07:58 -0700)]
Merge "Make sure KeyguardUpdateMonitor uses main thread" into pi-dev am:
accef3e1f5
am:
0e8fcd37c5
Change-Id: I1d1be76718c482454887c07c5232a61bba70e888
Jason Monk [Fri, 11 May 2018 14:49:30 +0000 (07:49 -0700)]
Merge "Make sure KeyguardUpdateMonitor uses main thread" into pi-dev
am:
accef3e1f5
Change-Id: I033977dcdf4668c63eb2cbee88973a5306643dfe
TreeHugger Robot [Fri, 11 May 2018 14:39:29 +0000 (14:39 +0000)]
Merge "Make sure KeyguardUpdateMonitor uses main thread" into pi-dev
Kenny Guy [Fri, 11 May 2018 14:39:03 +0000 (07:39 -0700)]
Merge "Fix issue with compressed smart replies." into pi-dev am:
895ed11d03
am:
97511bc250
Change-Id: I040c40c8cc715065d880e41182ad9d2e931ab350
Mathew Inwood [Fri, 11 May 2018 14:04:36 +0000 (15:04 +0100)]
Add APIs from public requests.
Bug:
79477176
Bug:
79461371
Bug:
75254051
Bug:
77840247
Bug:
78456545
Test: m
Change-Id: I6588b65d4f4dccd5fe8bd8420b88c7830803c978
Kenny Guy [Fri, 11 May 2018 14:29:30 +0000 (07:29 -0700)]
Merge "Fix issue with compressed smart replies." into pi-dev
am:
895ed11d03
Change-Id: I7743b004a7ddc9e46f3366f7c15058aad12686c4
TreeHugger Robot [Fri, 11 May 2018 14:19:40 +0000 (14:19 +0000)]
Merge "Fix issue with compressed smart replies." into pi-dev
Evan Laird [Fri, 11 May 2018 14:15:48 +0000 (07:15 -0700)]
Merge "Battery saver color changes" into pi-dev am:
4ee9b14c14
am:
9252fbc726
Change-Id: Icd329e55bf491a71b08e337f7c50a5188788ee13
Nicolas Geoffray [Fri, 11 May 2018 14:08:02 +0000 (07:08 -0700)]
[automerger skipped] Merge "Add static analysis data." am:
1c5811d34d am:
bf9db89c75 -s ours
am:
050b4a4851 -s ours
Change-Id: If77451ef2f90dec5c371601bded3acaa422bc580
Evan Laird [Fri, 11 May 2018 14:02:22 +0000 (07:02 -0700)]
Merge "Battery saver color changes" into pi-dev
am:
4ee9b14c14
Change-Id: I10401ad57f32066b961ba8a7fe9d33cab9bff93b
Nicolas Geoffray [Fri, 11 May 2018 13:56:09 +0000 (06:56 -0700)]
[automerger skipped] Merge "Add static analysis data." am:
1c5811d34d
am:
bf9db89c75 -s ours
Change-Id: I3fdd8228ff12186ae035a3f3e38d99b507751b5d
TreeHugger Robot [Fri, 11 May 2018 13:48:43 +0000 (13:48 +0000)]
Merge "Battery saver color changes" into pi-dev
Nicolas Geoffray [Fri, 11 May 2018 13:44:05 +0000 (06:44 -0700)]
Fix pi-dev-plus-aosp breakage.
am:
7ae03babc6
Change-Id: I751f445b3ffd37c92cc83ca21e2e5f680c790551
Nicolas Geoffray [Fri, 11 May 2018 13:23:12 +0000 (14:23 +0100)]
Fix pi-dev-plus-aosp breakage.
bug:
64382372
Test: m
Change-Id: I9ca81e8e8aae96f5f55931c8393316c6f0f71157
Nicolas Geoffray [Fri, 11 May 2018 12:49:06 +0000 (05:49 -0700)]
Merge "Add static analysis data."
am:
1c5811d34d
Change-Id: I0e648c528b0e8749ecd1ee22e0d156354750427b
Suprabh Shukla [Fri, 11 May 2018 12:47:02 +0000 (05:47 -0700)]
Merge "Changed interceptor dialog text for suspended apps" into pi-dev am:
6982d3ee2a
am:
e99e98478e
Change-Id: I487bf73c572c8fa0e7481bbc701d27534ec17a77
Nicolas Geoffray [Fri, 11 May 2018 12:37:21 +0000 (05:37 -0700)]
[automerger skipped] Revert "Revert "Add static analysis data."" am:
d6c8144043
am:
3d77341d88 -s ours
Change-Id: Ia8d543bb677c1459e9735902127685f8740528f5
Suprabh Shukla [Fri, 11 May 2018 12:34:16 +0000 (05:34 -0700)]
Merge "Changed interceptor dialog text for suspended apps" into pi-dev
am:
6982d3ee2a
Change-Id: I4fc2d5bd6ebec345dc42bdee4b83c0f12d25a95d
Nicolas Geoffray [Fri, 11 May 2018 12:29:34 +0000 (05:29 -0700)]
Revert "Revert "Add static analysis data.""
am:
d6c8144043
Change-Id: I5114959573deaa6e4e5812ce7dab6f975d0279e5
David Brazdil [Thu, 10 May 2018 14:50:02 +0000 (15:50 +0100)]
Include in hidden API dark greylist based on package name
Dark greylist has so far been populated with the remaining class
members of classes listed on the light greylist. This patch changes
the rule to include all remaining classes and class members in the
same package (sub-packages not included).
Bug:
64382372
Test: make -j64 out/target/common/obj/PACKAGING/hiddenapi-dark-greylist.txt
Change-Id: Icf3f60f1e776f092103c612fc3995ce0e66617ea
TreeHugger Robot [Fri, 11 May 2018 12:21:39 +0000 (12:21 +0000)]
Merge "Changed interceptor dialog text for suspended apps" into pi-dev
Treehugger Robot [Fri, 11 May 2018 11:41:40 +0000 (11:41 +0000)]
Merge "Add static analysis data."
Nicolas Geoffray [Fri, 11 May 2018 10:38:58 +0000 (03:38 -0700)]
Merge "Move registration of AssetManager.mObject to zygote." into pi-dev am:
85ec63532f
am:
5652b43cca
Change-Id: I55960d3184c1959b1ac7a09930050d8d9acae1c0
Nicolas Geoffray [Fri, 11 May 2018 10:29:21 +0000 (03:29 -0700)]
Merge "Move registration of AssetManager.mObject to zygote." into pi-dev
am:
85ec63532f
Change-Id: I5f8035cb13d51a038b81ddc779e2881f683eb200
Nicolas Geoffray [Fri, 11 May 2018 10:17:37 +0000 (10:17 +0000)]
Revert "Revert "Add static analysis data.""
bug:
64382372
Merged-in: I188a69ad05fffa69be79fec36b180fc9f76998fa
Merged-in: Ie0696a5eecf610165c4b9c339a789f76964a0623
Test: m
This reverts commit
a11a78549d0930ddfc27746ab67b64f3e64f6004.
Change-Id: I8e82aa8cb30052555cbc4020ebe8a0c1157dc6e6
David Brazdil [Fri, 11 May 2018 10:15:41 +0000 (03:15 -0700)]
[automerger skipped] Greylist hidden methods for exempting trusted test code am:
34a06b86bd -s ours
am:
a12ca888a5 -s ours
Change-Id: Ic8728b77e710ca39d89d2e43d3b5aa8dafa26ab8
Nicolas Geoffray [Fri, 11 May 2018 10:13:42 +0000 (10:13 +0000)]
Merge "Move registration of AssetManager.mObject to zygote." into pi-dev
Nicolas Geoffray [Fri, 11 May 2018 10:08:01 +0000 (11:08 +0100)]
Add static analysis data.
bug:
64382372
Test: m
Change-Id: Ie0696a5eecf610165c4b9c339a789f76964a0623
Merged-in: I188a69ad05fffa69be79fec36b180fc9f76998fa
David Brazdil [Fri, 11 May 2018 10:02:49 +0000 (03:02 -0700)]
[automerger skipped] Greylist hidden methods for exempting trusted test code
am:
34a06b86bd -s ours
Change-Id: I86a5c92cf69e6a5eb937917e509055ad359790e2
hughchen [Fri, 11 May 2018 09:54:35 +0000 (02:54 -0700)]
Merge "Add new type into metrics_constants.proto" into pi-dev am:
603824a6e7
am:
a1515b588e
Change-Id: Id6fafb25aaaffea432358dd770318b438254b761
David Brazdil [Wed, 9 May 2018 17:02:03 +0000 (18:02 +0100)]
Greylist hidden methods for exempting trusted test code
Bug:
64382372
Test: N/A
Merged-In: I8bcc3d23d0b942e70a16a9d28ea0d21ce4fe75a2
Change-Id: I8bcc3d23d0b942e70a16a9d28ea0d21ce4fe75a2
(cherry picked from commit
0e348c5013b37843302fb2d3c558fd7961c592a4)
hughchen [Fri, 11 May 2018 09:45:32 +0000 (02:45 -0700)]
Merge "Add new type into metrics_constants.proto" into pi-dev
am:
603824a6e7
Change-Id: I419e9c5a2a540b71b1c0f4499b68e77be925b57d
TreeHugger Robot [Fri, 11 May 2018 09:33:20 +0000 (09:33 +0000)]
Merge "Add new type into metrics_constants.proto" into pi-dev
Bo Zhu [Fri, 11 May 2018 05:10:28 +0000 (05:10 +0000)]
Revert "Revert "Change the root of trust for CryptAuth Vault Service""
This reverts commit
be4f735cb199d184431d718b245ac51c4e7a70bf.
Reason for revert: Resubmit the CL http://ag/
3983388 that was reverted. The server side change has been deployed now.
Bug:
78920513
Change-Id: If676799176ecf90fd51a97027a9ff83bec5d4bed
Riddle Hsu [Thu, 10 May 2018 15:14:19 +0000 (23:14 +0800)]
Fix focusable on entire notification area if QS is expanded
Notifications are shown as shelf if QS is expanded. Because none
of notification contents are visible, the notification scroll
layout should be unscrollable and non-focusable.
Test: Use TalkBack to perform go/sysui-stackscroll-test
Change-Id: Icf27546fa43241b267be84761b7847a6e25c9a7a
Fixes:
72956614
Christopher Tate [Fri, 11 May 2018 03:37:02 +0000 (20:37 -0700)]
Merge "Treat fg service alarms like bg service alarms under FAS" into pi-dev am:
de38aa102d
am:
eead0246ac
Change-Id: Id60634c67d9f3cac3cf8b6f5a22cdcfdd4445236
Brad Stenning [Fri, 11 May 2018 03:29:49 +0000 (20:29 -0700)]
Merge "Add a path to allow detection of task changes to the top of the ActivityView" into pi-dev am:
47a8ecce90
am:
2b557bebaa
Change-Id: I340e4b3aeca35bd45a326756ea9d42b22fc84598
Christopher Tate [Fri, 11 May 2018 03:28:22 +0000 (20:28 -0700)]
Merge "Treat fg service alarms like bg service alarms under FAS" into pi-dev
am:
de38aa102d
Change-Id: I055045bc4d6585fc507fe394f9f3ee21e1076a1b
Christopher Tate [Fri, 11 May 2018 03:15:41 +0000 (20:15 -0700)]
Merge "Document system activity intents that may not be implemented" into pi-dev am:
f9dbd76be3
am:
b11cfdbb68
Change-Id: Ibbf7e19e942dd63774fd43f10e66d5c87e2aa8aa
TreeHugger Robot [Fri, 11 May 2018 03:14:33 +0000 (03:14 +0000)]
Merge "Treat fg service alarms like bg service alarms under FAS" into pi-dev
Brad Stenning [Fri, 11 May 2018 03:14:18 +0000 (20:14 -0700)]
Merge "Add a path to allow detection of task changes to the top of the ActivityView" into pi-dev
am:
47a8ecce90
Change-Id: I5c585d2ca5cb29fb9f4fc2188575233ea70277e3
Christopher Tate [Fri, 11 May 2018 03:05:42 +0000 (20:05 -0700)]
Merge "Document system activity intents that may not be implemented" into pi-dev
am:
f9dbd76be3
Change-Id: I280d65623e070fbc2983f0e646f48d520842b2c9
TreeHugger Robot [Fri, 11 May 2018 02:45:25 +0000 (02:45 +0000)]
Merge "Add a path to allow detection of task changes to the top of the ActivityView" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 02:42:38 +0000 (02:42 +0000)]
Merge "Document system activity intents that may not be implemented" into pi-dev
Jason Monk [Fri, 11 May 2018 02:38:18 +0000 (19:38 -0700)]
Make sure KeyguardUpdateMonitor uses main thread
It might be affecting some tests in bad ways.
Test: runtest systemui
Bug:
79550837
Change-Id: Ifcd746f8b0131bcc21772d0b722cca9700bf5afc
Beverly [Fri, 11 May 2018 02:23:53 +0000 (19:23 -0700)]
Merge "Cannot add null callbacks to ZenController" into pi-dev am:
d87ad2d97c
am:
82649a8822
Change-Id: Iac667ad873d31b9d622b791be1ad9e3fbb2ebc47
Beverly [Fri, 11 May 2018 02:16:40 +0000 (19:16 -0700)]
Merge "Cannot add null callbacks to ZenController" into pi-dev
am:
d87ad2d97c
Change-Id: I7cc869829a8b16a9f07714365f83622b27de935c
TreeHugger Robot [Fri, 11 May 2018 02:03:55 +0000 (02:03 +0000)]
Merge "Cannot add null callbacks to ZenController" into pi-dev
Jordan Liu [Fri, 11 May 2018 01:50:13 +0000 (18:50 -0700)]
[automerger skipped] Merge "Add documentation for what to use for SS changes" am:
12ee7a7eec am:
e50905aa8f -s ours
am:
13be3ca48b -s ours
Change-Id: Id721847cd768ffcc5b3b2a2de6039c299ba27f06
Jordan Liu [Fri, 11 May 2018 01:41:20 +0000 (18:41 -0700)]
[automerger skipped] Merge "Add documentation for what to use for SS changes" am:
12ee7a7eec
am:
e50905aa8f -s ours
Change-Id: Ie8c42dd1b51f5d099c475f9e456645a6663853fd
Jordan Liu [Fri, 11 May 2018 01:34:16 +0000 (18:34 -0700)]
Merge "Add documentation for what to use for SS changes"
am:
12ee7a7eec
Change-Id: Icec89d1278bd1b3cd2be8f9a2faa839d0ee1f463
Doris Ling [Fri, 11 May 2018 01:13:25 +0000 (18:13 -0700)]
Merge "Add new category keys." into pi-dev am:
158d5b7b01
am:
23ab3fdff7
Change-Id: I4c9f87a48b87cd947739c0c3460a5593c826e110
Doris Ling [Fri, 11 May 2018 01:02:35 +0000 (18:02 -0700)]
Merge "Add new category keys." into pi-dev
am:
158d5b7b01
Change-Id: Ia50d80bea7235ae5e17dd0f23f49d0b0c48e1d81
Jordan Liu [Fri, 11 May 2018 01:00:42 +0000 (18:00 -0700)]
[automerger skipped] Merge "Update getIccAuthentication documentation" am:
b11cbb9e2e am:
8d3e1130a4 -s ours
am:
d0c0841247 -s ours
Change-Id: I59d67add5b90bce9c70d0e3563ce09f57c2fc065
Christopher Tate [Thu, 10 May 2018 20:09:48 +0000 (13:09 -0700)]
Document system activity intents that may not be implemented
All of these activity-start intents might be unimplemented on some
Android products. Document this to make sure that developers are
aware of the need to safeguard against this.
Bug:
68300743
Bug:
62201251
Bug:
69587018
Fixes:
77282739
Test: atest CtsContentTestCases:.AvailableIntentsTest
Change-Id: Ia2346d03ccb7f2bdad2b84ba9efff72413fdc3c2
Jordan Liu [Fri, 11 May 2018 00:49:52 +0000 (17:49 -0700)]
[automerger skipped] Merge "Update getIccAuthentication documentation" am:
b11cbb9e2e
am:
8d3e1130a4 -s ours
Change-Id: I86ee5736816beeea147b75ca40a9fd3c82450009
TreeHugger Robot [Fri, 11 May 2018 00:46:42 +0000 (00:46 +0000)]
Merge "Add new category keys." into pi-dev
Jordan Liu [Fri, 11 May 2018 00:40:20 +0000 (17:40 -0700)]
Merge "Update getIccAuthentication documentation"
am:
b11cbb9e2e
Change-Id: Ied25c5ea18797fa18d97dbe72bd8f941f148095b
Felipe Leme [Fri, 11 May 2018 00:37:33 +0000 (17:37 -0700)]
Merge "Added support to run autofill service from instant apps." into pi-dev am:
0cd7a2e101
am:
1f2c2a86a2
Change-Id: I9801dde56c8cc7d33982884290250df63e57dd52
Felipe Leme [Fri, 11 May 2018 00:22:21 +0000 (17:22 -0700)]
Merge "Added support to run autofill service from instant apps." into pi-dev
am:
0cd7a2e101
Change-Id: I8cfcf6947c153aea69f13301fd584fb91872f8aa
Evan Laird [Fri, 11 May 2018 00:21:17 +0000 (17:21 -0700)]
Merge "Allow mobile status bar icon to overflow" into pi-dev am:
bb6ec00263
am:
2a052efb70
Change-Id: Ia6412a5d7b9abededc5851985a872c1a27baa1d4
Selim Cinek [Fri, 11 May 2018 00:08:34 +0000 (17:08 -0700)]
Merge "Fix User unable to view the keyboard input" into pi-dev am:
dca90312ac
am:
2d6d5e54fd
Change-Id: Ia7ab30979ba397151aaec6b8c65d163b07dd91b9
TreeHugger Robot [Fri, 11 May 2018 00:06:37 +0000 (00:06 +0000)]
Merge "Added support to run autofill service from instant apps." into pi-dev
Jordan Liu [Thu, 10 May 2018 23:52:19 +0000 (16:52 -0700)]
Merge "Update documentation of ApnSetting with V5 example" into pi-dev am:
522a9c3e05
am:
93b2a2effa
Change-Id: I599eb05ec22d69e03d86631051f9a13b7ab36003
Evan Laird [Thu, 10 May 2018 23:52:15 +0000 (16:52 -0700)]
Merge "Allow mobile status bar icon to overflow" into pi-dev
am:
bb6ec00263
Change-Id: Id61c8dd5a5e6e2c994c477ba5586fecc8806aec5
Evan Laird [Thu, 3 May 2018 21:00:25 +0000 (17:00 -0400)]
Battery saver color changes
Outline the battery with 1dp colorError border when in powersave mode to
make it more obvious.
Also un-bold the '+'. Doesn't look so wonderful
Test: turn on power save mode; look at it
Fixes: visual
Bug:
78638798
Change-Id: I9c649814764c41893c972d707449ad30095a131d
Chong Zhang [Thu, 10 May 2018 23:46:09 +0000 (16:46 -0700)]
Merge "Fix failure in ExifInterface on certain HEIF files" into pi-dev am:
a3a74591b7
am:
e47d650111
Change-Id: I8ff7b96cc5f49598630575448fa3f2bad781131d
TreeHugger Robot [Thu, 10 May 2018 23:44:33 +0000 (23:44 +0000)]
Merge "Allow mobile status bar icon to overflow" into pi-dev
Shuo Qian [Thu, 10 May 2018 23:37:18 +0000 (16:37 -0700)]
[automerger skipped] Merge "Enhance adding subscription logs" am:
263913016f am:
54e464971d -s ours
am:
92697b5aa7 -s ours
Change-Id: I565b455ee898ec0641fd0cada0a19c6b37188eae
Winson Chung [Thu, 10 May 2018 23:32:53 +0000 (16:32 -0700)]
Merge "Remove failsafe runnable once the animation finishes." into pi-dev am:
abb815fbb0
am:
1baa56098c
Change-Id: Ic05511949f2ce8e768df1ac5bb2582c4f857d0d6
Winson Chung [Thu, 10 May 2018 23:29:48 +0000 (16:29 -0700)]
Merge "Expose rotation button as hit target for deferring recents animation." into pi-dev am:
800a8a8e61
am:
39ce66898a
Change-Id: I552781076a7729a7e1f557771947cfb08b9fa9e9
Tony Mak [Thu, 10 May 2018 23:27:03 +0000 (16:27 -0700)]
Merge "[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373 am:
b1f2848510 am:
884d2c7360 am:
6a42ea18b3 am:
42ded39df8 am:
fb67a0f5f3 am:
2cb239cf3c am:
8914d11b15 am:
675ad12059 am:
ed2d7b7d62 am:
e4204fa020 am:
5f26706929" into pi-dev am:
7c5a3498b4
am:
e6734d87ba
Change-Id: I18b7812d3c9c9afc115a9d1d438765ea7bd16a31
Rohan Shah [Thu, 10 May 2018 23:16:31 +0000 (16:16 -0700)]
Merge "Fix notificationinfo test breakage" into pi-dev am:
aba96e5556
am:
edb8d66ea3
Change-Id: Ic8444878c73ca3d509f2a6b67abfc902e9fd69e9
Makoto Onuki [Thu, 10 May 2018 23:12:41 +0000 (16:12 -0700)]
Merge "SyncManager: Suppress WTF until ready to sync" into pi-dev am:
52279041f3
am:
ebb190ce27
Change-Id: I7dfd1b44f30d10d74b77e4db4157f0def6e69e9d
Jordan Liu [Thu, 10 May 2018 23:10:08 +0000 (23:10 +0000)]
Merge "Add documentation for what to use for SS changes"
Eugene Susla [Thu, 10 May 2018 23:08:55 +0000 (16:08 -0700)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288 am:
743abb939a am:
a99414f51f am:
6b95503960 am:
9e291fe8c2 am:
97f7498c18 am:
232f42c7b8 am:
76a04ff670 am:
2bd91daa06 am:
3543522564 am:
775b8adf7b am:
dd7d1ca671 am:
99d03edf8e
am:
3f3fde698c
Change-Id: I847c9b698aafd1f1351d74a6a2d7e4a22f6f4a38
Lei Yu [Thu, 10 May 2018 22:56:37 +0000 (15:56 -0700)]
Merge "Add new method in PowerWhitelistBackend" into pi-dev am:
8003f88b8f
am:
b0117c480b
Change-Id: Ic3b4897163984a868ccda1ef48391ca19514a7a7
Jordan Liu [Thu, 10 May 2018 22:56:27 +0000 (22:56 +0000)]
Merge "Update getIccAuthentication documentation"
Yifan Hong [Thu, 10 May 2018 22:44:50 +0000 (15:44 -0700)]
Merge "VintfObjectTest: fix test with respect to deprecation schedule changes" into pi-dev am:
34d5ae5e74
am:
2ca3f24830
Change-Id: Idafb6edc0095dddf5bf6f3988642c6bee3e88122
Wei Wang [Thu, 10 May 2018 22:39:55 +0000 (15:39 -0700)]
[automerger skipped] Merge "Extend Location setting to show location usage within 24 hours." into pi-dev am:
1d74075099
am:
d57da95ef8 -s ours
Change-Id: I0bd021c447e720762c040bb36411856ab4c41794
OSDN Git Service
