Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
490,938 Commits 3 Branches 0 Tags
34e00d9adbfae4cb6dbde253b69147dd397f220b
Commit Graph

9227 Commits

Author SHA1 Message Date
Sarah Chin
0f871decb2 Merge "Remove Mainline APIs for MmsManger and TelephonyManager" into rvc-dev am: 91604c2138 am: 701f4bedb7 am: 8c876265e3 am: bc8df91496 
Change-Id: I8b2e7d1bf01b9bc99f1de514454cd8efba8a5908
 2020-03-19 00:23:21 +00:00
Sarah Chin
91604c2138 Merge "Remove Mainline APIs for MmsManger and TelephonyManager" into rvc-dev 2020-03-18 23:15:16 +00:00
Eugene Susla
0481fe2342 Merge "Rename auto-revoke manifest flags to not contain "Dont"" into rvc-dev am: 733a81b9f7 am: b153c4dd0a am: bf14f7d5b4 am: 197a6d4727 
Change-Id: I34796f401ef54aff243e14b28d5f7212618f557b
 2020-03-18 22:53:29 +00:00
TreeHugger Robot
c3752e30f0 Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" into rvc-dev 2020-03-18 22:23:22 +00:00
Eugene Susla
bf14f7d5b4 Merge "Rename auto-revoke manifest flags to not contain "Dont"" into rvc-dev am: 733a81b9f7 am: b153c4dd0a 
Change-Id: I369f7357c985446ef462d62730a646b6d3243d86
 2020-03-18 22:14:07 +00:00
Eugene Susla
733a81b9f7 Merge "Rename auto-revoke manifest flags to not contain "Dont"" into rvc-dev 2020-03-18 21:46:40 +00:00
Sarah Chin
8ac7ce5a5d Remove Mainline APIs for MmsManger and TelephonyManager 
Test: build
Bug: 144004293
Bug: 147611125
Change-Id: I44682d1f33eee02d1dcf57f4de8ce2df0a9b126d
 2020-03-18 14:28:06 -07:00
Yurii Zubrytskyi
75674be988 Merge "Removing race condition accessing shared binder object." into rvc-dev am: 1d6e6bfe96 am: 92a23de26f am: 592fe5d0ef am: bd0f07a650 
Change-Id: Ie789e954d3373a0d24a73f50eee57a2774ea5edd
 2020-03-18 20:21:29 +00:00
Amit Mahajan
da359f6747 Merge changes from topic "Remove telephony protection level" into rvc-dev am: 0ed16d7b4b am: 86baf0e5bd am: b4d5fecc2f am: c0c199dbaa 
Change-Id: Ia07892286894d3c0f5b91126fefc940073115e68
 2020-03-18 20:18:36 +00:00
Amit Mahajan
9e9f7a6e93 Revert "Expose ACTION_USER_SWITCHED as system API" 
This reverts commit ffe0cbe5ca.

Reason for revert: Not needed for now; will be redone in S.

Bug: 148180958
Merged-in: I426e00e1eb79af5b520fc8c59439614459720fa6
Change-Id: I426e00e1eb79af5b520fc8c59439614459720fa6
(cherry picked from commit 5a29b0447b)
 2020-03-18 13:02:27 -07:00
Yurii Zubrytskyi
92a23de26f Merge "Removing race condition accessing shared binder object." into rvc-dev am: 1d6e6bfe96 
Change-Id: I667d3e7a0043d98085e07bcc9ddf0de3916a0b8b
 2020-03-18 19:58:32 +00:00
Yurii Zubrytskyi
1d6e6bfe96 Merge "Removing race condition accessing shared binder object." into rvc-dev 2020-03-18 19:54:55 +00:00
Amit Mahajan
86baf0e5bd Merge changes from topic "Remove telephony protection level" into rvc-dev am: 0ed16d7b4b 
Change-Id: If4e18fe057a500863cbd62db7bcd68be05bd0d6d
 2020-03-18 19:42:35 +00:00
Amit Mahajan
0ed16d7b4b Merge changes from topic "Remove telephony protection level" into rvc-dev 
* changes:
  Remove telephony protection level.
  Revert "Allowed telephony to bind network service"
  Revert "add telephony role to some permissions needed by telephony module"
 2020-03-18 19:22:36 +00:00
