Snap for 8068644 from e04a51ce4930ff61604c7b640c6720ad42795267 to sc-v2-release
Change-Id: I78fefcfc57c7c2a158205fa42c2b00366ecc387c
diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp
index 9d5cbec..266e58c 100644
--- a/PermissionController/Android.bp
+++ b/PermissionController/Android.bp
@@ -71,6 +71,7 @@
android_app {
name: "PermissionController",
sdk_version: "system_current",
+ target_sdk_version: "system_current",
min_sdk_version: "30",
updatable: true,
privileged: true,
diff --git a/PermissionController/AndroidManifest.xml b/PermissionController/AndroidManifest.xml
index a6fee58..34a54ee 100644
--- a/PermissionController/AndroidManifest.xml
+++ b/PermissionController/AndroidManifest.xml
@@ -51,8 +51,6 @@
<uses-permission android:name="android.permission.START_VIEW_PERMISSION_USAGE" />
<uses-permission android:name="android.permission.MANAGE_APP_HIBERNATION" />
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
-
<application android:name="com.android.permissioncontroller.PermissionControllerApplication"
android:label="@string/app_name"
android:icon="@drawable/ic_permission_controller_app_icon"
@@ -71,13 +69,15 @@
android:exported="false"
android:multiprocess="true" />
- <receiver android:name="com.android.permissioncontroller.permission.service.LocationAccessCheck$SetupPeriodicBackgroundLocationAccessCheck">
+ <receiver android:name="com.android.permissioncontroller.permission.service.LocationAccessCheck$SetupPeriodicBackgroundLocationAccessCheck"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
- <receiver android:name="com.android.permissioncontroller.hibernation.HibernationOnBootReceiver">
+ <receiver android:name="com.android.permissioncontroller.hibernation.HibernationOnBootReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
@@ -87,7 +87,8 @@
<receiver android:name="com.android.permissioncontroller.permission.service.LocationAccessCheck$NotificationClickHandler" />
- <receiver android:name="com.android.permissioncontroller.permission.service.LocationAccessCheck$PackageResetHandler">
+ <receiver android:name="com.android.permissioncontroller.permission.service.LocationAccessCheck$PackageResetHandler"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.PACKAGE_FULLY_REMOVED"/>
<action android:name="android.intent.action.PACKAGE_DATA_CLEARED" />
@@ -108,6 +109,7 @@
<activity android:name="com.android.permissioncontroller.permission.ui.GrantPermissionsActivity"
android:configChanges="keyboardHidden|screenSize"
android:excludeFromRecents="true"
+ android:exported="true"
android:theme="@style/GrantPermissions.FilterTouches"
android:visibleToInstantApps="true"
android:inheritShowWhenLocked="true"
@@ -121,6 +123,7 @@
<activity android:name="com.android.permissioncontroller.permission.ui.ManagePermissionsActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/app_permissions"
+ android:exported="true"
android:theme="@style/Theme.PermissionController.Settings.FilterTouches"
android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">
<intent-filter android:priority="1">
@@ -137,6 +140,7 @@
<activity android:name="com.android.permissioncontroller.permission.ui.ManagePermissionsActivityTrampoline"
android:excludeFromRecents="true"
+ android:exported="true"
android:noHistory="true"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter android:priority="1">
@@ -154,6 +158,7 @@
<activity android:name="com.android.permissioncontroller.permission.ui.ReviewPermissionsActivity"
android:excludeFromRecents="true"
+ android:exported="true"
android:theme="@style/ReviewPermissions.FilterTouches"
android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">
<intent-filter android:priority="1">
@@ -172,6 +177,7 @@
<activity android:name="com.android.permissioncontroller.permission.ui.ReviewOngoingUsageActivity"
android:excludeFromRecents="true"
+ android:exported="true"
android:theme="@style/PermissionDialog"
android:launchMode="singleInstance"
android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS" >
@@ -183,6 +189,7 @@
<activity android:name="com.android.permissioncontroller.permission.ui.ReviewAccessibilityServicesActivity"
android:excludeFromRecents="true"
+ android:exported="true"
android:theme="@style/PermissionDialog.FilterTouches"
android:permission="android.permission.REVIEW_ACCESSIBILITY_SERVICES" >
<intent-filter android:priority="1">
@@ -193,6 +200,7 @@
<activity android:name="com.android.permissioncontroller.role.ui.RequestRoleActivity"
android:excludeFromRecents="true"
+ android:exported="true"
android:theme="@style/RequestRole.FilterTouches">
<intent-filter android:priority="1">
<action android:name="android.app.role.action.REQUEST_ROLE" />
@@ -210,6 +218,7 @@
<activity android:name="com.android.permissioncontroller.role.ui.DefaultAppListActivity"
android:label="@string/default_apps"
+ android:exported="true"
android:theme="@style/Theme.PermissionController.Settings.FilterTouches">
<intent-filter android:priority="2">
<action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
@@ -218,6 +227,7 @@
</activity>
<activity android:name="com.android.permissioncontroller.role.ui.DefaultAppActivity"
+ android:exported="true"
android:permission="android.permission.MANAGE_ROLE_HOLDERS"
android:theme="@style/Theme.PermissionController.Settings.FilterTouches">
<intent-filter android:priority="1">
@@ -229,6 +239,7 @@
<activity android:name="com.android.permissioncontroller.role.ui.HomeSettingsActivity"
android:excludeFromRecents="true"
android:noHistory="true"
+ android:exported="true"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter android:priority="2">
<action android:name="android.settings.HOME_SETTINGS" />
@@ -238,6 +249,7 @@
<activity android:name="com.android.permissioncontroller.role.ui.SpecialAppAccessListActivity"
android:label="@string/special_app_access"
+ android:exported="true"
android:permission="android.permission.MANAGE_ROLE_HOLDERS"
android:theme="@style/Theme.PermissionController.Settings.FilterTouches">
<intent-filter android:priority="1">
@@ -253,6 +265,7 @@
<activity android:name="com.android.permissioncontroller.role.ui.RoleSearchTrampolineActivity"
android:excludeFromRecents="true"
android:noHistory="true"
+ android:exported="true"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter android:priority="1">
<action android:name="com.android.permissioncontroller.settingssearch.action.MANAGE_DEFAULT_APP" />
@@ -283,6 +296,7 @@
</provider>
<service android:name="com.android.permissioncontroller.permission.service.PermissionControllerServiceImpl"
+ android:exported="true"
android:visibleToInstantApps="true">
<intent-filter android:priority="1">
<action android:name="android.permission.PermissionControllerService"/>
@@ -290,19 +304,22 @@
</service>
<service android:name="com.android.permissioncontroller.permission.service.RuntimePermissionPresenterServiceLegacyImpl"
+ android:exported="true"
android:permission="android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE">
<intent-filter android:priority="1">
<action android:name="android.permissionpresenterservice.RuntimePermissionPresenterService"/>
</intent-filter>
</service>
- <service android:name="com.android.permissioncontroller.role.service.RoleControllerServiceImpl">
+ <service android:name="com.android.permissioncontroller.role.service.RoleControllerServiceImpl"
+ android:exported="true">
<intent-filter android:priority="1">
<action android:name="android.app.role.RoleControllerService"/>
</intent-filter>
</service>
- <receiver android:name="com.android.permissioncontroller.role.service.ClearUserDeniedReceiver">
+ <receiver android:name="com.android.permissioncontroller.role.service.ClearUserDeniedReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.PACKAGE_DATA_CLEARED" />
<action android:name="android.intent.action.PACKAGE_FULLY_REMOVED"/>
diff --git a/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt b/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
index 6e0c12c..414ec52 100644
--- a/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
+++ b/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
@@ -568,8 +568,8 @@
flags = Intent.FLAG_ACTIVITY_NEW_TASK
}
val pendingIntent = PendingIntent.getActivity(this, 0, clickIntent,
- PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_UPDATE_CURRENT or
- PendingIntent.FLAG_IMMUTABLE)
+ PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_UPDATE_CURRENT or
+ PendingIntent.FLAG_IMMUTABLE)
var notifTitle: String
var notifContent: String
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/LocationAccessCheck.java b/PermissionController/src/com/android/permissioncontroller/permission/service/LocationAccessCheck.java
index 6ce0083..d1d6c03 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/LocationAccessCheck.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/LocationAccessCheck.java
@@ -604,7 +604,7 @@
.setColor(mContext.getColor(android.R.color.system_notification_accent_color))
.setAutoCancel(true)
.setDeleteIntent(getBroadcast(mContext, 0, deleteIntent,
- FLAG_ONE_SHOT | FLAG_UPDATE_CURRENT))
+ FLAG_ONE_SHOT | FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE))
.setContentIntent(getBroadcast(mContext, 0, clickIntent,
FLAG_ONE_SHOT | FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE));