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

Merge "[NMS] Call isServiceTokenValidLocked with lock." am: e672a9336d am: ce72fe3c63 am: c56e259f16 am: c6da507a0b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128209

Change-Id: I9f373232288e3591888f6b58cade183920d2bdd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2022-07-26 12:53:16 +00:00
committed by Automerger Merge Worker
parent 4053c92704 c6da507a0b
commit aa110a2e3b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9925,10 +9925,16 @@ public class NotificationManagerService extends SystemService {
* given NAS is bound in. * given NAS is bound in.
*/ */
private boolean isInteractionVisibleToListener(ManagedServiceInfo info, int userId) { private boolean isInteractionVisibleToListener(ManagedServiceInfo info, int userId) {
boolean isAssistantService = mAssistants.isServiceTokenValidLocked(info.service); boolean isAssistantService = isServiceTokenValid(info.service);
return !isAssistantService || info.isSameUser(userId); return !isAssistantService || info.isSameUser(userId);
} }
private boolean isServiceTokenValid(IInterface service) {
synchronized (mNotificationLock) {
return mAssistants.isServiceTokenValidLocked(service);
}
}
private boolean isPackageSuspendedForUser(String pkg, int uid) { private boolean isPackageSuspendedForUser(String pkg, int uid) {
final long identity = Binder.clearCallingIdentity(); final long identity = Binder.clearCallingIdentity();
int userId = UserHandle.getUserId(uid); int userId = UserHandle.getUserId(uid);
@@ -11190,7 +11196,7 @@ public class NotificationManagerService extends SystemService {
BackgroundThread.getHandler().post(() -> { BackgroundThread.getHandler().post(() -> {
if (info.isSystem if (info.isSystem
|| hasCompanionDevice(info) || hasCompanionDevice(info)
|| mAssistants.isServiceTokenValidLocked(info.service)) { || isServiceTokenValid(info.service)) {
notifyNotificationChannelChanged( notifyNotificationChannelChanged(
info, pkg, user, channel, modificationType); info, pkg, user, channel, modificationType);
} }