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

Merge \\\"Check caller\\\'s uid before allowing notification policy access.\\\" into mnc-dev am: 234e1c25e4 am: 8e8bb6633c

Browse Source 
am: 5c6db3af89

Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519
This commit is contained in:
Julia Reynolds
2016-07-15 14:17:56 +00:00
committed by android-build-merger
parent ff58d7c918 5c6db3af89
commit e1d8b98189
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -1643,6 +1643,7 @@ public class NotificationManagerService extends SystemService {
} }
private void enforcePolicyAccess(String pkg, String method) { private void enforcePolicyAccess(String pkg, String method) {
checkCallerIsSameApp(pkg);
if (!checkPolicyAccess(pkg)) { if (!checkPolicyAccess(pkg)) {
Slog.w(TAG, "Notification policy access denied calling " + method); Slog.w(TAG, "Notification policy access denied calling " + method);
throw new SecurityException("Notification policy access denied"); throw new SecurityException("Notification policy access denied");
@@ -3131,6 +3132,10 @@ public class NotificationManagerService extends SystemService {
if (isCallerSystem()) { if (isCallerSystem()) {
return; return;
} }
checkCallerIsSameApp(pkg);
}
private static void checkCallerIsSameApp(String pkg) {
final int uid = Binder.getCallingUid(); final int uid = Binder.getCallingUid();
try { try {
ApplicationInfo ai = AppGlobals.getPackageManager().getApplicationInfo( ApplicationInfo ai = AppGlobals.getPackageManager().getApplicationInfo(