OSDN Git Service
Amin Shaikh [Thu, 29 Mar 2018 17:27:32 +0000 (17:27 +0000)]
Merge "Change alarm/ringer status QS separator." into pi-dev am:
2011f2333d
am:
1110355fb3
Change-Id: I8ae4c1eca49060de23537470d7ecc179ec70c426
Greg Kaiser [Thu, 29 Mar 2018 17:14:32 +0000 (17:14 +0000)]
Merge "tools/bit: Avoid leak in error condition" am:
db43124b01 am:
b3851d92ce
am:
739d7864e3
Change-Id: I2ba292aade2c3612b4876af099b9b72fffb45db2
Robert Berry [Thu, 29 Mar 2018 17:02:51 +0000 (17:02 +0000)]
Merge "Save KeyChainSnapshots to disk" into pi-dev am:
02c0bbdc47
am:
0eb805463a
Change-Id: I9c922b94701eee213646a6ca3a2c4488959e5ce1
Amin Shaikh [Thu, 29 Mar 2018 17:02:33 +0000 (17:02 +0000)]
Merge "Change alarm/ringer status QS separator." into pi-dev
am:
2011f2333d
Change-Id: I8603604b163bd901d902f0bf1a0a2d47bdf35a05
Greg Kaiser [Thu, 29 Mar 2018 16:57:00 +0000 (16:57 +0000)]
Merge "tools/bit: Avoid leak in error condition" am:
db43124b01
am:
b3851d92ce
Change-Id: I6b51d22ee200e11b5a731461f295f5da8937a683
David Brazdil [Thu, 29 Mar 2018 16:51:34 +0000 (16:51 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev am:
1b460069a1
am:
e32515f19f
Change-Id: I616f9065fd0a1c5758239714afda92875876254f
TreeHugger Robot [Thu, 29 Mar 2018 16:50:21 +0000 (16:50 +0000)]
Merge "Change alarm/ringer status QS separator." into pi-dev
Robert Berry [Thu, 29 Mar 2018 16:46:48 +0000 (16:46 +0000)]
Merge "Save KeyChainSnapshots to disk" into pi-dev
am:
02c0bbdc47
Change-Id: I603452c6ea44eec44d5c03fab4130034acc7d11d
Greg Kaiser [Thu, 29 Mar 2018 16:45:00 +0000 (16:45 +0000)]
Merge "tools/bit: Avoid leak in error condition"
am:
db43124b01
Change-Id: I4ab166872dc985c98d4771d4715a0d059de80dd7
Android Build Merger (Role) [Thu, 29 Mar 2018 16:44:30 +0000 (16:44 +0000)]
Merge "Merge "NotificationManagerService: don't play notif in SILENT mode" into pi-dev am:
a908ec2a36 am:
0babc73c89"
Jean-Michel Trivi [Thu, 29 Mar 2018 16:44:06 +0000 (16:44 +0000)]
Merge "NotificationManagerService: don't play notif in SILENT mode" into pi-dev am:
a908ec2a36
am:
0babc73c89
Change-Id: Id8ebc2d9e2d0abefe0fb02f42a5e6528a9c2a7c4
Chet Haase [Thu, 29 Mar 2018 16:43:16 +0000 (16:43 +0000)]
Merge "Fix bug and docs assuming progressBar min is 0 instead of getMin()"
David Brazdil [Thu, 29 Mar 2018 16:36:35 +0000 (16:36 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev
am:
1b460069a1
Change-Id: Id9ac8e2d05df7d679a970cc04f066554f5f09954
Felipe Leme [Thu, 29 Mar 2018 16:30:36 +0000 (16:30 +0000)]
Merge "Don't print contents of user-provided bundles." into pi-dev am:
dac0fe910a
am:
7c6e950075
Change-Id: Ibd0e02676e3745edc0e4c1866dddb45e0db7670a
Robert Berry [Thu, 29 Mar 2018 16:27:42 +0000 (16:27 +0000)]
Merge "Save KeyChainSnapshots to disk" into pi-dev
Jean-Michel Trivi [Thu, 29 Mar 2018 16:26:07 +0000 (16:26 +0000)]
Merge "NotificationManagerService: don't play notif in SILENT mode" into pi-dev
am:
a908ec2a36
Change-Id: I186b0b920560bc484b6f4ebea6e4112f3ad06d5c
TreeHugger Robot [Thu, 29 Mar 2018 16:22:47 +0000 (16:22 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev
Jeff Sharkey [Thu, 29 Mar 2018 16:18:04 +0000 (16:18 +0000)]
Merge "Better public volumes handling on secondary users." into pi-dev am:
4abf0f708f
am:
9e6836d7b7
Change-Id: I12457a332701efd588cbff628fe50af32ab9880d
Jean-Michel Trivi [Thu, 29 Mar 2018 16:14:10 +0000 (16:14 +0000)]
Merge "NotificationManagerService: don't play notif in SILENT mode" into pi-dev
Felipe Leme [Thu, 29 Mar 2018 16:07:46 +0000 (16:07 +0000)]
Merge "Don't print contents of user-provided bundles." into pi-dev
am:
dac0fe910a
Change-Id: I2abc3adc142b7ad4c4cc25e3a382d53cecec5002
Jeff Sharkey [Thu, 29 Mar 2018 15:59:19 +0000 (15:59 +0000)]
Merge "API for granting/revoking runtime permissions." into pi-dev am:
c8156c6a52
am:
0ec31b56e9
Change-Id: Ic18363622c687e09aa6b55c1efa6ed14acdcfb06
Jeff Sharkey [Thu, 29 Mar 2018 15:56:02 +0000 (15:56 +0000)]
Merge "Better public volumes handling on secondary users." into pi-dev
am:
4abf0f708f
Change-Id: Ibf736f62f884b2effc663b059ab4c692d71fffff
Jeff Sharkey [Thu, 29 Mar 2018 15:45:33 +0000 (15:45 +0000)]
Merge "API for granting/revoking runtime permissions." into pi-dev
am:
c8156c6a52
Change-Id: Ied3764b365ce6e59848042fff2efd748bde3d9ca
Eran Messeri [Thu, 29 Mar 2018 15:37:34 +0000 (15:37 +0000)]
Merge "DPM: API review for installKeyPair" into pi-dev am:
e5f9e833e5
am:
da707fa021
Change-Id: I251deb9315fcfad23dde6f27ac2733cb422f4233
TreeHugger Robot [Thu, 29 Mar 2018 15:36:43 +0000 (15:36 +0000)]
Merge "Don't print contents of user-provided bundles." into pi-dev
Treehugger Robot [Thu, 29 Mar 2018 15:22:55 +0000 (15:22 +0000)]
Merge "tools/bit: Avoid leak in error condition"
Eran Messeri [Thu, 29 Mar 2018 15:22:41 +0000 (15:22 +0000)]
Merge "DPM: API review for installKeyPair" into pi-dev
am:
e5f9e833e5
Change-Id: Ia10366dca584cd9d92932f2dfd3cd59472ee078c
Alan Viverette [Thu, 29 Mar 2018 15:20:00 +0000 (15:20 +0000)]
Merge "Federate platform docs against AndroidX" into pi-dev am:
73a66276e3
am:
55d013b0fa
Change-Id: Ia5aa4f1c134f1328105a9e13df6d470b3f2efaaa
Jeff Sharkey [Thu, 29 Mar 2018 15:15:54 +0000 (15:15 +0000)]
Merge "Better public volumes handling on secondary users." into pi-dev
Jeff Sharkey [Thu, 29 Mar 2018 15:14:34 +0000 (15:14 +0000)]
Merge "API for granting/revoking runtime permissions." into pi-dev
Tony Mak [Thu, 29 Mar 2018 15:11:34 +0000 (15:11 +0000)]
Merge "Not allow shell to dump screen by using ui-automator if... DISALLOW_DEBUGGING_FEATURES is set" into pi-dev am:
b2c4a55405
am:
5351429200
Change-Id: I65a7c29f4b7a031bd931d5b31192456734e9616d
Alan Viverette [Thu, 29 Mar 2018 15:04:15 +0000 (15:04 +0000)]
Merge "Federate platform docs against AndroidX" into pi-dev
am:
73a66276e3
Change-Id: I037ae591cb7fbdf33260ff7494a28a0ae22919c1
Eran Messeri [Thu, 29 Mar 2018 15:00:30 +0000 (15:00 +0000)]
Merge "DPM: API review for installKeyPair" into pi-dev
Julia Reynolds [Thu, 29 Mar 2018 14:58:16 +0000 (14:58 +0000)]
Merge "Allow apps with dnd access to bypass DND" into pi-dev am:
0cdeb11c2c
am:
1d434bcf3c
Change-Id: I0ebb0aa2b858be1b0aacb8d3d0175b9bfe7bc47f
Tony Mak [Thu, 29 Mar 2018 14:52:21 +0000 (14:52 +0000)]
Merge "Not allow shell to dump screen by using ui-automator if... DISALLOW_DEBUGGING_FEATURES is set" into pi-dev
am:
b2c4a55405
Change-Id: I7dab7f606d55f1c0e0683edfd16a274a2b481b10
Alan Viverette [Thu, 29 Mar 2018 14:47:47 +0000 (14:47 +0000)]
Merge "Federate platform docs against AndroidX" into pi-dev
Nicolas Geoffray [Thu, 29 Mar 2018 14:47:09 +0000 (14:47 +0000)]
Merge "Add three more wifi APIs." into pi-dev am:
ba6539382a
am:
727492b539
Change-Id: I96aadaddbc5fec9588827f589b3ad7205ef09b07
Julia Reynolds [Thu, 29 Mar 2018 14:42:53 +0000 (14:42 +0000)]
Merge "Allow apps with dnd access to bypass DND" into pi-dev
am:
0cdeb11c2c
Change-Id: I4f82ff5b359521c8c6ff8c7b89ee27522cfa7745
Tony Mak [Thu, 29 Mar 2018 14:36:55 +0000 (14:36 +0000)]
Merge "Not allow shell to dump screen by using ui-automator if... DISALLOW_DEBUGGING_FEATURES is set" into pi-dev
Nicolas Geoffray [Thu, 29 Mar 2018 14:35:50 +0000 (14:35 +0000)]
Merge "Add three more wifi APIs." into pi-dev
am:
ba6539382a
Change-Id: Ifa37e895756fa30faa20fc6284375e3c22a2810c
TreeHugger Robot [Thu, 29 Mar 2018 14:27:19 +0000 (14:27 +0000)]
Merge "Allow apps with dnd access to bypass DND" into pi-dev
Nicolas Geoffray [Thu, 29 Mar 2018 14:23:10 +0000 (14:23 +0000)]
Merge "Add three more wifi APIs." into pi-dev
Robert Berry [Thu, 29 Mar 2018 14:19:49 +0000 (14:19 +0000)]
Merge "Remove unused KeyStore field in RecoverableKeyStoreManager" into pi-dev am:
87860048bd
am:
f99fcd3157
Change-Id: I68de5aa7db935ecec247a6a3c0dce0c1c8657b82
Robert Berry [Thu, 29 Mar 2018 14:09:53 +0000 (14:09 +0000)]
Merge "Remove unused KeyStore field in RecoverableKeyStoreManager" into pi-dev
am:
87860048bd
Change-Id: I0439e8675276f9168fd16d318d81547e9596b472
Eran Messeri [Thu, 29 Mar 2018 14:07:32 +0000 (14:07 +0000)]
Merge "Utilize verbose KeyChain errors" into pi-dev am:
8e07a26233
am:
f4dfc116a1
Change-Id: I0754008088afc7bd1600247f583f339f2a3a040b
Amin Shaikh [Thu, 29 Mar 2018 13:41:45 +0000 (09:41 -0400)]
Change alarm/ringer status QS separator.
Change-Id: Ib305e65e45a78f1db6091bb978e086c46205db5f
Fixes:
76208830
Test: visual
Eran Messeri [Thu, 29 Mar 2018 13:54:23 +0000 (13:54 +0000)]
Merge "Utilize verbose KeyChain errors" into pi-dev
am:
8e07a26233
Change-Id: I083045d1f78acd89f2bbd19aecaf00a1d9d704f0
Artem Iglikov [Thu, 29 Mar 2018 13:47:34 +0000 (13:47 +0000)]
Merge "Clear app data before full restore for specified packages" into pi-dev am:
bb0bcc4460
am:
d723b5ea24
Change-Id: I551d4dc0cbc04e48daa2c636aa341e7775246ffa
Robert Berry [Thu, 29 Mar 2018 11:07:17 +0000 (12:07 +0100)]
Save KeyChainSnapshots to disk
Bug:
73921897
Test: runtest frameworks-services -p \
com.android.server.locksettings.recoverablekeystore
Change-Id: I909f2f7f289d4e2a0cdff6a3f7184747e5deeae2
TreeHugger Robot [Thu, 29 Mar 2018 13:44:59 +0000 (13:44 +0000)]
Merge "Remove unused KeyStore field in RecoverableKeyStoreManager" into pi-dev
Artem Iglikov [Thu, 29 Mar 2018 13:36:34 +0000 (13:36 +0000)]
Merge "Clear app data before full restore for specified packages" into pi-dev
am:
bb0bcc4460
Change-Id: I707a2f5fbe2d8c7bac2bc405e684016c61c2ddca
TreeHugger Robot [Thu, 29 Mar 2018 13:31:14 +0000 (13:31 +0000)]
Merge "Utilize verbose KeyChain errors" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 13:23:24 +0000 (13:23 +0000)]
Merge "Clear app data before full restore for specified packages" into pi-dev
David Brazdil [Thu, 29 Mar 2018 13:21:48 +0000 (14:21 +0100)]
Add more hidden API uses to light greylist
Bug:
76443991
Bug:
64382372
Test: make
Change-Id: I5ec60bbf9b747230ab1a5ae539d7d014b24605b0
Annie Meng [Thu, 29 Mar 2018 13:21:37 +0000 (13:21 +0000)]
[automerger skipped] Merge "DO NOT MERGE Unrevert update references to backup agent timeouts" into pi-dev am:
3594cd54aa
am:
614f40a01b -s ours
Change-Id: Ib3c5487e8ad6bda88287fd64df7b90eaadeb26b2
Annie Meng [Thu, 29 Mar 2018 13:15:23 +0000 (13:15 +0000)]
Merge "DO NOT MERGE Unrevert update references to backup agent timeouts" into pi-dev
am:
3594cd54aa
Change-Id: Ic7e207d39529aa292938910352d6b0c420f23d88
Leon Scroggins [Thu, 29 Mar 2018 13:14:13 +0000 (13:14 +0000)]
Merge "Rename ImageDecoder.setResize" into pi-dev am:
6078631927
am:
07e1c83bad
Change-Id: I8d5bd9332d982cf953947d888afd25c566ca5460
Leon Scroggins [Thu, 29 Mar 2018 13:00:37 +0000 (13:00 +0000)]
Merge "Rename ImageDecoder.setResize" into pi-dev
am:
6078631927
Change-Id: I6e0a070ef9cb4cc1746c1379ecbebcee868efcd9
Nicolas Geoffray [Thu, 29 Mar 2018 13:00:29 +0000 (13:00 +0000)]
Merge "Move graphics APIs to the light grey." into pi-dev am:
d8d05ecc64
am:
9bf3f6362c
Change-Id: Ib3603cd9d77b3659d9be7e47055982474d227746
Annie Meng [Thu, 29 Mar 2018 12:55:42 +0000 (12:55 +0000)]
Merge "DO NOT MERGE Unrevert update references to backup agent timeouts" into pi-dev
Julia Reynolds [Thu, 29 Mar 2018 12:50:22 +0000 (12:50 +0000)]
Merge "Exempt some notis from DND visual suppression" into pi-dev am:
a000724a83
am:
94c5dd2157
Change-Id: I0ad56197659cfc945dc9d78ceb32406e271e8cae
Nicolas Geoffray [Thu, 29 Mar 2018 12:46:01 +0000 (12:46 +0000)]
Merge "Move graphics APIs to the light grey." into pi-dev
am:
d8d05ecc64
Change-Id: I3d2021625786591bdca46ad3f255273c635b1cf0
Leon Scroggins [Thu, 29 Mar 2018 12:40:24 +0000 (12:40 +0000)]
Merge "Rename ImageDecoder.setResize" into pi-dev
Julia Reynolds [Thu, 29 Mar 2018 12:40:01 +0000 (12:40 +0000)]
Merge "Exempt some notis from DND visual suppression" into pi-dev
am:
a000724a83
Change-Id: I47c11979e3a0687262f7e9beed81a3ed5db06905
TreeHugger Robot [Thu, 29 Mar 2018 12:26:26 +0000 (12:26 +0000)]
Merge "Move graphics APIs to the light grey." into pi-dev
Nicolas Geoffray [Wed, 28 Mar 2018 23:00:12 +0000 (00:00 +0100)]
Add three more wifi APIs.
bug:
74066078
Test: m
Change-Id: I2c9a7499094c743de3923226bbcea3c1cd147d5f
TreeHugger Robot [Thu, 29 Mar 2018 12:25:02 +0000 (12:25 +0000)]
Merge "Exempt some notis from DND visual suppression" into pi-dev
Annie Meng [Thu, 29 Mar 2018 12:04:40 +0000 (12:04 +0000)]
Merge "Unrevert update references to backup agent timeouts"
Robert Berry [Thu, 29 Mar 2018 11:30:59 +0000 (11:30 +0000)]
Merge "Persist KeyChainSnapshot to XML" into pi-dev am:
9f75e089ed
am:
d9b91fca26
Change-Id: I74aee2c0e1c7eda412a31f1bcd7cf2b13ac2190f
Robert Berry [Thu, 29 Mar 2018 11:18:54 +0000 (11:18 +0000)]
Remove unused KeyChainSnapshot tables am:
924b550151
am:
fef4764ef0
Change-Id: Ibfc51b7ffe6f930a1e50c90907c75c8eb31a922d
Robert Berry [Thu, 29 Mar 2018 11:17:38 +0000 (11:17 +0000)]
Merge "Persist KeyChainSnapshot to XML" into pi-dev
am:
9f75e089ed
Change-Id: Ic0570155bba210a0bffa2e813724cbd13225dddc
Robert Berry [Thu, 29 Mar 2018 11:11:26 +0000 (11:11 +0000)]
Remove unused KeyChainSnapshot tables
am:
924b550151
Change-Id: Ica8a4db0ccab999853c906dfadde7fb924627bba
Robert Berry [Thu, 29 Mar 2018 10:59:17 +0000 (10:59 +0000)]
Merge "Persist KeyChainSnapshot to XML" into pi-dev
Julia Reynolds [Wed, 28 Mar 2018 14:48:37 +0000 (10:48 -0400)]
Exempt some notis from DND visual suppression
Specifically, foreground service notifications
and media notifications.
Fixes:
75261156
Test: atest SystemUITests
Change-Id: I2f1fddbf748a274177d2c8dddb1b72fce82c8c4c
Juancheng Rong [Thu, 29 Mar 2018 10:26:59 +0000 (10:26 +0000)]
Merge "Merge "Fixed the Premium SMS bug reported by our partner The detail is that : === <shortcode country="ae" free="3214|1017"/> === As displayed above, Arab Emirates is registered in sms_short_codes.xml. There is only CATEGORY_FREE_SHORT_CODE number for the county code "ae". All other numbers which include length under 5 digits is set as CATEGORY_NOT_SHORT_CODE, and so Premium SMS pop-up does not appear for both case. pattern="\\d{1,5}" is added to all similar entries BUG:
66911380" am:
e2e7b28c12 am:
6c0c79618f" into pi-dev-plus-aosp
am:
ccba499e0b
Change-Id: I7b74b256700a033a49f66206ab57c8774763660d
Nicolas Geoffray [Wed, 28 Mar 2018 22:15:54 +0000 (23:15 +0100)]
Move graphics APIs to the light grey.
The APIs have just started being removed in public APIs, and some
non-vendor apps are using them.
bug:
77224796
Test: m
Change-Id: I5c3afd18244a888ec77f14eaa6d839faf4f6d2be
Robert Berry [Thu, 29 Mar 2018 10:13:19 +0000 (10:13 +0000)]
Add warning comment about serialization am:
52c15f1699
am:
f7a3d02464
Change-Id: Ib3e2c86f7ef41e57d4a3667cdab78c9c26d716d0
Android Build Merger (Role) [Thu, 29 Mar 2018 10:05:50 +0000 (10:05 +0000)]
Merge "Merge "Fixed the Premium SMS bug reported by our partner The detail is that : === <shortcode country="ae" free="3214|1017"/> === As displayed above, Arab Emirates is registered in sms_short_codes.xml. There is only CATEGORY_FREE_SHORT_CODE number for the county code "ae". All other numbers which include length under 5 digits is set as CATEGORY_NOT_SHORT_CODE, and so Premium SMS pop-up does not appear for both case. pattern="\\d{1,5}" is added to all similar entries BUG:
66911380" am:
e2e7b28c12 am:
6c0c79618f" into pi-dev-plus-aosp
Juancheng Rong [Thu, 29 Mar 2018 10:05:28 +0000 (10:05 +0000)]
Merge "Fixed the Premium SMS bug reported by our partner The detail is that : === <shortcode country="ae" free="3214|1017"/> === As displayed above, Arab Emirates is registered in sms_short_codes.xml. There is only CATEGORY_FREE_SHORT_CODE number for the county code "ae". All other numbers which include length under 5 digits is set as CATEGORY_NOT_SHORT_CODE, and so Premium SMS pop-up does not appear for both case. pattern="\\d{1,5}" is added to all similar entries BUG:
66911380" am:
e2e7b28c12
am:
6c0c79618f
Change-Id: I558ba52e57a077e0ea18fe89d67d5b9509ed7cfe
Robert Berry [Thu, 29 Mar 2018 10:02:38 +0000 (10:02 +0000)]
Add warning comment about serialization
am:
52c15f1699
Change-Id: I88a9d84ba7d6cdfd030a8f308fafe40c161a9736
Artem Iglikov [Tue, 27 Mar 2018 14:12:18 +0000 (15:12 +0100)]
Clear app data before full restore for specified packages
In some cases (deferred restore) the app data needs to be cleared even
if the app has implemented backup agent. As a quick fix introduce
PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE secure setting, which
transport can fill prior to restore.
Bug:
69069240
Test: adb shell settings put secure packages_to_clear_data_before_full_restore com.google.android.apps.nexuslauncher && adb shell bmgr restore com.google.android.apps.nexuslauncher
Change-Id: I2a4651365d9cf4747f32d2ba69312f54cd03d118
Eran Messeri [Mon, 26 Mar 2018 15:43:14 +0000 (16:43 +0100)]
Utilize verbose KeyChain errors
As KeyChain reports detailed error codes about failure to generate keys
or attestation records for them, log these detailed errors and throw an
exception if the hardware does not support Device ID attestation.
Bug:
72642093
Bug:
73448533
Test: cts-tradefed run commandAndExit cts-dev -s 127.0.0.1:50487 -a x86_64 -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement -l DEBUG
Change-Id: Ib12efcf48c158373e1fc28cc51d67e70282d029e
Robert Berry [Thu, 29 Mar 2018 09:30:29 +0000 (10:30 +0100)]
Remove unused KeyStore field in RecoverableKeyStoreManager
Test: runtest frameworks-services -p \
com.android.server.locksettings.recoverablekeystore
Bug:
74944591
Change-Id: Ibe0167adb103beded9eb0138825f4a975f12c29e
Robert Berry [Thu, 29 Mar 2018 09:09:03 +0000 (10:09 +0100)]
Remove unused KeyChainSnapshot tables
This will be persisted as an XML file instead.
Bug:
73921897
Test: none, it's just removing unused consts
Change-Id: Idaeb437d0a7258d03418932d4aba75189092b3fe
Robert Berry [Wed, 28 Mar 2018 19:26:57 +0000 (20:26 +0100)]
Persist KeyChainSnapshot to XML
Adds parser and serializer, and round trip test.
Bug:
73921897
Test: runtest frameworks-services -p \
com.android.server.locksettings.recoverablekeystore
Change-Id: I8259ec398ee076823ac8bbf847534738514de8dc
Juancheng Rong [Thu, 29 Mar 2018 09:55:00 +0000 (09:55 +0000)]
Merge "Fixed the Premium SMS bug reported by our partner The detail is that : === <shortcode country="ae" free="3214|1017"/> === As displayed above, Arab Emirates is registered in sms_short_codes.xml. There is only CATEGORY_FREE_SHORT_CODE number for the county code "ae". All other numbers which include length under 5 digits is set as CATEGORY_NOT_SHORT_CODE, and so Premium SMS pop-up does not appear for both case. pattern="\\d{1,5}" is added to all similar entries BUG:
66911380"
am:
e2e7b28c12
Change-Id: I32baf21b481635925870814387ec2d32ab36a7e2
Benjamin Franz [Thu, 29 Mar 2018 09:48:32 +0000 (09:48 +0000)]
Merge "Merge "Update to lock task features API" into pi-dev am:
3a5dabbb10" into pi-dev-plus-aosp
am:
4a93e2f209
Change-Id: I76e34c49b4e8376d6c742b65c05e7c5f71f6bd58
JC [Thu, 29 Mar 2018 09:32:26 +0000 (09:32 +0000)]
Merge "DCB whitelist short code for user association" am:
722282ec62 am:
b1e22988e6
am:
54ed6d39f0
Change-Id: I6dc0c695113d50cf776f17ed94ec7bc0a0cf19c4
Robert Berry [Thu, 29 Mar 2018 09:21:50 +0000 (10:21 +0100)]
Add warning comment about serialization
As it's important we do not break serialization of KeyChainSnapshot
(as it could fail in weird and mysterious ways if we did), add
comments warning anybody editing those files to also update the
serializer and deserializer, as well as appropriate tests.
Test: none, just adding comments
Bug:
73921897
Change-Id: If73162b8fb2a0b44fd954b72c9030cd9e042282b
Android Build Merger (Role) [Thu, 29 Mar 2018 09:20:03 +0000 (09:20 +0000)]
Merge "Merge "Update to lock task features API" into pi-dev am:
3a5dabbb10" into pi-dev-plus-aosp
Benjamin Franz [Thu, 29 Mar 2018 09:19:16 +0000 (09:19 +0000)]
Merge "Update to lock task features API" into pi-dev
am:
3a5dabbb10
Change-Id: Ie8a12a29bfca101d19d8ec104988633b7749bb5f
JC [Thu, 29 Mar 2018 09:18:21 +0000 (09:18 +0000)]
Merge "DCB whitelist short code for user association" am:
722282ec62
am:
b1e22988e6
Change-Id: I07592e3ffa7e56085d274436e2e28cba54ca05ac
Eran Messeri [Fri, 23 Mar 2018 13:32:17 +0000 (13:32 +0000)]
DPM: API review for installKeyPair
Per API council review, make installKeyPair take a single, integer flags
argument rather than two boolean ones.
Bug:
71818124
Test: cts-tradefed run commandAndExit cts-dev -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement -l DEBUG
Change-Id: Ia04f8d617ae0d1db028bd9bcef3a4bf486449468
JC [Thu, 29 Mar 2018 09:06:39 +0000 (09:06 +0000)]
Merge "DCB whitelist short code for user association"
am:
722282ec62
Change-Id: Id8c380c715a94336cd21af4b6a3e3ae9da11a1e1
Benjamin Franz [Thu, 29 Mar 2018 09:02:17 +0000 (09:02 +0000)]
Merge "Update to lock task features API" into pi-dev
Eric Sandness [Thu, 29 Mar 2018 08:52:16 +0000 (08:52 +0000)]
Merge "Permission Check For DPM Get IME API" into pi-dev am:
78931a0f95
am:
b2fed746d3
Change-Id: Iedb0ecaff232204c0b75817d2f37a9247e33d6b2
Eric Sandness [Thu, 29 Mar 2018 08:38:29 +0000 (08:38 +0000)]
Merge "Permission Check For DPM Get IME API" into pi-dev
am:
78931a0f95
Change-Id: If81408f57757f1649b3355cc158a2539b33f646f
Remi NGUYEN VAN [Thu, 29 Mar 2018 08:38:20 +0000 (08:38 +0000)]
Merge "Fix network usage stats on 464xlat tethered." am:
83088dcd8e am:
aa20932ff1
am:
62df0a68e0
Change-Id: Ieb25c41c651499fdd01225ae5ac21d95e3d823f5
Mathew Inwood [Thu, 29 Mar 2018 08:30:49 +0000 (08:30 +0000)]
[automerger skipped] Merge "Use commas to separate API exemptions list, not colon." into pi-dev am:
d598caacfc -s ours
am:
c89999a995 -s ours
Change-Id: I617ce2abe35276fe6d1f8e601284452f4affcdeb
Eric Sandness [Thu, 29 Mar 2018 08:25:09 +0000 (08:25 +0000)]
Merge "Permission Check For DPM Get IME API" into pi-dev