diff options
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index bb6bb4b82ceb..71c039b0d4a6 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1456,6 +1456,11 @@ <permission android:name="android.permission.GET_PACKAGE_IMPORTANCE" android:protectionLevel="signature|privileged" /> + <!-- Allows use of PendingIntent.getIntent(). + @hide --> + <permission android:name="android.permission.GET_INTENT_SENDER_INTENT" + android:protectionLevel="signature" /> + <!-- ================================== --> <!-- Permissions affecting the display of other applications --> <!-- ================================== --> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 80f4d4cea0be..076fffa29277 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -81,6 +81,7 @@ <uses-permission android:name="android.permission.GET_TOP_ACTIVITY_INFO" /> <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS" /> <uses-permission android:name="android.permission.START_TASKS_FROM_RECENTS" /> + <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT" /> <!-- WindowManager --> <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" /> diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ce0670e0f4ba..08f54af30d2f 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -6880,6 +6880,8 @@ public final class ActivityManagerService extends ActivityManagerNative @Override public Intent getIntentForIntentSender(IIntentSender pendingResult) { + enforceCallingPermission(Manifest.permission.GET_INTENT_SENDER_INTENT, + "getIntentForIntentSender()"); if (!(pendingResult instanceof PendingIntentRecord)) { return null; } |