OSDN Git Service
TreeHugger Robot [Tue, 18 Sep 2018 08:28:11 +0000 (08:28 +0000)]
Merge "Simplify logic for connect in MapClientProfile"
TreeHugger Robot [Tue, 18 Sep 2018 06:18:38 +0000 (06:18 +0000)]
Merge "Check preferred display for matching existing activity"
Rhed Jao [Tue, 18 Sep 2018 06:06:31 +0000 (06:06 +0000)]
Merge "Add text entry key property to a11y info node"
David Brazdil [Tue, 18 Sep 2018 05:59:05 +0000 (22:59 -0700)]
Merge changes I66bbe8b5,Ie54677db am:
4f5f8f4192 am:
27f86bfb81
am:
b97e7a0678
Change-Id: Id4bd58ad3a56cd6868e6fee6baf83681ab31a248
David Brazdil [Tue, 18 Sep 2018 05:46:43 +0000 (22:46 -0700)]
Merge changes I66bbe8b5,Ie54677db am:
4f5f8f4192
am:
27f86bfb81
Change-Id: I0a6e4acb26cc6776dea3b6a5302cb3cc300b2aa3
David Brazdil [Tue, 18 Sep 2018 05:35:07 +0000 (22:35 -0700)]
Merge changes I66bbe8b5,Ie54677db
am:
4f5f8f4192
Change-Id: I25e2d9ea53fced5213236e09b6b28c7b87f4191b
Riddle Hsu [Tue, 11 Sep 2018 13:20:02 +0000 (21:20 +0800)]
Check preferred display for matching existing activity
Fix two conditions:
- If the reused activity is in the top focused stack, it is unable
to reparent to preferred display because top task is the same as
reused task.
- If the reused activity is in preferred display, it is unnecessary
to get launch stack that may produce a dangling stack.
Also make TestActivityDisplay support real multiple display.
Originally it gets display from DisplayManager which restricts
to use default display only.
Bug: b/
115277654
Test: atest FrameworksServicesTests:ActivityStarterTests# \
testDeliverIntentToTopActivityOfNonTopDisplay
Test: atest FrameworksServicesTests:ActivityStarterTests# \
testReparentTopFocusedActivityToSecondaryDisplay
Change-Id: Id24c235a8a4ffab2917d46fc287413f9bf28c58d
David Brazdil [Tue, 18 Sep 2018 04:02:34 +0000 (04:02 +0000)]
Merge changes I66bbe8b5,Ie54677db
* changes:
Add api to hidden API light grey
Add new entries to hidden API light grey
Chienyuan [Mon, 17 Sep 2018 02:54:37 +0000 (10:54 +0800)]
Simplify logic for connect in MapClientProfile
* connect: remove connected device check logic. MapClientService
will check it.
* remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for MapClientProfile.
Bug:
111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=MapClientProfileTest
Change-Id: Ic3620c8910e5acbb14e33369ff437d434b514ddf
(cherry picked from commit
a199c59436581b73eaf5dfc4f58f292f7f1fca25)
Sundong Ahn [Tue, 18 Sep 2018 03:30:00 +0000 (20:30 -0700)]
Merge "Change the dist path of api files" am:
324083b211 am:
73b05731b4
am:
4fb7f82462
Change-Id: I98495fa8d92bb72cc9f42e9874e4bcfc92d821f5
Josh Gao [Tue, 18 Sep 2018 03:20:23 +0000 (20:20 -0700)]
Merge "Fix typo in IntentFilter documentation." am:
ada39fe63d am:
5c775ffdc8
am:
39510ef3d2
Change-Id: I32f695532dbf0549f418e61345818635e9508e5a
Sundong Ahn [Tue, 18 Sep 2018 03:17:06 +0000 (20:17 -0700)]
Merge "Change the dist path of api files" am:
324083b211
am:
73b05731b4
Change-Id: Ie1af9f84d0798229a0894bbbdf3200616426f585
Josh Gao [Tue, 18 Sep 2018 03:11:58 +0000 (20:11 -0700)]
Merge "Fix typo in IntentFilter documentation." am:
ada39fe63d
am:
5c775ffdc8
Change-Id: Iae760087190441702f01e91115da0c9e52061ff7
Sundong Ahn [Tue, 18 Sep 2018 03:03:21 +0000 (20:03 -0700)]
Merge "Change the dist path of api files"
am:
324083b211
Change-Id: I0ae66600bf769ef0891d301ef8bba3d1fcfbbaf3
Josh Gao [Tue, 18 Sep 2018 02:59:26 +0000 (19:59 -0700)]
Merge "Fix typo in IntentFilter documentation."
am:
ada39fe63d
Change-Id: I9da782211b8a6766ceb6b17fdec3b31e2e884676
TreeHugger Robot [Tue, 18 Sep 2018 02:38:01 +0000 (02:38 +0000)]
Merge "Defer theme flags when view isn't attached"
TreeHugger Robot [Tue, 18 Sep 2018 02:34:34 +0000 (02:34 +0000)]
Merge "Simplify logic for getConnectionStatus in HidDeviceProfile"
Treehugger Robot [Tue, 18 Sep 2018 02:29:44 +0000 (02:29 +0000)]
Merge "Change the dist path of api files"
TreeHugger Robot [Tue, 18 Sep 2018 01:56:11 +0000 (01:56 +0000)]
Merge "MediaPlayer2: remove unused code"
Treehugger Robot [Tue, 18 Sep 2018 01:44:46 +0000 (01:44 +0000)]
Merge "Fix typo in IntentFilter documentation."
Steven Moreland [Tue, 18 Sep 2018 01:39:12 +0000 (18:39 -0700)]
Merge "Revert "preloaded-classes: remove core HIDL libs"" am:
6e9ce1a296 am:
1266b4f491
am:
8e638ef6b8
Change-Id: I7e9c0510188fa9061f5a03737b6c881c266df15a
Steven Moreland [Tue, 18 Sep 2018 01:29:55 +0000 (18:29 -0700)]
Merge "Revert "preloaded-classes: remove core HIDL libs"" am:
6e9ce1a296
am:
1266b4f491
Change-Id: I3a87c6f43a86d17d0f1b071c2c831c4e03ce2e31
TreeHugger Robot [Tue, 18 Sep 2018 01:19:27 +0000 (01:19 +0000)]
Merge "Fixed when the CompatibilityBridge is attached to an activity."
Steven Moreland [Tue, 18 Sep 2018 01:08:28 +0000 (18:08 -0700)]
Merge "Revert "preloaded-classes: remove core HIDL libs""
am:
6e9ce1a296
Change-Id: Idefc70afe9bc4bc6e6d667ec0a30c1b01a9580e2
kopriva [Tue, 18 Sep 2018 00:49:40 +0000 (17:49 -0700)]
Merge "docs: bug
36997358, typo 'than an'" into pi-dev am:
9a32a1dc3e
am:
33d19aac6a
Change-Id: Icd4cd97619e32e69bbd9f03f89c5f18adfde0d4c
Tyler Gunn [Tue, 18 Sep 2018 00:35:11 +0000 (17:35 -0700)]
Merge "Enable enhanced call blocking by default." am:
b6d55c2646 am:
cecab68b67
am:
f79aa13972
Change-Id: I0fff6c36da604146256dda38cf9d80e65f497427
kopriva [Tue, 18 Sep 2018 00:31:12 +0000 (17:31 -0700)]
Merge "docs: bug
36997358, typo 'than an'" into pi-dev
am:
9a32a1dc3e
Change-Id: I9d989ec02bd2d09f1a6de9ee15567a960caf9de2
TreeHugger Robot [Tue, 18 Sep 2018 00:17:57 +0000 (00:17 +0000)]
Merge "Don't allow splitting on an empty configuration"
Tyler Gunn [Tue, 18 Sep 2018 00:13:07 +0000 (17:13 -0700)]
Merge "Enable enhanced call blocking by default." am:
b6d55c2646
am:
cecab68b67
Change-Id: I3b8e2b79ea95d0014fe1286bb4f8db4cb019920c
TreeHugger Robot [Tue, 18 Sep 2018 00:09:26 +0000 (00:09 +0000)]
Merge "Stop rotation sensor for locked rotation in low RAM"
TreeHugger Robot [Tue, 18 Sep 2018 00:04:39 +0000 (00:04 +0000)]
Merge "docs: bug
36997358, typo 'than an'" into pi-dev
Tyler Gunn [Mon, 17 Sep 2018 23:56:15 +0000 (16:56 -0700)]
Merge "Enable enhanced call blocking by default."
am:
b6d55c2646
Change-Id: Ifec4eb98397237b80997fa46ef8447025ea57154
Doris Ling [Mon, 17 Sep 2018 23:55:03 +0000 (23:55 +0000)]
Merge "Add new loader for network stats detail."
Steven Moreland [Mon, 17 Sep 2018 23:40:39 +0000 (23:40 +0000)]
Merge "Revert "preloaded-classes: remove core HIDL libs""
Dongwon Kang [Mon, 17 Sep 2018 23:10:44 +0000 (16:10 -0700)]
MediaPlayer2: remove unused code
Test: build
Bug:
112767549
Change-Id: I21d3f45c16fc884b05b848a18966f3ff59f84d86
Lucas Dupin [Mon, 17 Sep 2018 22:56:09 +0000 (15:56 -0700)]
Defer theme flags when view isn't attached
Change-Id: Ie042da18b8c84d9067bb4d951f9dd35fe4ea9d19
Fixes:
113530582
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowControllerTest.java
Yiwei Zhang [Mon, 17 Sep 2018 23:04:43 +0000 (23:04 +0000)]
Merge "Revert "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support""
Treehugger Robot [Mon, 17 Sep 2018 22:47:23 +0000 (22:47 +0000)]
Merge "Enable enhanced call blocking by default."
Jack Yu [Mon, 17 Sep 2018 22:46:21 +0000 (22:46 +0000)]
Merge "Use locale language instead of harcoded langauge"
Felipe Leme [Mon, 17 Sep 2018 22:20:44 +0000 (15:20 -0700)]
Clarified that some autofill interfaces can only be implemented by the system. am:
df0cefab6b
am:
d19a7a86a2
Change-Id: I9f8c50038ca8faffc4c02eede975f71ebc271373
Android Build Merger (Role) [Mon, 17 Sep 2018 22:17:16 +0000 (22:17 +0000)]
Merge "Merge "Frameworks: Replace deprecated MetricsLogger usage" am:
dbe20066d3 am:
e7eddfcee7 am:
99afea6828"
Andreas Gampe [Mon, 17 Sep 2018 22:16:51 +0000 (15:16 -0700)]
Merge "Frameworks: Replace deprecated MetricsLogger usage" am:
dbe20066d3 am:
e7eddfcee7
am:
99afea6828
Change-Id: Ie0c9ff25ed2b1c51b7ad0c174a44707cf11dd09f
Lei Yu [Mon, 17 Sep 2018 22:16:00 +0000 (22:16 +0000)]
Merge "Revert "remove getName() from CachedBluetoothDeviceManager""
Lei Yu [Mon, 17 Sep 2018 18:22:06 +0000 (18:22 +0000)]
Revert "remove getName() from CachedBluetoothDeviceManager"
This reverts commit
c386c87b0eff4625d27f7eac42d399b684add248.
Reason for revert:
To fix null pointer crash in Pairing dialog. Dialog maybe triggered by intent, in which LocalBluetoothManager couldn't have instance for BluetoothDevice and will return null. As a result, we need to depend on method in CachedBluetoothManager to handle it.
Bug:
115754654
Bug:
112735753
Change-Id: I727089cfd23819f292f96f0d0232f35bc6ebac64
Rajeev Kumar [Mon, 6 Aug 2018 18:45:05 +0000 (11:45 -0700)]
Stop rotation sensor for locked rotation in low RAM
The rotation sensor causes significant power and CPU consumption, and if the rotation is
locked, we don't need its values anyway.
Test: Manual
Bug:
111711710
Change-Id: I0c55dafdc1f703960f3d2423b7975013dded7eb4
vichang [Mon, 17 Sep 2018 22:06:56 +0000 (15:06 -0700)]
Merge "Expose android.icu.text.CaseMap API" am:
abb7b3d0e5 am:
1035fcf138
am:
0c85dfcc3d
Change-Id: I4417630e89181ee844e95cd5596c3418f4de3c85
Doris Ling [Fri, 14 Sep 2018 21:30:36 +0000 (14:30 -0700)]
Add new loader for network stats detail.
- create a new loader that will replace SummaryForAllUidLoaderCompat,
which uses the NetworkStatsManager.queryDetails() to retrieve the
network stats data, instead of using the NetworkStatsSession.
Bug:
111751694
Test: make RunSettingsRoboTests
Change-Id: If5f644e65335133b12da2c786f81d9ce60214c41
Bookatz [Mon, 17 Sep 2018 21:59:41 +0000 (14:59 -0700)]
Merge "Unifying source of statsd BleScan calls and cleaning it up." am:
056a095dd3 am:
7ed0147613
am:
18852e3636
Change-Id: Ifcc5f22a921f6f4d50eb47a329aa2e3db61410ef
Youming Ye [Mon, 17 Sep 2018 21:53:41 +0000 (14:53 -0700)]
Merge "Increase customization options for wfcSpnFormats" am:
34721e16a0 am:
5e88fe2fbc
am:
3b03a305b0
Change-Id: Ifbe7c4e9482b193dad8467ff62e2c900f6c1138c
Yuanjia Hsu [Mon, 17 Sep 2018 21:35:22 +0000 (21:35 +0000)]
Merge "resolve merge conflicts of
2cb9a70cac0d22ef67de72c678c8baa4d12014f4 to master"
TreeHugger Robot [Mon, 17 Sep 2018 21:27:38 +0000 (21:27 +0000)]
Merge "Fix rare SystemUI QS crash."
Wonsik Kim [Mon, 17 Sep 2018 21:27:14 +0000 (21:27 +0000)]
Merge "media: fix race condition around release"
Todd Kennedy [Tue, 28 Aug 2018 23:31:15 +0000 (16:31 -0700)]
Don't allow splitting on an empty configuration
When aapt breaks out splits, it may remove the SDK constraint [if
it's lower than the min sdk]. If that is the only constraint, we
would create a resource split with no constraints. Don't allow
that situation. There must always be _some_ constraint.
Bug:
113115970
Test: atest CtsAppSecurityHostTestCases:SplitTests
Test: aapt2_tests
Change-Id: I424c875677c3be2a3ff5ddd39100b998bd650a4b
Joshua Lambert [Mon, 17 Sep 2018 20:41:56 +0000 (20:41 +0000)]
Merge "Allow ATV Keychord to turn on/off talkback"
Marcin Oczeretko [Mon, 17 Sep 2018 20:40:17 +0000 (20:40 +0000)]
Merge "Prepare LooperStats to be collected as a Westworld gauge matric"
Chavi Weingarten [Mon, 17 Sep 2018 20:30:19 +0000 (20:30 +0000)]
Merge "Check return value in screencap in case of failure."
Felipe Leme [Mon, 17 Sep 2018 20:27:42 +0000 (13:27 -0700)]
Clarified that some autofill interfaces can only be implemented by the system.
am:
df0cefab6b
Change-Id: I221bd4abb43e4865630794b103d0aeef29c6ea7f
TreeHugger Robot [Mon, 17 Sep 2018 20:14:24 +0000 (20:14 +0000)]
Merge "Revert "Do not allow apps to set night mode""
Andreas Gampe [Mon, 17 Sep 2018 19:40:25 +0000 (12:40 -0700)]
Merge "Frameworks: Replace deprecated MetricsLogger usage" am:
dbe20066d3
am:
e7eddfcee7
Change-Id: Ia58ab564f9eebf8ef2625bdfcee81553e1c0ad1c
TreeHugger Robot [Mon, 17 Sep 2018 19:35:34 +0000 (19:35 +0000)]
Merge "Statsd atoms: BatteryVoltage"
Andreas Gampe [Mon, 17 Sep 2018 19:29:08 +0000 (12:29 -0700)]
Merge "Frameworks: Replace deprecated MetricsLogger usage"
am:
dbe20066d3
Change-Id: I48ed9bcc0e4851314a2ba437e645b8fd60e5ddbf
Zimuzo Ezeozue [Mon, 17 Sep 2018 19:27:18 +0000 (19:27 +0000)]
Merge "Add privileged APIs to lock device and reset device password"
Treehugger Robot [Mon, 17 Sep 2018 19:09:17 +0000 (19:09 +0000)]
Merge "Frameworks: Replace deprecated MetricsLogger usage"
Amin Shaikh [Mon, 17 Sep 2018 19:06:18 +0000 (15:06 -0400)]
Fix rare SystemUI QS crash.
Change-Id: I7581bbedbfecebf35f2f9986cae8c16000c9801a
Fixes:
112645457
Test: manual
vichang [Mon, 17 Sep 2018 18:59:52 +0000 (11:59 -0700)]
Merge "Expose android.icu.text.CaseMap API" am:
abb7b3d0e5
am:
1035fcf138
Change-Id: I455bfa421ffe194046b90cf77a5b168ca75b54fb
Seigo Nonaka [Mon, 17 Sep 2018 18:55:54 +0000 (18:55 +0000)]
Merge "Unhide Paint.getTextRunAdvances"
David Notario [Mon, 17 Sep 2018 18:55:36 +0000 (18:55 +0000)]
Revert "Do not allow apps to set night mode"
This reverts commit
9f4132fa4d5be2436766a802e22991510fe0dd8f.
Reason for revert: This change will break Android Auto and other users of night mode. There is an ongoing discussion to figure out path forward (See http://go/dt-aa-nm)
Change-Id: I37c97e62a3414be7a51a47614f312b97d647dea8
vichang [Mon, 17 Sep 2018 18:45:48 +0000 (11:45 -0700)]
Merge "Expose android.icu.text.CaseMap API"
am:
abb7b3d0e5
Change-Id: I44540adffccfdcba91d1499b759b39538f5ee2b3
Bookatz [Mon, 17 Sep 2018 18:45:14 +0000 (11:45 -0700)]
Merge "Unifying source of statsd BleScan calls and cleaning it up." am:
056a095dd3
am:
7ed0147613
Change-Id: Ied0f4683311276d2c643e882f57f8a21943aebe3
kopriva [Mon, 17 Sep 2018 18:35:13 +0000 (11:35 -0700)]
docs: bug
36997358, typo 'than an'
Test: make ds-docs
Bug:
36997358
Change-Id: I11a5fcbd76638c7d6b060c0852268efa9e37a7fe
Exempt-From-Owner-Approval: Docs-only change
TreeHugger Robot [Mon, 17 Sep 2018 18:33:39 +0000 (18:33 +0000)]
Merge "Notifs sent from suspended apps should reappear"
Bookatz [Mon, 17 Sep 2018 18:28:30 +0000 (11:28 -0700)]
Merge "Unifying source of statsd BleScan calls and cleaning it up."
am:
056a095dd3
Change-Id: I5ddc0d20c96439328c37d0a49f7fa6c4c90d6e14
Youming Ye [Mon, 17 Sep 2018 18:28:21 +0000 (11:28 -0700)]
Merge "Increase customization options for wfcSpnFormats" am:
34721e16a0
am:
5e88fe2fbc
Change-Id: I78785e6eb0aebc8ee5fc94fa17a626835cfd56d8
Youming Ye [Mon, 17 Sep 2018 18:16:29 +0000 (11:16 -0700)]
Merge "Increase customization options for wfcSpnFormats"
am:
34721e16a0
Change-Id: I5220f302d60874b160177874fc863b79bb46e978
Steven Moreland [Mon, 17 Sep 2018 18:11:02 +0000 (18:11 +0000)]
Revert "preloaded-classes: remove core HIDL libs"
This reverts commit
766b425c27f128d507cc5101c01d7c4bf107dbca.
Appears to be the cause of a 14ms regression in wifi startup time in system server that could be offset here (and potentially other places) by keeping the preload in zygote. A local trial of five showed this revert to take it 111.2ms -> 108ms. The variance is likely too high for this to be significant, however, logically, in the short term, these libraries are being used, and so preloading makes sense. I'll leave further changes to this list to the owners of this list.
Test: boot walleye 5 times w/ and w/o this test, and find small gain in reverting this.
Reason for revert: b/
115771598
Change-Id: Ia53dbe8b70900d6f04011b15cbdddf786378fc3b
vichang [Mon, 17 Sep 2018 18:10:31 +0000 (18:10 +0000)]
Merge "Expose android.icu.text.CaseMap API"
Jack Yu [Mon, 17 Sep 2018 17:46:40 +0000 (10:46 -0700)]
Use locale language instead of harcoded langauge
Used the locale language instead of the hardcoded language since
ISO 639 is not a stable standard. Some language codes changed before.
This is part of the cell broadcast language filtering feature
added per U.S. FCC requirement.
Test: Manual
Bug:
110754638,
71497689,
110896497
Change-Id: I3cf42eb037cdbb40597c1053fedb36b478277fc9
Joshua Lambert [Fri, 3 Aug 2018 18:28:05 +0000 (11:28 -0700)]
Allow ATV Keychord to turn on/off talkback
Bug:
74307653
Test: manual - tested on elfin
1) Pair emote app to Android TV
2) use keychord (Dpad_down + back) to trigger on/off talkback
(currently, emote app is the only remote that can pair with ATV and
send/trigger 2 keyevents simultaneously to actually trigger the keychord)
---
Talkback was consuming keyevents between interceptKeyEventBeforeQueueing
and interceptKeyEventBeforeDispatching, so if we move the logic that
schedules the toggling of the accessibility feature to the
"...BeforeQueueing" method we can turn off talkback appropriately.
The original CL was located here: ag/
4466951. This CL will be CPed back
to pi-tv-dev.
Change-Id: I2c4e532c09d57a1a3cf093cfb7e3d5557f6b9929
Treehugger Robot [Mon, 17 Sep 2018 17:46:01 +0000 (17:46 +0000)]
Merge "Unifying source of statsd BleScan calls and cleaning it up."
Felipe Leme [Mon, 17 Sep 2018 16:46:13 +0000 (09:46 -0700)]
Fixed when the CompatibilityBridge is attached to an activity.
The AccessibilityManager is a singleton, so we need to update it everytime
an activity is resumed.
Test: manual verification with Chrome (CTS test is an overkill here)
Test: atest CtsAutoFillServiceTestCases # to make sure it didn't break anything
Fixes:
112690889
Change-Id: If011db203dee96ec511da80f4e49395c0340f482
Bookatz [Thu, 13 Sep 2018 19:56:32 +0000 (12:56 -0700)]
Statsd atoms: BatteryVoltage
Add battery voltage to statsd as a pulled atom.
Bug:
114451845
Test: run cts-dev -m CtsStatsdHostTestCases -t android.cts.statsd.atom.HostAtomTests#testBatteryVoltage
Change-Id: If40ed41663b57ad6144c69c52c4c63562f93c774
Youming Ye [Mon, 17 Sep 2018 16:55:14 +0000 (16:55 +0000)]
Merge "Increase customization options for wfcSpnFormats"
Marcin Oczeretko [Mon, 10 Sep 2018 17:06:52 +0000 (18:06 +0100)]
Prepare LooperStats to be collected as a Westworld gauge matric
- call LooperStats.reset() from StatsCompanionService
- add screen_interactive to the LooperStats atom
- temporarily set uid = 1000 to avoid statsd warnings that the uid is invalid
Bug:
113651685
Test: Manual and UTs
Change-Id: Iacf45fcb746c6bb9837456a2a0c74f5a073ff822
Beverly [Fri, 14 Sep 2018 13:49:07 +0000 (09:49 -0400)]
Notifs sent from suspended apps should reappear
Notifications sent from suspended apps were being preemptively
blocked by isBlocked in NotificationMangerService. Instead, isBlocked
should only block notifications the user has specified to block. This
should not include suspended packages. (Notifications sent from
suspended apps are marked as hidden/suspended in the RankingMap in
PostNotificationRunnable so they can be resurfaced when the sending
app is unsuspended.)
Change-Id: I377eec04c9636e800bcd2709984c19610f2c524e
Bug:
113100262
Test: atest cts/tests/app/src/android/app/cts/NotificationManagerTest.java
Test: runtest -x cts/tests/tests/notificationlegacy/src/android/app/notification/legacy/cts/LegacyNotificationManagerTest.java
Test: runtest -x frameworks/base/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
yuanjiahsu [Mon, 17 Sep 2018 15:46:14 +0000 (23:46 +0800)]
resolve merge conflicts of
2cb9a70cac0d22ef67de72c678c8baa4d12014f4 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic1db72d57f3003bcec0fd8f7fbb2dc4ec7b5dcf3
TreeHugger Robot [Mon, 17 Sep 2018 15:14:10 +0000 (15:14 +0000)]
Merge "Break install up into phases"
Adam Vartanian [Mon, 17 Sep 2018 14:45:30 +0000 (07:45 -0700)]
Merge "Merge "Update greylist for Conscrypt update" am:
27eec4b376 am:
b4c55fac9a" into pi-dev-plus-aosp
am:
d6157530e0
Change-Id: Ic140d582af2f5c2baa3bff6ceb0654baccd8e27a
Adam Vartanian [Mon, 17 Sep 2018 14:27:04 +0000 (07:27 -0700)]
Merge "Update greylist for Conscrypt update" am:
27eec4b376 am:
b4c55fac9a
am:
223c3ef691
Change-Id: Icb3187632d62bf313840c6f497115a6210cde7aa
Yuanjia Hsu [Mon, 17 Sep 2018 14:25:33 +0000 (07:25 -0700)]
Merge "Add feature flag in Settings." am:
55b91f6d93
am:
b04fcd5842
Change-Id: I22e073bcbe7c2bacfdce44dd4c05b47fab3059f1
Android Build Merger (Role) [Mon, 17 Sep 2018 14:14:11 +0000 (14:14 +0000)]
Merge "Merge "Update greylist for Conscrypt update" am:
27eec4b376 am:
b4c55fac9a" into pi-dev-plus-aosp
Adam Vartanian [Mon, 17 Sep 2018 14:13:42 +0000 (07:13 -0700)]
Merge "Update greylist for Conscrypt update" am:
27eec4b376
am:
b4c55fac9a
Change-Id: I06386d4ee798b7aac96f9ff3bbe61e98482baaae
Yuanjia Hsu [Mon, 17 Sep 2018 14:09:28 +0000 (07:09 -0700)]
Merge "Add feature flag in Settings."
am:
55b91f6d93
Change-Id: I27aa24563358fe4467de3aa3660825f1d8bd73d5
Adam Vartanian [Mon, 17 Sep 2018 14:07:28 +0000 (07:07 -0700)]
Merge "Update greylist for Conscrypt update" am:
27eec4b376
am:
b4c55fac9a
Change-Id: Ic860a27f1b15fb99e11ce4b1ddf683b6103adb74
Adam Vartanian [Mon, 17 Sep 2018 13:52:12 +0000 (06:52 -0700)]
Merge "Update greylist for Conscrypt update"
am:
27eec4b376
Change-Id: I8afb263cddedb4ab6157103d502fa89c0cbdd8c0
Yuanjia Hsu [Mon, 17 Sep 2018 13:43:08 +0000 (13:43 +0000)]
Merge "Add feature flag in Settings."
Adam Vartanian [Mon, 17 Sep 2018 12:36:50 +0000 (12:36 +0000)]
Merge "Update greylist for Conscrypt update"
Rhed Jao [Mon, 17 Sep 2018 08:37:11 +0000 (08:37 +0000)]
Merge "Spoken feedback when a11y shortcut dialog is shown"
TreeHugger Robot [Mon, 17 Sep 2018 08:18:44 +0000 (08:18 +0000)]
Merge "Label the libwebview address space reservation."
TreeHugger Robot [Mon, 17 Sep 2018 08:18:11 +0000 (08:18 +0000)]
Merge "Fix checkstyle errors in SystemMemoryTest"
Shaotang Li [Mon, 17 Sep 2018 05:49:12 +0000 (22:49 -0700)]
[automerger skipped] Merge "Add extra data when starting emergency dialer intent" am:
0b925f85c0 am:
e6ce88ca3c
am:
2f5d2a50a8 -s ours
Change-Id: I6b148842022967b63cec431dc6c60407ee7bceb8