Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286

Browse Source 
Change-Id: Ic3796cc42e2ce78558fe47cff83e19d1aa52cea1
This commit is contained in:
Android Build Merger (Role)
2018-04-09 20:17:09 +00:00
parent 019eec3923 d6b6319286
commit 73fcfd424e
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/AndroidManifest.xml
View File

@@ -1469,6 +1469,11 @@
<permission android:name="android.permission.GET_PACKAGE_IMPORTANCE" <permission android:name="android.permission.GET_PACKAGE_IMPORTANCE"
android:protectionLevel="signature|privileged" /> 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 --> <!-- Permissions affecting the display of other applications -->
<!-- ================================== --> <!-- ================================== -->

1
packages/SystemUI/AndroidManifest.xml
View File

@@ -81,6 +81,7 @@
<uses-permission android:name="android.permission.GET_TOP_ACTIVITY_INFO" /> <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.MANAGE_ACTIVITY_STACKS" />
<uses-permission android:name="android.permission.START_TASKS_FROM_RECENTS" /> <uses-permission android:name="android.permission.START_TASKS_FROM_RECENTS" />
<uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT" />
<!-- WindowManager --> <!-- WindowManager -->
<uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" /> <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" />

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -6880,6 +6880,8 @@ public final class ActivityManagerService extends ActivityManagerNative
@Override @Override
public Intent getIntentForIntentSender(IIntentSender pendingResult) { public Intent getIntentForIntentSender(IIntentSender pendingResult) {
enforceCallingPermission(Manifest.permission.GET_INTENT_SENDER_INTENT,
"getIntentForIntentSender()");
if (!(pendingResult instanceof PendingIntentRecord)) { if (!(pendingResult instanceof PendingIntentRecord)) {
return null; return null;
} }