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

13335 Commits

Author SHA1 Message Date
Rubin Xu
f24d22c1e0 Merge "Remove password blacklist API" into pi-dev am: 69196f6fad 
am: 73ebccace2

Change-Id: I785df4a0158c62a358c0f1d1cff95eb2e75d91fc
 2018-03-30 18:23:44 +00:00
Makoto Onuki
c2b812647c Merge "AppStandby exemption: sync requested by FG apps" into pi-dev am: 929ce0086a 
am: b819348712

Change-Id: I3efc9b914a4654d77f6a17033bb88c45a7f28a1b
 2018-03-30 15:30:20 +00:00
Erik Wolsheimer
fbf842dc91 Merge "Return PERMISSION_DENIED instead of NPE when missing ActivityManager" into pi-dev am: dedc5d7141 
am: d1981d6fb6

Change-Id: I8213e9dcf2103e48cc3f8013ddde3ca63f804564
 2018-03-30 15:25:44 +00:00
Makoto Onuki
b819348712 Merge "AppStandby exemption: sync requested by FG apps" into pi-dev 
am: 929ce0086a

Change-Id: If4d60cefecf3a469ce9a7fbb2690f5120f77b858
 2018-03-30 14:48:06 +00:00
Erik Wolsheimer
d1981d6fb6 Merge "Return PERMISSION_DENIED instead of NPE when missing ActivityManager" into pi-dev 
am: dedc5d7141

Change-Id: I1515bf52b3561e7ce2c66adb8a4a9f87f0e012c7
 2018-03-30 14:43:17 +00:00
Rubin Xu
69196f6fad Merge "Remove password blacklist API" into pi-dev 2018-03-30 13:38:31 +00:00
Julia Reynolds
a7336274d7 Merge changes I3e542532,Id8f2147f into pi-dev am: 68256e09d9 
am: 9472db8d0d

Change-Id: I72b6c1ccd2611b7327f202ae6912d7e56f560d1d
 2018-03-30 11:27:50 +00:00
Julia Reynolds
9472db8d0d Merge changes I3e542532,Id8f2147f into pi-dev 
am: 68256e09d9

Change-Id: Iffa80c2254d25336d52c0f502b4c050c9c448581
 2018-03-30 10:54:11 +00:00
Remi NGUYEN VAN
bd2c0fa813 Merge "Allow null subscriberId in NetworkStatsManager." into pi-dev 2018-03-30 07:39:23 +00:00
Remi NGUYEN VAN
786b7ad260 Allow null subscriberId in NetworkStatsManager. 
Use a MATCH_MOBILE_WILDCARD template to avoid filtering by
subscriberId when querying statistics from NetworkStatsService.

Bug: 74038898
Change-Id: I8296220472a9ba37044dd1a5ede9bdb45d3ed339
Fixes: 74038898
Test: runtest frameworks-net, CTS tests pass
Merged-In: I1e4e283c6eaecf33d12488e41e0c524f6ff83954
Merged-In: Ia84d2c7cc63bf8b8bf30f133e0382fd7103bf490
(cherry-picked from aosp I4b39e7031416cb33b23d89aa36ff0f774eaa942f)
 2018-03-30 12:18:23 +09:00
TreeHugger Robot
929ce0086a Merge "AppStandby exemption: sync requested by FG apps" into pi-dev 2018-03-30 01:26:35 +00:00
TreeHugger Robot
dedc5d7141 Merge "Return PERMISSION_DENIED instead of NPE when missing ActivityManager" into pi-dev 2018-03-30 01:26:27 +00:00
yuemingw
c4eec5e09b Merge "Merge "Allow PO to call setSystemSetting." into pi-dev am: 04446f9f68" into pi-dev-plus-aosp 
am: 07d5ba249c

Change-Id: Ia058b8d9d08b5874a7be97a3813de932df679b4a
 2018-03-30 01:13:13 +00:00
