Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
367,412 Commits 3 Branches 0 Tags
f9767031dfda367c5ca55b95046db048b4be2a3e
Commit Graph

90073 Commits

Author SHA1 Message Date
Chet Haase
f9767031df Merge "Fix bug and docs assuming progressBar min is 0 instead of getMin()" 2018-03-29 16:43:16 +00:00
Jeff Sharkey
f7c102a9da Merge "API for granting/revoking runtime permissions." into pi-dev am: c8156c6a52 
am: 0ec31b56e9

Change-Id: Ic18363622c687e09aa6b55c1efa6ed14acdcfb06
 2018-03-29 15:59:19 +00:00
Jeff Sharkey
0ec31b56e9 Merge "API for granting/revoking runtime permissions." into pi-dev 
am: c8156c6a52

Change-Id: Ied3764b365ce6e59848042fff2efd748bde3d9ca
 2018-03-29 15:45:33 +00:00
Eran Messeri
2723bc0f64 Merge "DPM: API review for installKeyPair" into pi-dev am: e5f9e833e5 
am: da707fa021

Change-Id: I251deb9315fcfad23dde6f27ac2733cb422f4233
 2018-03-29 15:37:34 +00:00
Eran Messeri
da707fa021 Merge "DPM: API review for installKeyPair" into pi-dev 
am: e5f9e833e5

Change-Id: Ia10366dca584cd9d92932f2dfd3cd59472ee078c
 2018-03-29 15:22:41 +00:00
Jeff Sharkey
c8156c6a52 Merge "API for granting/revoking runtime permissions." into pi-dev 2018-03-29 15:14:34 +00:00
Eran Messeri
e5f9e833e5 Merge "DPM: API review for installKeyPair" into pi-dev 2018-03-29 15:00:30 +00:00
Eran Messeri
2a9969780c Merge "Utilize verbose KeyChain errors" into pi-dev am: 8e07a26233 
am: f4dfc116a1

Change-Id: I0754008088afc7bd1600247f583f339f2a3a040b
 2018-03-29 14:07:32 +00:00
Eran Messeri
f4dfc116a1 Merge "Utilize verbose KeyChain errors" into pi-dev 
am: 8e07a26233

Change-Id: I083045d1f78acd89f2bbd19aecaf00a1d9d704f0
 2018-03-29 13:54:23 +00:00
Artem Iglikov
1e1c28b8d4 Merge "Clear app data before full restore for specified packages" into pi-dev am: bb0bcc4460 
am: d723b5ea24

Change-Id: I551d4dc0cbc04e48daa2c636aa341e7775246ffa
 2018-03-29 13:47:34 +00:00
Artem Iglikov
d723b5ea24 Merge "Clear app data before full restore for specified packages" into pi-dev 
am: bb0bcc4460

Change-Id: I707a2f5fbe2d8c7bac2bc405e684016c61c2ddca
 2018-03-29 13:36:34 +00:00
TreeHugger Robot
8e07a26233 Merge "Utilize verbose KeyChain errors" into pi-dev 2018-03-29 13:31:14 +00:00
TreeHugger Robot
bb0bcc4460 Merge "Clear app data before full restore for specified packages" into pi-dev 2018-03-29 13:23:24 +00:00
Robert Berry
6d5544efe6 Add warning comment about serialization am: 52c15f1699 
am: f7a3d02464

Change-Id: Ib3e2c86f7ef41e57d4a3667cdab78c9c26d716d0
 2018-03-29 10:13:19 +00:00
Robert Berry
f7a3d02464 Add warning comment about serialization 
am: 52c15f1699

Change-Id: I88a9d84ba7d6cdfd030a8f308fafe40c161a9736
 2018-03-29 10:02:38 +00:00
Artem Iglikov
5b53875fdc 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
 2018-03-29 11:01:50 +01:00
Eran Messeri
6169239b94 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
 2018-03-29 10:58:20 +01:00
Benjamin Franz
3a4b29a897 Merge "Merge "Update to lock task features API" into pi-dev am: 3a5dabbb10" into pi-dev-plus-aosp 
am: 4a93e2f209

