OSDN Git Service
Nathan Harold [Thu, 22 Mar 2018 21:35:36 +0000 (21:35 +0000)]
Merge "Add AppOp for IpSec Tunnels" into pi-dev
am:
8a047a0c52
Change-Id: I159d49219d2f75e1f5aeece4196638a8823fc029
Ying Xu [Thu, 22 Mar 2018 21:26:19 +0000 (21:26 +0000)]
[automerger skipped]Merge "Add more comments for the isConfigForIdentifiedCarrier()" into pi-dev
am:
812319dc7d -s ours
Change-Id: If5e490d53cb3b3957756b716f5ebbd7f12d45cce
Nathan Harold [Thu, 22 Mar 2018 21:14:36 +0000 (21:14 +0000)]
Merge "Add AppOp for IpSec Tunnels" into pi-dev
Ying Xu [Thu, 22 Mar 2018 21:14:32 +0000 (21:14 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()" into pi-dev
Dmitry Dementyev [Thu, 22 Mar 2018 21:04:07 +0000 (21:04 +0000)]
Merge "Update RECOVER_KEYSTORE permission documentation." into pi-dev
am:
6f2965af79
Change-Id: I6a12ff573c6a4b13407692bc230871b94f03a683
Yao Chen [Thu, 22 Mar 2018 20:48:20 +0000 (20:48 +0000)]
Merge "Remove unsigned-integer-overflow signed-integer-overflow from sanitizer." into pi-dev
am:
c219348186
Change-Id: I2de4afb40faac68dcb508a4861a628575e6e91fb
Ying Xu [Thu, 22 Mar 2018 20:40:10 +0000 (20:40 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()" am:
ec76adb9ff
am:
3b84db2329
Change-Id: I2a9bd2d3b691418debf601b869049e7df090c3a8
Dmitry Dementyev [Thu, 22 Mar 2018 20:33:34 +0000 (20:33 +0000)]
Merge "Update RECOVER_KEYSTORE permission documentation." into pi-dev
Tyler Gunn [Thu, 22 Mar 2018 20:33:10 +0000 (20:33 +0000)]
Merge "Rename handover failure constant per API review comments." into pi-dev
am:
3a4d495733
Change-Id: Id22d791f96936fe2cdf0d5b9b4a47ce3583eef6a
Ying Xu [Thu, 22 Mar 2018 20:32:35 +0000 (20:32 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()"
am:
ec76adb9ff
Change-Id: I437a82ea0d7d71102f273cbca1b54ef7f332027e
Mathieu Chartier [Thu, 22 Mar 2018 20:28:44 +0000 (20:28 +0000)]
Merge "Revert "Enable hidden API blacklist"" into pi-dev
am:
90ad15400a
Change-Id: I1d2b05e6959538b5b60a63f76fcd10b42b8e83a5
Yao Chen [Thu, 22 Mar 2018 20:24:41 +0000 (20:24 +0000)]
Merge "Remove unsigned-integer-overflow signed-integer-overflow from sanitizer." into pi-dev
Tyler Gunn [Thu, 22 Mar 2018 20:22:20 +0000 (20:22 +0000)]
Merge "Rename handover failure constant per API review comments." into pi-dev
Julia Reynolds [Thu, 22 Mar 2018 20:20:01 +0000 (20:20 +0000)]
Merge "Update duration text" into pi-dev
am:
538ba7ac35
Change-Id: I2534474e88a93f611f6223115659b1dc3ff7c515
Mathieu Chartier [Thu, 22 Mar 2018 20:11:07 +0000 (20:11 +0000)]
Merge "Revert "Enable hidden API blacklist"" into pi-dev
David Brazdil [Thu, 22 Mar 2018 18:42:41 +0000 (18:42 +0000)]
Revert "Enable hidden API blacklist"
This reverts commit
16bfa11b73a34be1f1c72d2ffe86702f85378e92.
Reason for revert: Revert until b/
76138670 is fixed
Bug:
64382372
Bug:
76138670
Bug:
76157445
Change-Id: Iaf6c76b773fbea4d4710b38808dee2e7e06f5e78
Julia Reynolds [Thu, 22 Mar 2018 20:04:40 +0000 (20:04 +0000)]
Merge "Update duration text" into pi-dev
Andrew Sapperstein [Thu, 22 Mar 2018 19:48:50 +0000 (19:48 +0000)]
Merge "Revert "Update material_deep_teal_500 to #008577."" into pi-dev
am:
eae9144add
Change-Id: I5952002efb67fe425e67218ab5cade748a251d37
Andrew Sapperstein [Thu, 22 Mar 2018 19:31:23 +0000 (19:31 +0000)]
Merge "Revert "Update material_deep_teal_500 to #008577."" into pi-dev
Pankaj Kanwar [Thu, 22 Mar 2018 19:16:52 +0000 (19:16 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" am:
320b6c2312
am:
063c6dc0f6
Change-Id: Icd154b391b05dfa4ed16a97407a15dd7f03ad106
Nathan Harold [Thu, 22 Mar 2018 19:11:11 +0000 (19:11 +0000)]
[automerger skipped]Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev
am:
33ed612cca -s ours
Change-Id: Ieca39ff6788ca7293ff95516120b947e502f4085
Pankaj Kanwar [Thu, 22 Mar 2018 19:10:11 +0000 (19:10 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false""
am:
320b6c2312
Change-Id: Ie6f23da9c3c531fef9eb32b52d377a8f0e772b77
yinxu [Fri, 16 Mar 2018 17:16:53 +0000 (10:16 -0700)]
Add more comments for the isConfigForIdentifiedCarrier()
This is a clean cherry-pick from:
https://android-review.git.corp.google.com/c/platform/frameworks/base/+/642231
Bug:
74945742
Test: Compile
Change-Id: Ife3fdf797ca8877ec495d61a8aeed56fa20282a7
Merged-in: Ife3fdf797ca8877ec495d61a8aeed56fa20282a7
(cherry picked from commit
cea0d8d4883c94482d936abd4d097617921c6fa7)
Ying Xu [Thu, 22 Mar 2018 19:07:45 +0000 (19:07 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()"
Makoto Onuki [Thu, 22 Mar 2018 18:45:31 +0000 (18:45 +0000)]
Merge "Move provider access stats to frameworks/base" into pi-dev
am:
c7f6eadffc
Change-Id: I22451d7234f52332ddd5e4811f9fe9b957469265
Android Build Merger (Role) [Thu, 22 Mar 2018 18:38:24 +0000 (18:38 +0000)]
Merge "[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master am:
fe5fdb1213 -s ours" into pi-dev-plus-aosp
Tej Singh [Thu, 22 Mar 2018 18:37:59 +0000 (18:37 +0000)]
[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master
am:
fe5fdb1213 -s ours
Change-Id: I6b5a02d285536a5a4433aa4060e72cb7acd16e35
Chong Zhang [Thu, 22 Mar 2018 18:36:24 +0000 (18:36 +0000)]
Merge "heif: fix Exif extraction in mtp database" into pi-dev
am:
9e64c01d02
Change-Id: Ied34169a586b99b8833db8946f8e64409f2b79cd
Nathan Harold [Thu, 22 Mar 2018 18:31:03 +0000 (18:31 +0000)]
Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 18:28:41 +0000 (18:28 +0000)]
Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev
am:
de6dfd93e5
Change-Id: If5937a6d59d7e386aa685570359df47cb34a8a98
Tej Singh [Thu, 22 Mar 2018 18:23:52 +0000 (18:23 +0000)]
Merge "Dummy StatsLog class" into stage-aosp-master
Felipe Leme [Thu, 22 Mar 2018 18:23:06 +0000 (18:23 +0000)]
Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev
am:
b030730aa8
Change-Id: Ic8c2eff923157be306dd401e47979a3337499919
Bo Zhu [Thu, 22 Mar 2018 18:19:09 +0000 (18:19 +0000)]
Merge "Remove the hard-coded counterId in VaultParams" into pi-dev
am:
88956ce326
Change-Id: I9112e639ae556de60cc2da64eef283033e99cca6
Robert Berry [Thu, 22 Mar 2018 17:50:46 +0000 (17:50 +0000)]
Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev
am:
c6bd185565
Change-Id: Ib81d1997ee46034dff4c8b9c45836f434f660f1a
Robert Berry [Thu, 22 Mar 2018 17:45:01 +0000 (17:45 +0000)]
Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev
am:
3818de595b
Change-Id: Ie3aad7e53a3e359bd83602db3a85cf1ab497e7c2
Makoto Onuki [Thu, 22 Mar 2018 17:42:13 +0000 (17:42 +0000)]
Merge "Move provider access stats to frameworks/base" into pi-dev
Chong Zhang [Thu, 22 Mar 2018 17:39:52 +0000 (17:39 +0000)]
Merge "heif: fix Exif extraction in mtp database" into pi-dev
Amin Shaikh [Thu, 22 Mar 2018 17:37:47 +0000 (17:37 +0000)]
Merge "Make QSTileImpl#mListeners thread safe." into pi-dev
am:
3bfa02a114
Change-Id: Iff73fc24b669ead73d67091805d809c60953e2e2
Felipe Leme [Thu, 22 Mar 2018 17:36:18 +0000 (17:36 +0000)]
Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 17:33:36 +0000 (17:33 +0000)]
Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev
Bo Zhu [Thu, 22 Mar 2018 17:32:10 +0000 (17:32 +0000)]
Merge "Remove the hard-coded counterId in VaultParams" into pi-dev
Robert Berry [Thu, 22 Mar 2018 17:23:05 +0000 (17:23 +0000)]
Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev
Robert Berry [Thu, 22 Mar 2018 17:19:33 +0000 (17:19 +0000)]
Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 17:07:01 +0000 (17:07 +0000)]
Merge "Make QSTileImpl#mListeners thread safe." into pi-dev
Felipe Leme [Thu, 22 Mar 2018 17:05:36 +0000 (17:05 +0000)]
Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev
am:
4e561f83cb
Change-Id: Id6e661b49cc9a28bb6464930210eac41f061d61a
Pankaj Kanwar [Thu, 22 Mar 2018 17:03:39 +0000 (17:03 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false""
Fyodor Kupolov [Thu, 22 Mar 2018 16:57:02 +0000 (16:57 +0000)]
Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev
am:
8055aa2434
Change-Id: Ia61b7426acef33ac4f19f4fdc133be2a84bbf49d
Mikhail Naganov [Thu, 22 Mar 2018 16:43:54 +0000 (16:43 +0000)]
Merge "Audio presentation: Docs & Testability fixes" into pi-dev
am:
397962981c
Change-Id: I6088df15fd85afd633f1111a7eb675bcd7c9ad95
Dmitry Dementyev [Thu, 22 Mar 2018 16:32:13 +0000 (09:32 -0700)]
Update RECOVER_KEYSTORE permission documentation.
Previous comment used outdated name for class managing recoverable
keystore.
Bug:
74976894
Test: none
Change-Id: I44460014d0ac5817d48e16bf281d2bb4ffe06823
Felipe Leme [Thu, 22 Mar 2018 16:24:53 +0000 (16:24 +0000)]
Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev
Wyatt Riley [Thu, 22 Mar 2018 16:24:51 +0000 (16:24 +0000)]
Merge "GNSS Model Name constant string and comment updates" into pi-dev
am:
aa8cbab151
Change-Id: Idafb74af51dccbfe754f7dfc6a667fa13b310582
Fyodor Kupolov [Thu, 22 Mar 2018 16:21:24 +0000 (16:21 +0000)]
Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 16:14:19 +0000 (16:14 +0000)]
Merge "Audio presentation: Docs & Testability fixes" into pi-dev
Wyatt Riley [Thu, 22 Mar 2018 16:10:08 +0000 (16:10 +0000)]
Merge "GNSS Model Name constant string and comment updates" into pi-dev
Andrew Sapperstein [Thu, 22 Mar 2018 15:54:23 +0000 (15:54 +0000)]
Revert "Update material_deep_teal_500 to #008577."
This reverts commit
5c228d5eb975de5e15970ae11ebddf95010875fe.
Reason for revert: Breaks presubmit. b/
76126268
Change-Id: Iffd8bbb62d05cae1c2a5dabfab2824899c5ff3cf
Bug:
74118164
Bug:
76126268
Test: presubmit
Felipe Leme [Thu, 22 Mar 2018 15:39:09 +0000 (08:39 -0700)]
Fixed autofill service metadata name on javadoc sample.
Bug:
72811034
Test: nope
Change-Id: I0367fa6ad1fa21c51dadb9706830bc50c3139cab
Tyler Gunn [Mon, 19 Mar 2018 20:14:10 +0000 (20:14 +0000)]
Rename handover failure constant per API review comments.
Expanding EMERG to EMERGENCY.
Test: Build code
Bug:
74831393
Merged-In: Ic0555b20dc508d022c0165a5d9dc3b40b33db70e
Change-Id: Ic0555b20dc508d022c0165a5d9dc3b40b33db70e
(cherry picked from commit
a4ef504bdc3044920d4996b93c30751a2fbce217)
Michael Plass [Thu, 22 Mar 2018 15:17:30 +0000 (15:17 +0000)]
Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev
am:
dddd69ef3e
Change-Id: I981b1d4fe36044e47b12051bf0dfd499eea2a155
Michael Plass [Thu, 22 Mar 2018 15:03:51 +0000 (15:03 +0000)]
Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev
Makoto Onuki [Wed, 21 Mar 2018 04:22:37 +0000 (21:22 -0700)]
Move provider access stats to frameworks/base
Bug:
76037330
Test: boot and dumpsys activity provider ContactsProvider2
Change-Id: I69cfe0edc98da00d1212f57871646488f87eb8dd
Artem Iglikov [Thu, 22 Mar 2018 14:20:20 +0000 (14:20 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev
am:
3e4df18658
Change-Id: Ic23be0c9e0af0fe9ec153e90950dd4ea3a0bbeac
Robert Berry [Thu, 22 Mar 2018 14:11:56 +0000 (14:11 +0000)]
Merge "Small fix for the key grant alias used in importKey" into pi-dev
am:
f9332469a4
Change-Id: I43efcec91dc8c9e84cbefe2b0dcd7a089046cee3
Robert Berry [Thu, 22 Mar 2018 14:06:42 +0000 (14:06 +0000)]
Merge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev
am:
98ea60c427
Change-Id: Ibd8338f5568478b207e660aaaa03d11bde8fcfeb
TreeHugger Robot [Thu, 22 Mar 2018 14:04:20 +0000 (14:04 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev
Robert Berry [Thu, 22 Mar 2018 13:55:31 +0000 (13:55 +0000)]
Merge "Small fix for the key grant alias used in importKey" into pi-dev
Robert Berry [Wed, 21 Mar 2018 16:31:52 +0000 (16:31 +0000)]
Unhide RecoverySession#recoverKeyChainSnapshot() method
The other methods expose raw key materials, which is a security flaw. This
new API is already being used by GMSCore, via reflection (although falling
back to the old methods if it is not available). Would be good to switch it
on ASAP.
Bug:
74345822
Test: Tested with GMSCore
Change-Id: I30d53c9e825888d1122c72d23b7c1c10c6edb1e9
Robert Berry [Wed, 21 Mar 2018 21:57:07 +0000 (21:57 +0000)]
Unhide RecoveryController#getRootCertificates()
This is so we can add a GTS test to affirm that GMS devices include the
Google Cloud Key Vault root certificate.
Test: runtest frameworks-core -p android.security.keystore.recovery
Bug:
74621045
Change-Id: Ib6431f5739f3dff066832e6aa300dd9da5bc0727
Robert Berry [Thu, 22 Mar 2018 13:48:31 +0000 (13:48 +0000)]
Merge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev
Artem Iglikov [Thu, 22 Mar 2018 12:18:07 +0000 (12:18 +0000)]
DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"
This reverts commit
f77cae61250c727630616b5672df2781e84a7e80.
Reason for revert: crashes SUW
Bug:
76128378
Change-Id: Ia77af64892aa5a03109cc4ef4c2c04b256000ba9
Christofer Åkersten [Thu, 22 Mar 2018 12:00:58 +0000 (12:00 +0000)]
Merge "Remove unnecessary Context from ApiLoader" into pi-dev
am:
bf121d2f13
Change-Id: I4659cad049c4d5dde7fc4543501661a93d6fa362
Julia Reynolds [Thu, 22 Mar 2018 11:54:05 +0000 (11:54 +0000)]
Merge "Fix index error" into pi-dev
am:
ae2f368907
Change-Id: I818ce7bfe0fc6cb5f0bbe25ede1ac443ab7ef052
Christofer Åkersten [Thu, 22 Mar 2018 11:49:41 +0000 (11:49 +0000)]
Merge "Remove unnecessary Context from ApiLoader" into pi-dev
Julia Reynolds [Thu, 22 Mar 2018 11:39:28 +0000 (11:39 +0000)]
Merge "Fix index error" into pi-dev
Lukas Zilka [Thu, 22 Mar 2018 11:04:36 +0000 (11:04 +0000)]
Merge "Adds support for a fall-back model when the language-specific model is not found." into pi-dev
am:
f9593d62b3
Change-Id: I5e47cfee132c1c2f081dfd39ff428e8629714179
TreeHugger Robot [Thu, 22 Mar 2018 10:50:47 +0000 (10:50 +0000)]
Merge "Adds support for a fall-back model when the language-specific model is not found." into pi-dev
Jordan Liu [Thu, 22 Mar 2018 09:02:47 +0000 (09:02 +0000)]
[automerger skipped]Merge "Finalise STK call control strings" into pi-dev
am:
0fe28341e5 -s ours
Change-Id: I7741825c787c2da43b5b405fcd09c0ff2088c535
TreeHugger Robot [Thu, 22 Mar 2018 08:49:38 +0000 (08:49 +0000)]
Merge "Finalise STK call control strings" into pi-dev
Jordan Liu [Thu, 22 Mar 2018 06:45:11 +0000 (06:45 +0000)]
Merge "Finalise STK call control strings" am:
249119da53
am:
eef3fce35d
Change-Id: I1b9cdb97baecbb04052addcf14beca475a44200a
Jordan Liu [Thu, 22 Mar 2018 06:34:31 +0000 (06:34 +0000)]
Merge "Finalise STK call control strings"
am:
249119da53
Change-Id: Id1179bcd212731f5ceff44ad45b9f7ab6643c5c6
Adrian Roos [Thu, 22 Mar 2018 06:28:45 +0000 (06:28 +0000)]
Merge "Letterbox: make letterbox work with drag resizing" into pi-dev
am:
ab3ffe4194
Change-Id: I8efd0e9e90633147cbeaf22af9783ba30249e8ca
TreeHugger Robot [Thu, 22 Mar 2018 06:16:00 +0000 (06:16 +0000)]
Merge "Letterbox: make letterbox work with drag resizing" into pi-dev
Holly Jiuyu Sun [Thu, 22 Mar 2018 06:06:01 +0000 (06:06 +0000)]
[automerger skipped]Merge "Mark eraseSubscriptions as @SystemApi." am:
a99b258049
am:
44975ee51f -s ours
Change-Id: Iab4f2a3cbe355daa52b800a1775c25438b10ade5
Holly Jiuyu Sun [Thu, 22 Mar 2018 05:59:18 +0000 (05:59 +0000)]
Merge "Mark eraseSubscriptions as @SystemApi."
am:
a99b258049
Change-Id: Id2be8785239c34dbe705f0614aa9bfa9daa0aeec
Christofer Åkersten [Thu, 22 Mar 2018 05:53:53 +0000 (14:53 +0900)]
Remove unnecessary Context from ApiLoader
Bug:
76001644
Test: compile
Change-Id: I6ac81dac16374d90facfe33c68607c5c286b335f
Bo Zhu [Thu, 22 Mar 2018 05:46:55 +0000 (22:46 -0700)]
Remove the hard-coded counterId in VaultParams
Bug:
72221676
Test: Manual test and runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystore
Change-Id: I51cfac6478d59f41c1107106a14af008463f7de7
Jordan Liu [Thu, 22 Mar 2018 00:39:12 +0000 (17:39 -0700)]
Finalise STK call control strings
Bug:
64685331
Bug:
70352301
Test: manual
Change-Id: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8
Merged-In: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8
Andrew Sapperstein [Thu, 22 Mar 2018 05:41:01 +0000 (05:41 +0000)]
Merge "Remove java-symbol for deleted string." into pi-dev
am:
82a938c149
Change-Id: Ib3af18027bbcf2d2043aa881d9a840818470e5ff
Andrew Sapperstein [Thu, 22 Mar 2018 05:27:35 +0000 (05:27 +0000)]
Merge "Remove java-symbol for deleted string." into pi-dev
Jordan Liu [Thu, 22 Mar 2018 05:14:31 +0000 (05:14 +0000)]
Merge "Finalise STK call control strings"
Andreas Terzis [Thu, 22 Mar 2018 05:11:25 +0000 (05:11 +0000)]
Merge "Enable new data usage settings features." into pi-dev
am:
024cf8a707
Change-Id: I73da0aa1526652ed470bab9f4230149ab9b7c32b
Felipe Leme [Thu, 22 Mar 2018 05:05:25 +0000 (05:05 +0000)]
Merge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into pi-dev
am:
b3029a4f72
Change-Id: I042b254b83066a0f114f76ece040e3751a2a01e7
Andreas Terzis [Thu, 22 Mar 2018 05:02:10 +0000 (05:02 +0000)]
Merge "Enable new data usage settings features." into pi-dev
Felipe Leme [Thu, 22 Mar 2018 04:50:04 +0000 (04:50 +0000)]
Merge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into pi-dev
Holly Jiuyu Sun [Thu, 22 Mar 2018 03:45:55 +0000 (03:45 +0000)]
Merge "Mark eraseSubscriptions as @SystemApi."
Yohei Yukawa [Thu, 22 Mar 2018 03:20:36 +0000 (03:20 +0000)]
Merge "Make sure at least one non-aux IME is enabled" into pi-dev
am:
245f8e5ab5
Change-Id: Id200c9569b3d71636ca3a8b5f4facf609ffa23d0
TreeHugger Robot [Thu, 22 Mar 2018 03:08:38 +0000 (03:08 +0000)]
Merge "Make sure at least one non-aux IME is enabled" into pi-dev
Bo Zhu [Thu, 22 Mar 2018 02:50:50 +0000 (19:50 -0700)]
Unhide the new RecoverySession#start with the alias for root cert
Bug:
76033708
Test: none, it's just unhiding APIs
Change-Id: Iec1e44d24bb1704da082404566233ada83b8eb81
Tej Singh [Fri, 2 Mar 2018 02:22:55 +0000 (18:22 -0800)]
Dummy StatsLog class
This is a dummy class that provides StatsLog.write methods and
appropriate constants to log atoms in aosp.
Merged-In: Ib14a74eabfab08bbae5d4d549244f1022e8c34f0
Test: build success on Marlin
Change-Id: I606bc8a96337ced842eb7a2bcba8c4969c9d4748
Tej Singh [Thu, 22 Mar 2018 01:43:52 +0000 (01:43 +0000)]
Merge "ScheduledJobStateChanged: add stop reason" into pi-dev
am:
dcccfd9742
Change-Id: Ie6d83624f3d607c5bd3d24aea0bcd28829a2f11a
TreeHugger Robot [Thu, 22 Mar 2018 01:30:52 +0000 (01:30 +0000)]
Merge "ScheduledJobStateChanged: add stop reason" into pi-dev
OSDN Git Service