TreeHugger Robot
68256e09d9 Merge changes I3e542532,Id8f2147f into pi-dev 
* changes:
  Update notification blocking documentation.
  Wait before computing contact affinity
 2018-03-30 00:10:22 +00:00
Mady Mellor
26c60bd567 Merge "Add permission hint, update permission slice structure" into pi-dev am: 92006c1764 
am: fc124567dd

Change-Id: Ibe672c83e4731a01e44d821ad209a4a8864fef42
 2018-03-29 23:44:57 +00:00
Erik Wolsheimer
e21576fd28 Return PERMISSION_DENIED instead of NPE when missing ActivityManager 
Bug: 75005160
Change-Id: I710c5ee9f3d679240bf708102ef508041d0a3122
 2018-03-29 23:34:10 +00:00
yuemingw
c915a909b7 Merge "Allow PO to call setSystemSetting." into pi-dev 
am: 04446f9f68

Change-Id: Ib0fe1542e76c862a5b6c1f7652dd5d5ded29b122
 2018-03-29 23:32:18 +00:00
TreeHugger Robot
04446f9f68 Merge "Allow PO to call setSystemSetting." into pi-dev 2018-03-29 22:24:25 +00:00
Mady Mellor
fc124567dd Merge "Add permission hint, update permission slice structure" into pi-dev 
am: 92006c1764

Change-Id: I3c0a31b24fa9e37b5a5bee384578ac4ad2c4ed9f
 2018-03-29 22:22:51 +00:00
Makoto Onuki
75ad2496eb AppStandby exemption: sync requested by FG apps 
Bug: 72443754
Fix: 72443754

Test: atest ${ANDROID_BUILD_TOP}/frameworks/base/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java
Test: Manual test with contacts sync:

Precondition: Put the contacts sync in RARE bucket.

adb shell dumpsys deviceidle tempwhitelist -r com.google.android.syncadapters.contacts
adb shell am make-uid-idle com.google.android.syncadapters.contacts
adb shell am set-standby-bucket com.google.android.syncadapters.contacts 40

Test 1: Toggle contacts sync from the Settings -> Account

- Make sure a sync happens.

Test 2: Mutate a contact on the WEB

- Sync is scheduled, but won't run because it has no network access.
- am set-standby-bucket com.google.android.syncadapters.contacts 30
- Sync run runs.

Test 3. adb shell requestsync -n ACCOUNT -t com.google -a com.android.contacts

- Sync is scheduled but won't run.

Test 4. adb shell requestsync -n ACCOUNT -t com.google -a com.android.contacts -f

- Sync is scheduled but it still won't run.

Test 5. adb shell requestsync -n ACCOUNT -t com.google -a com.android.contacts -F

- Sync now runs

Change-Id: I1eb972ed321d2a1a782ae23ccb806671926d3e6b
 2018-03-29 14:53:02 -07:00
TreeHugger Robot
92006c1764 Merge "Add permission hint, update permission slice structure" into pi-dev 2018-03-29 21:29:07 +00:00
Julia Reynolds
8d2b053611 Update notification blocking documentation. 
Change-Id: I3e5425321d127fbf11adfa1c4ac5bed53fc73e03
Fixes: 73750866
Test: make
 2018-03-29 16:39:06 -04:00
yuemingw
c0281f10f5 Allow PO to call setSystemSetting. 
As system setting is per user, we should allow PO to call it.

Bug: 77204777
Test: runtest -x services/tests/servicestests/src/
com/android/server/devicepolicy/DevicePolicyManagerTest.java

Change-Id: I84152fa04adb441955b48b676be6e792134b52c2
 2018-03-29 20:23:52 +00:00
Rubin Xu
3a021b3762 Remove password blacklist API 
Bug: 73750934
Test: compiles
Change-Id: I4a73ea47285b7d0be06f84d45a5166a6642c29cf
 2018-03-29 20:36:51 +01: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
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
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
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
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
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
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
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