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

Grant URI permissions to NotificationListenerServices when added.

Browse Source 
Bug: 162233630
Test: android.app.cts.NotificationManagerTest
Change-Id: I54b8aa8cf99e0713ee903bee00f5b6361b276608
This commit is contained in:
Jeff DeCew
2020-08-05 10:47:21 -04:00
parent e18f95849d
commit 41fe38a9e5
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9219,6 +9219,7 @@ public class NotificationManagerService extends SystemService {
final NotificationRankingUpdate update;
synchronized (mNotificationLock) {
update = makeRankingUpdateLocked(info);
grantUriPermissionsForActiveNotificationsLocked(info);
}
try {
listener.onListenerConnected(update);
@@ -9321,13 +9322,8 @@ public class NotificationManagerService extends SystemService {
// This notification became invisible -> remove the old one.
if (oldSbnVisible && !sbnVisible) {
final StatusBarNotification oldSbnLightClone = oldSbn.cloneLight();
mHandler.post(new Runnable() {
@Override
public void run() {
notifyRemoved(
info, oldSbnLightClone, update, null, REASON_USER_STOPPED);
}
});
mHandler.post(() -> notifyRemoved(
info, oldSbnLightClone, update, null, REASON_USER_STOPPED));
continue;
}
@@ -9337,18 +9333,39 @@ public class NotificationManagerService extends SystemService {
updateUriPermissions(r, old, info.component.getPackageName(), targetUserId);
final StatusBarNotification sbnToPost = trimCache.ForListener(info);
mHandler.post(new Runnable() {
@Override
public void run() {
notifyPosted(info, sbnToPost, update);
}
});
mHandler.post(() -> notifyPosted(info, sbnToPost, update));
}
} catch (Exception e) {
Slog.e(TAG, "Could not notify listeners for " + r.getKey(), e);
}
}
/**
* Synchronously grant permissions to Uris for all active and visible notifications to the
* NotificationListenerService provided.
*/
@GuardedBy("mNotificationLock")
private void grantUriPermissionsForActiveNotificationsLocked(ManagedServiceInfo info) {
try {
for (final NotificationRecord r : mNotificationList) {
// This notification isn't visible -> ignore.
if (!isVisibleToListener(r.getSbn(), info)) {
continue;
}
// If the notification is hidden, permissions are not required by the listener.
if (r.isHidden() && info.targetSdkVersion < Build.VERSION_CODES.P) {
continue;
}
// Grant access before listener is initialized
final int targetUserId = (info.userid == UserHandle.USER_ALL)
? UserHandle.USER_SYSTEM : info.userid;
updateUriPermissions(r, null, info.component.getPackageName(), targetUserId);
}
} catch (Exception e) {
Slog.e(TAG, "Could not grant Uri permissions to " + info.component, e);
}
}
/**
* asynchronously notify all listeners about a removed notification
*/