Daniel Colascione
b6b699b7fc Merge changes from topic "cache-cork" 
* changes:
  Cork permission and package cache around bulk permission update
  Cork package information cache invalidations during boot
  Add a "cork" mechanism to prevent cache invalidation flooding
  Add TODO for resolving property-set race
 2020-03-18 17:11:01 +00:00
Amit Mahajan
8cd4b39be7 Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" am: 0aa828ab5d am: a558fae2e7 am: 20054220be am: ba36f724cc am: c60dafafd6 
Change-Id: Iafc33ada9b53e2f054d0de248653f422617e838e
 2020-03-18 16:31:10 +00:00
Amit Mahajan
20054220be Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" am: 0aa828ab5d am: a558fae2e7 
Change-Id: Id8dc85c76023473413be799e079d91b10e67babf
 2020-03-18 16:05:51 +00:00
Alex Buynytskyy
b6e02f7b09 Removing race condition accessing shared binder object. 
Test: incrementally installing two apks at the same time
Bug: b/150411019
Change-Id: I81231edf7a32470542ec529aa305b4f9fb2b80e3
 2020-03-18 09:01:36 -07:00
Amit Mahajan
0aa828ab5d Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" 2020-03-18 15:31:08 +00:00
Mehdi Alizadeh
ae601ca321 Merge changes Ibfb3cf6f,I9a4bd220 into rvc-dev am: f9275345db am: 8ccb4d3768 am: e39ed5d0f9 am: a8d819f20e 
Change-Id: I745353af366f242438227063d52ccb19ff9ff11f
 2020-03-18 04:09:31 +00:00
Mehdi Alizadeh
f9275345db Merge changes Ibfb3cf6f,I9a4bd220 into rvc-dev 
* changes:
  Load Uri based shortcut drawable in LauncherApps
  Adds icon URI field to shortcutInfo
 2020-03-18 02:59:03 +00:00
Eugene Susla
1f466ece61 Rename auto-revoke manifest flags to not contain "Dont" 
Fixes: 151311445
Test: presubmit
Change-Id: Idc78c35acef6828ac21f0d651a6d8efbc5094872
 2020-03-17 17:42:40 -07:00
Amit Mahajan
5a29b0447b Revert "Expose ACTION_USER_SWITCHED as system API" 
This reverts commit ffe0cbe5ca.

Reason for revert: Not needed for now; will be redone in S.

Bug: 148180958
Change-Id: I426e00e1eb79af5b520fc8c59439614459720fa6
 2020-03-18 00:19:53 +00:00
Mehdi Alizadeh
98ffa48a7a Load Uri based shortcut drawable in LauncherApps 
Bug: 143106625
Test: Manual test by publishing shortcuts with uri icons in a sample app
Test: atest com.android.server.pm.ShortcutManagerTest1 \
            com.android.server.pm.ShortcutManagerTest2 \
            com.android.server.pm.ShortcutManagerTest3 \
            com.android.server.pm.ShortcutManagerTest4 \
            com.android.server.pm.ShortcutManagerTest5 \
            com.android.server.pm.ShortcutManagerTest6 \
            com.android.server.pm.ShortcutManagerTest7 \
            com.android.server.pm.ShortcutManagerTest8 \
            com.android.server.pm.ShortcutManagerTest9 \
            com.android.server.pm.ShortcutManagerTest10

Change-Id: Ibfb3cf6f7dabdeed36b845ab6e026506978d972a
 2020-03-17 15:43:01 -07:00
Automerger Merge Worker
d0f59317ad Merge "Make LauncherApps#ShortcutQuery#setLocusId() public" into rvc-dev am: bcaa266fa7 am: adb0244865 am: 0d2d0634eb am: 05ec6c27e8 
Change-Id: I0227fa02fd1231df5e74e4702d8d97dfcabdaee1
 2020-03-17 17:47:03 +00:00
