OSDN Git Service
Doris Ling [Fri, 11 May 2018 20:56:16 +0000 (13:56 -0700)]
Merge "Rename settings category." into pi-dev
am:
24044a78bd
Change-Id: I257ed814d67116c6a476a207ad7dbd8089533bda
TreeHugger Robot [Fri, 11 May 2018 20:49:35 +0000 (20:49 +0000)]
Merge "Rename settings category." into pi-dev
Makoto Onuki [Fri, 11 May 2018 20:26:58 +0000 (13:26 -0700)]
Merge "Fix issue #
79541100: [Blueline][PI][SPT]: Watchdog killing process and SIGSEGV" into pi-dev
am:
2b17e01643
Change-Id: I0aa525f6a5c8b317dc2ce20ba8dbf7f087dbee8b
Ryan Lin [Fri, 11 May 2018 20:20:33 +0000 (13:20 -0700)]
Merge "Add Bluetooth callback for device connection state changed" into pi-dev
am:
15aa546a37
Change-Id: I110340139c1455dfe43ce4e5688ef40ee6118698
Makoto Onuki [Fri, 11 May 2018 20:08:16 +0000 (20:08 +0000)]
Merge "Fix issue #
79541100: [Blueline][PI][SPT]: Watchdog killing process and SIGSEGV" into pi-dev
Jason Monk [Fri, 11 May 2018 19:56:43 +0000 (12:56 -0700)]
Merge "Fix first-time slice permission grants" into pi-dev
am:
9959b36635
Change-Id: Iaaccd67b47470ba19b13631e39dc2d6c3b335cb8
Ryan Lin [Fri, 11 May 2018 19:53:19 +0000 (19:53 +0000)]
Merge "Add Bluetooth callback for device connection state changed" into pi-dev
Robert Carr [Fri, 11 May 2018 19:51:24 +0000 (12:51 -0700)]
Merge "Detach children in transaction." into pi-dev
am:
26aff0d907
Change-Id: If080b08b6e0f159423f5328c2b4df1c4008741f0
Jason Monk [Fri, 11 May 2018 19:40:10 +0000 (19:40 +0000)]
Merge "Fix first-time slice permission grants" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 19:37:00 +0000 (19:37 +0000)]
Merge "Detach children in transaction." into pi-dev
Beverly [Fri, 11 May 2018 19:30:25 +0000 (12:30 -0700)]
Merge "Add charging metrics" into pi-dev
am:
cf4f650572
Change-Id: I0042f5cf7a9ab2698a0436ffe00d94b4d6e0c71e
Amith Yamasani [Fri, 11 May 2018 19:19:32 +0000 (12:19 -0700)]
Merge "Add limits to App Usage Observer Api" into pi-dev
am:
98fd4fa0f4
Change-Id: I79e58fa83b389bffeb5b286cbddbbfe15de17caf
TreeHugger Robot [Fri, 11 May 2018 19:14:31 +0000 (19:14 +0000)]
Merge "Add charging metrics" into pi-dev
Amith Yamasani [Fri, 11 May 2018 19:03:11 +0000 (19:03 +0000)]
Merge "Add limits to App Usage Observer Api" into pi-dev
fionaxu [Fri, 11 May 2018 19:01:25 +0000 (12:01 -0700)]
[automerger skipped] Merge "add install action for carrier id to system API" am:
87a7c657bd
am:
2bbb36cb4f -s ours
Change-Id: I80aa691e0d45a27e1342ab8f41e4fc6de0471be6
Abodunrinwa Toki [Fri, 11 May 2018 18:54:47 +0000 (11:54 -0700)]
Merge "Fix TextClassifier logging." into pi-dev
am:
1c60953f9d
Change-Id: I51ade4a3ac7a75bef258faf487a279310fe1e2fb
fionaxu [Fri, 11 May 2018 18:52:27 +0000 (11:52 -0700)]
Merge "add install action for carrier id to system API"
am:
87a7c657bd
Change-Id: I5a3534bc791b44be092bfae2c07b2415886e4ed8
Chad Brubaker [Fri, 11 May 2018 18:35:58 +0000 (11:35 -0700)]
Merge "Fall back to checking packages if one is not provided" into pi-dev
am:
9d976db861
Change-Id: I65a63b959368549f58be7318a26e8dfa310120ff
TreeHugger Robot [Fri, 11 May 2018 18:29:31 +0000 (18:29 +0000)]
Merge "Fix TextClassifier logging." into pi-dev
Michael Dooley [Fri, 11 May 2018 18:29:19 +0000 (11:29 -0700)]
Merge "Don't crash if SoundTriggerDetectionService client is gone or if there is a remote exception while finishing an opperation" into pi-dev
am:
74b6863504
Change-Id: I5b95c04240b85b2358c8e120a563a4d6a3bb9ce6
Todd Kennedy [Fri, 11 May 2018 18:15:10 +0000 (11:15 -0700)]
Merge changes from topic "b_78809704" into pi-dev
am:
92b64bb1bb
Change-Id: I08a9b59d00c9e7aa075c21c44b582d571fe79fd7
Chad Brubaker [Fri, 11 May 2018 18:13:35 +0000 (18:13 +0000)]
Merge "Fall back to checking packages if one is not provided" into pi-dev
Mrten Kongstad [Fri, 11 May 2018 18:09:25 +0000 (11:09 -0700)]
OMS: rebase settings when overlays update
am:
2f1944bf0e
Change-Id: I1691fa4251182adf9484cafb12484aa8003cbf3c
Bryce Lee [Fri, 11 May 2018 18:03:50 +0000 (11:03 -0700)]
Merge "Don't allow non-showOnLock activity to be next on finish." into pi-dev
am:
92a339736f
Change-Id: If57b94767fc0bc90cae715967c42fb7d1a8cbba3
Dieter Hsu [Fri, 11 May 2018 17:57:49 +0000 (10:57 -0700)]
Merge "Fix active permission touch target too small" into pi-dev
am:
bb668a2bb7
Change-Id: I92aa46fd58e565a40ae7ccb52b76e9567cced2a9
Doris Ling [Fri, 11 May 2018 17:53:57 +0000 (10:53 -0700)]
Rename settings category.
- from night light to night display.
Change-Id: Ib09e1b9299478dc4e8dcee935e29c6886d9dc7b8
Fixes:
79530682
Test: make RunSettingsLibRoboTests
Michael Dooley [Fri, 11 May 2018 17:46:41 +0000 (17:46 +0000)]
Merge "Don't crash if SoundTriggerDetectionService client is gone or if there is a remote exception while finishing an opperation" into pi-dev
Lucas Dupin [Fri, 11 May 2018 17:46:21 +0000 (10:46 -0700)]
Merge "Do not hide keyguard message when fp" into pi-dev
am:
2d2d79b92c
Change-Id: I87caaa3377f1146a7bf4b0737463152ab3db2f20
Todd Kennedy [Fri, 11 May 2018 17:44:53 +0000 (17:44 +0000)]
Merge changes from topic "b_78809704" into pi-dev
* changes:
OMS: teach the OMS about static RROs
OMS: rebase settings when overlays update
TreeHugger Robot [Fri, 11 May 2018 17:39:36 +0000 (17:39 +0000)]
Merge "Don't allow non-showOnLock activity to be next on finish." into pi-dev
Jason Monk [Fri, 11 May 2018 17:37:59 +0000 (10:37 -0700)]
Merge "Allow onGetSliceDescendants to be slow" into pi-dev
am:
02b9592ff1
Change-Id: I91899f01fd769c313e62000eee277ab3242099f0
Dieter Hsu [Fri, 11 May 2018 17:37:35 +0000 (17:37 +0000)]
Merge "Fix active permission touch target too small" into pi-dev
Treehugger Robot [Fri, 11 May 2018 17:36:24 +0000 (17:36 +0000)]
Merge "add install action for carrier id to system API"
Patrick Baumann [Fri, 11 May 2018 17:33:20 +0000 (10:33 -0700)]
Merge "Support generic filters when EXTERNAL flag is set" into pi-dev
am:
78f939b40f
Change-Id: I8cd917b0a43ec06032c0496e714e1b213e563167
TreeHugger Robot [Fri, 11 May 2018 17:31:24 +0000 (17:31 +0000)]
Merge "Do not hide keyguard message when fp" into pi-dev
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
TreeHugger Robot [Fri, 11 May 2018 17:21:28 +0000 (17:21 +0000)]
Merge "Allow onGetSliceDescendants to be slow" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 17:16:37 +0000 (17:16 +0000)]
Merge "Support generic filters when EXTERNAL flag is set" into pi-dev
Chad Brubaker [Wed, 9 May 2018 21:05:57 +0000 (14:05 -0700)]
Fall back to checking packages if one is not provided
Test: atest GsmCdmaPhoneTest.java
Change-Id: I81df49fd2f751ce28d834fc5d9cd254623930770
Fixes:
75450505
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
Beverly [Thu, 10 May 2018 19:46:03 +0000 (15:46 -0400)]
Add charging metrics
Change-Id: Icef477c99cb9e53faff852cf6003f912ab8b10c3
Fixes:
78463707
Test: manual
Dianne Hackborn [Fri, 11 May 2018 16:46:13 +0000 (09:46 -0700)]
Fix issue #
79541100: [Blueline][PI][SPT]: Watchdog killing process and SIGSEGV
Bug:
79541100
Test: manual
Change-Id: I1456d27938d99d8ee56e5cde843f505a46c9fc72
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
Jason Monk [Fri, 11 May 2018 16:26:51 +0000 (09:26 -0700)]
Fix first-time slice permission grants
Test: Added a test
Change-Id: Ib4c0b65c6fec6fcb97bccb2f3d35f5c35ede3786
Fixes:
79567935
Lucas Dupin [Thu, 10 May 2018 22:31:20 +0000 (15:31 -0700)]
Do not hide keyguard message when fp
Test: atest packages/SystemUI/tests/src/com/android/keyguard/KeyguardPinBasedInputViewTest.java
Change-Id: I5d76b688b0eb7c1df6a36c1cb910f2b0ec98bc46
Fixes:
78235570
Patrick Baumann [Thu, 3 May 2018 20:16:01 +0000 (13:16 -0700)]
Support generic filters when EXTERNAL flag is set
This change opts instant app resolution out of hash prefix matching if
the intent filter being tested does not define an authority only when
the MATCH_EXTERNAL flag is set. This allows for a class of instant apps
that generically handle certain mime types or actions, but aren't tied
to a particular authority / domain.
This also moves the null check for resolution to a higher level,
accounting for connection-related failures to ensure that the installer
always gets a properly formatted intent.
Bug:
63117034
Test: manual - force connection timeouts and observe correct install intent
Test: manual - launch a generic type handler for a made up mime type;
observe correct resolution
Test: atest EphemeralTest
Change-Id: I0101e3219f543897a488ddd3d7c4c884f7d6cac3
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"
fionaxu [Tue, 8 May 2018 18:57:53 +0000 (11:57 -0700)]
add install action for carrier id to system API
Bug:
79426800
Test: Manual
Change-Id: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
(cherry picked from commit
2776ed56b846ff34e45467f7618a679049d16f3f)
Merged-in: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
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: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
Jason Monk [Fri, 11 May 2018 15:23:59 +0000 (08:23 -0700)]
Allow onGetSliceDescendants to be slow
Because sometimes it needs to be
Test: existing tests
Bug:
79132845
Bug:
77873463
Change-Id: I93aa8553c48c856bf96c347a229be6e770751708
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: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
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
ryanywlin [Wed, 2 May 2018 07:15:37 +0000 (15:15 +0800)]
Add Bluetooth callback for device connection state changed
With the new Multi-A2DP/HFP support, need to add profile connection state
changed callback for every BT device connect/disconnect to profile.
Bug:
76447449
Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=LocalBluetoothProfileManagerTest -j28
Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=BluetoothEventManagerTest -j28
Change-Id: Iaaec369e8d10f9b1270491632fb5c91de1e28571
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: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: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."
Dieter Hsu [Thu, 10 May 2018 12:07:52 +0000 (20:07 +0800)]
Fix active permission touch target too small
- Set buttons non-clickable to not consume events
- Add a11y contentDescription for active permissions buttons
Bug:
78198386
Test: manually receive messenger video call and verify touch targets
Test: manually record screen and verify with talkback/keyboard
Change-Id: I1b53cd1d7a88e44bd6e188b1055c8572c9d5731d
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
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
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: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
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: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: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:02:35 +0000 (18:02 -0700)]
Merge "Add new category keys." into pi-dev
am:
158d5b7b01
Change-Id: Ia50d80bea7235ae5e17dd0f23f49d0b0c48e1d81
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