Change-Id: I76e34c49b4e8376d6c742b65c05e7c5f71f6bd58
 2018-03-29 09:48:32 +00:00
Robert Berry
52c15f1699 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
 2018-03-29 10:21:50 +01:00
Benjamin Franz
2916036e30 Merge "Update to lock task features API" into pi-dev 
am: 3a5dabbb10

Change-Id: Ie8a12a29bfca101d19d8ec104988633b7749bb5f
 2018-03-29 09:19:16 +00:00
Eran Messeri
f15d4f4dc5 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
 2018-03-29 10:14:25 +01:00
Benjamin Franz
3a5dabbb10 Merge "Update to lock task features API" into pi-dev 2018-03-29 09:02:17 +00:00
Eric Sandness
3ac79ce423 Merge "Permission Check For DPM Get IME API" into pi-dev am: 78931a0f95 
am: b2fed746d3

Change-Id: Iedb0ecaff232204c0b75817d2f37a9247e33d6b2
 2018-03-29 08:52:16 +00:00
Eric Sandness
b2fed746d3 Merge "Permission Check For DPM Get IME API" into pi-dev 
am: 78931a0f95

Change-Id: If81408f57757f1649b3355cc158a2539b33f646f
 2018-03-29 08:38:29 +00:00
Remi NGUYEN VAN
fef9ed59bb Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e am: aa20932ff1 
am: 62df0a68e0

Change-Id: Ieb25c41c651499fdd01225ae5ac21d95e3d823f5
 2018-03-29 08:38:20 +00:00
Eric Sandness
78931a0f95 Merge "Permission Check For DPM Get IME API" into pi-dev 2018-03-29 08:25:09 +00:00
Amith Yamasani
2188b5a808 Merge "Fallback to ML prediction after short ACTIVE states" into pi-dev am: 50c069e489 
am: 7bdf3c6155

Change-Id: I1d82151ac1c8ba69ad2ea4f6fbced714fd49ac4a
 2018-03-29 07:59:40 +00:00
Amith Yamasani
9a0c69859e Merge "Add slice pinning to list of reasons for usage" into pi-dev am: 37594c892d 
am: 93c6045a04

Change-Id: Idf5f7909f36650b8fb1939ff8f2ae7873a83e497
 2018-03-29 07:46:53 +00:00
Remi NGUYEN VAN
62df0a68e0 Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e 
am: aa20932ff1

Change-Id: I016722f3a0ae2ae0a1d48bfacc4fe07ee3578ef7
 2018-03-29 07:46:34 +00:00
Remi NGUYEN VAN
aa20932ff1 Merge "Fix network usage stats on 464xlat tethered." 
am: 83088dcd8e

Change-Id: I0e13c2a6b9f6b5d0701a073ddc835781d5d2aace
 2018-03-29 07:36:21 +00:00
Mathew Inwood
fe930f2023 Merge "Configurable hidden API exemptions." into pi-dev 2018-03-29 06:49:27 +00:00
Julia Reynolds
026b9375d3 Merge "Properly filter alert window notifications" into pi-dev am: cfa0f19fa1 
am: 2bc9e4fdf3

Change-Id: Ia33b9dfe1399a7a787b6aa467edb9a7b74bde4be
 2018-03-29 06:33:52 +00:00
Amith Yamasani
7bdf3c6155 Merge "Fallback to ML prediction after short ACTIVE states" into pi-dev 
am: 50c069e489

Change-Id: Idd2b0abba22ec10e263fe3ab49ecc7346b9bc941
 2018-03-29 06:18:19 +00:00
Amith Yamasani
93c6045a04 Merge "Add slice pinning to list of reasons for usage" into pi-dev 
am: 37594c892d

Change-Id: I90264decb0d458dc084e3c484a6716058ca58a63
 2018-03-29 06:04:08 +00:00