Mehdi Alizadeh
bcaa266fa7 Merge "Make LauncherApps#ShortcutQuery#setLocusId() public" into rvc-dev 2020-03-17 17:02:39 +00:00
Mehdi Alizadeh
cc051d4d5e Make LauncherApps#ShortcutQuery#setLocusId() public 
Bug: 150219458
Test: atest com.android.server.pm.ShortcutManagerTest1 \
            com.android.server.pm.ShortcutManagerTest2 \
            com.android.server.pm.ShortcutManagerTest3 \
            com.android.server.pm.ShortcutManagerTest4 \
            com.android.server.pm.ShortcutManagerTest5 \
            com.android.server.pm.ShortcutManagerTest6 \
            com.android.server.pm.ShortcutManagerTest7 \
            com.android.server.pm.ShortcutManagerTest8 \
            com.android.server.pm.ShortcutManagerTest9 \
            com.android.server.pm.ShortcutManagerTest10
Test: atest DataManagerTest
Change-Id: I546e12ac57db76ec40dc25316168c19e76393e20
 2020-03-16 14:12:08 -07:00
Automerger Merge Worker
ffb0ab1706 Merge "Merge "Remove @SystemApi from some constants for R." into rvc-dev am: c48113aa14 am: 6f94e125e2" into rvc-d1-dev-plus-aosp am: f9e18c902f am: 5e5e66e1c3 
Change-Id: I97dfde23de9b36502a2db52cc02c2f21c0aad9f9
 2020-03-16 21:00:50 +00:00
Amit Mahajan
c48113aa14 Merge "Remove @SystemApi from some constants for R." into rvc-dev 2020-03-16 20:35:00 +00:00
Automerger Merge Worker
ebd01a9bd2 Merge "Add a new test API for getting the list of approved rule providers." into rvc-dev am: 74739ff81b am: 2995e71682 am: b4f850e5ef am: b07b772709 
Change-Id: If491a8dd91d1d364c27a80fbf4875283c0478ae6
 2020-03-16 13:55:33 +00:00
TreeHugger Robot
74739ff81b Merge "Add a new test API for getting the list of approved rule providers." into rvc-dev 2020-03-16 12:35:42 +00:00
Mehdi Alizadeh
f38f2c7ddb Adds icon URI field to shortcutInfo 
Bug: 143106625
Test: atest com.android.server.pm.ShortcutManagerTest1 \
            com.android.server.pm.ShortcutManagerTest2 \
            com.android.server.pm.ShortcutManagerTest3 \
            com.android.server.pm.ShortcutManagerTest4 \
            com.android.server.pm.ShortcutManagerTest5 \
            com.android.server.pm.ShortcutManagerTest6 \
            com.android.server.pm.ShortcutManagerTest7 \
            com.android.server.pm.ShortcutManagerTest8 \
            com.android.server.pm.ShortcutManagerTest9 \
            com.android.server.pm.ShortcutManagerTest10

Change-Id: I9a4bd2206084a20977a90ba13e3db8a76096910c
 2020-03-15 21:40:14 -07:00
Automerger Merge Worker
77a1268bf0 Merge "Introduce per-app API for installer whitelisting" into rvc-dev am: 41b448e39b am: 013e789208 am: c48dce6001 am: f825f8dfc9 
Change-Id: Id1b269b8e2d6e9708d19a13f700378f038284ca8
 2020-03-14 06:42:49 +00:00
Eugene Susla
41b448e39b Merge "Introduce per-app API for installer whitelisting" into rvc-dev 2020-03-14 05:43:11 +00:00
Eugene Susla
922cd08f62 Introduce per-app API for installer whitelisting 
Test: presubmit
Bug: 146513245
Change-Id: I5a4502aeb78d2e35209ed88312d24bcafbb4ba7c
 2020-03-13 22:09:22 -07:00
Automerger Merge Worker
2aedb9dc00 Merge "camera2: rename getConcurrentStreamingCameraIds() -> getConcurrentCameraIds()" into rvc-dev am: 6241aceae8 am: 2a84b5265d am: 6b6991c093 am: 460ff1fb2f 
Change-Id: Ic7e77e0a067a6d98dbc847f87b4b3b53bddfde07
 2020-03-14 02:35:58 +00:00
