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

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

Change-Id: Ia7b3527e2eb1d5908b987f308251c800338f1f93
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:30:30 +00:00
committed by Automerger Merge Worker
parent b79d3d1af9 c56e259f16
commit c6da507a0b
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

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