Remi NGUYEN VAN
83088dcd8e Merge "Fix network usage stats on 464xlat tethered." 2018-03-29 06:04:02 +00:00
Vishwath Mohan
28bdbdd24f Merge "Clear pattern on completion (if fade is enabled)." into pi-dev am: 9cfdcfaf92 
am: 4cf06ff0ad

Change-Id: Idaf391f185e528416d9b2cc492582d8e014d041c
 2018-03-29 06:03:48 +00:00
TreeHugger Robot
50c069e489 Merge "Fallback to ML prediction after short ACTIVE states" into pi-dev 2018-03-29 06:03:17 +00:00
TreeHugger Robot
37594c892d Merge "Add slice pinning to list of reasons for usage" into pi-dev 2018-03-29 05:51:24 +00:00
TreeHugger Robot
4f52f3fd52 Merge "Bluetooth HIDD: Remove unplug()" into pi-dev 2018-03-29 04:23:46 +00:00
Hansong Zhang
c729b20cbf Merge "Bluetooth HIDD: Remove unplug()" am: 18aa649b8f am: d8ae68626f 
am: 923f5cf935

Change-Id: Ia27508b98e53bd03140dab7ac26db2a5eba847c3
 2018-03-29 04:10:47 +00:00
Julia Reynolds
2bc9e4fdf3 Merge "Properly filter alert window notifications" into pi-dev 
am: cfa0f19fa1

Change-Id: I2eda66d48b148156f8e6b2dc0a29bd1256ffbc16
 2018-03-29 04:03:50 +00:00
TreeHugger Robot
cfa0f19fa1 Merge "Properly filter alert window notifications" into pi-dev 2018-03-29 03:50:31 +00:00
Ricky Wai
992b6136d1 Merge "Add adb command to force generate network watchlist report for testing" into pi-dev am: b0558905c5 
am: e11325abb3

Change-Id: Id58a31c7362b3eb4c046103e58c4a31daba54f68
 2018-03-29 03:34:21 +00:00
Mady Mellor
6fe6f1dea3 Merge "Fix keywords hint and add some hints and a subtype to Slice" into pi-dev am: 822dfea6ca 
am: e9761dcc70

Change-Id: I9c1333a8e36d37c7bc16cda7df6e2dce72940dfd
 2018-03-29 03:29:10 +00:00
Michael Wachenschwanz
ba6675be03 Merge "Change MeteredDataDisabled function names for clarity" into pi-dev am: 631f55ba54 
am: b98ecddeba

Change-Id: Ic060c174eee29ec80d73382dc137c4a4989c84e2
 2018-03-29 02:28:30 +00:00
Vishwath Mohan
4cf06ff0ad Merge "Clear pattern on completion (if fade is enabled)." into pi-dev 
am: 9cfdcfaf92

Change-Id: I813f75dd452e1401bbaf89e18f05ae7204aaff46
 2018-03-29 02:13:10 +00:00
Hansong Zhang
923f5cf935 Merge "Bluetooth HIDD: Remove unplug()" am: 18aa649b8f 
am: d8ae68626f

Change-Id: Iacdbc31172e87621127d66e8214307a14ab76499
 2018-03-29 01:43:24 +00:00
Hansong Zhang
d8ae68626f Merge "Bluetooth HIDD: Remove unplug()" 
am: 18aa649b8f

Change-Id: I2daad6cc9185c1d81dad440574e392752bece7fd
 2018-03-29 01:28:41 +00:00
Chet Haase
25886a160b Fix bug and docs assuming progressBar min is 0 instead of getMin() 
This code and docs predates the existence of get/setMin() on ProgressBar,
should have been updated when we introduced the new min property.

Test: Ran TalkBack
Bug: 74357845
Change-Id: I318f26bb8ecacc5ecdbf7d026d8568f871cf2369
 2018-03-28 18:26:53 -07:00
Android Build Merger (Role)
346b15483d Merge "Merge "docs: fixed a couple of typos" into oc-mr1-dev am: 651ffd426c am: 9a2d959eff am: affc3087f5" 2018-03-29 01:25:19 +00:00