Automerger Merge Worker
c3fc5571cb Merge "Treat MODE_FOREGROUND as ALLOWED for appop checks" into rvc-dev am: c670246edb am: 2fbdb1b4fc am: 1a9ebdd9af am: 5d40fd2392 
Change-Id: I9e8ed47e10be2871dd95a36c13583822ba7e91cb
 2020-03-14 02:34:29 +00:00
Jayant Chowdhary
6241aceae8 Merge "camera2: rename getConcurrentStreamingCameraIds() -> getConcurrentCameraIds()" into rvc-dev 2020-03-14 01:44:50 +00:00
TreeHugger Robot
c670246edb Merge "Treat MODE_FOREGROUND as ALLOWED for appop checks" into rvc-dev 2020-03-14 01:34:04 +00:00
Philip P. Moltmann
e6c5650e88 Treat MODE_FOREGROUND as ALLOWED for appop checks 
noteOp always resolved MODE_FOREGROUND into IGNORED/ALLOWED
checkOp resolves it too, but checkOpRaw does not resolved it and might
return it.

Preflight checks should be independant of the uid state, hence treat
MODE_FOREGROUND similar to ALLOWED as MODE_FOREGROUND might allow it.

Bug: 150508177
Fixes: 148197098
Test: TH
Change-Id: I7b4f53c7ce638f92747d452f2d2f72d098e94b78
 2020-03-14 01:22:55 +00:00
Automerger Merge Worker
27d05a28b0 Add public API to check if current app is auto-revoke exempt am: 2ac02b0d3e am: a981a1ea8f am: 97894025f7 am: 796e23392f 
Change-Id: I0bacf01e59b893ca561fe30f39df16b32b2b76b0
 2020-03-13 23:43:48 +00:00
Automerger Merge Worker
25b986345f Merge "Introduce per-app manifest flags for autoRevoke" into rvc-dev am: ff17a587a8 am: 562f9120d4 am: 91b0359c49 am: 519938c97b 
Change-Id: If46d70a6a4e35deb4c5b0409aaad87f08c5603ef
 2020-03-13 23:43:30 +00:00
Eugene Susla
2ac02b0d3e Add public API to check if current app is auto-revoke exempt 
Test: presubmit
Bug: 146513245
Change-Id: I18ac5957eb9ae1ea0d7de2daf407e6d797079937
 2020-03-13 22:44:00 +00:00
Eugene Susla
ff17a587a8 Merge "Introduce per-app manifest flags for autoRevoke" into rvc-dev 2020-03-13 22:40:36 +00:00
Automerger Merge Worker
8e75f68968 Merge "Update reserved permission controller flags name" into rvc-dev am: a285890237 am: 94e881fd42 am: be859913ad am: 1128aad712 
Change-Id: Id975fe599f8190d057a3c1514d5b5b7b55c241fd
 2020-03-13 19:43:09 +00:00
Evan Severson
a285890237 Merge "Update reserved permission controller flags name" into rvc-dev 2020-03-13 18:30:25 +00:00
Eugene Susla
db77bc14de Introduce per-app manifest flags for autoRevoke 
This introduces extra attributes on <application/> tag corresponding to
requesting to be shown in UI for the user to disable auto-revoke
(allowDontAutoRevokePermissions)
and being whitelisted by the installer (dontAutoRevokePermissions)

Test: presubmit
Bug: 146513245
Change-Id: I07902632812b70ea418a667d343b74d7ae170bb9
 2020-03-13 11:23:26 -07:00
Amit Mahajan
c55b01552e Remove @SystemApi from some constants for R. 
These were exposed for telephony mainline. Will be revisited in S.

Test: basic sanity
Bug: 148171847
Bug: 148171388
Change-Id: Ibdcac557cf35e723f09a7b7a2e59c7deae1fc94e
 2020-03-13 10:44:27 -07:00
Automerger Merge Worker
25de7d1ed6 Merge "Add window layout affinity." into rvc-dev am: 7fcb7d59c4 am: 807b8e42df am: 3d0ba25d61 am: a24ecf75a0 
Change-Id: I603abe4ab9a8008e3b169d89a3b5933d562a349b
 2020-03-13 17:07:59 +00:00
Garfield Tan
7fcb7d59c4 Merge "Add window layout affinity." into rvc-dev 2020-03-13 16:16:18 +00:00