Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb76e24e authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be... 

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa47 am: d6b63192 am: 73fcfd42

Change-Id: I9719266bad39cd58527b0aaeec10b39a1eba3509
parents 9d13b0f6 73fcfd42

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -1464,6 +1464,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  -->

    <!-- ================================== -->

packages/SystemUI/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -6885,6 +6885,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;















        }