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

Merge "Check uid for notification policy access." into nyc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2016-07-18 13:16:15 +00:00
committed by Android (Google) Code Review
parent 9d3bc86207 c68ef58c94
commit 8f17d2a48b
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

@@ -1983,6 +1983,7 @@ public class NotificationManagerService extends SystemService {
android.Manifest.permission.MANAGE_NOTIFICATIONS)) { android.Manifest.permission.MANAGE_NOTIFICATIONS)) {
return; return;
} }
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");
@@ -3643,6 +3644,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(