Protect all calls to mShortcutHelper with null check
Test: atest NotificationManagerServiceTest
Fixes: 152460522
Change-Id: I68fab6c0f857f222b15dbe552d10ee458402d987
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 4aeddc8..e8d8ed7 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -107,7 +107,6 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
-import android.annotation.UserIdInt;
import android.annotation.WorkerThread;
import android.app.ActivityManager;
import android.app.ActivityManagerInternal;
@@ -155,6 +154,7 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageManagerInternal;
import android.content.pm.ParceledListSlice;
+import android.content.pm.ShortcutInfo;
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.database.ContentObserver;
@@ -1730,6 +1730,11 @@
}
@VisibleForTesting
+ void setShortcutHelper(ShortcutHelper helper) {
+ mShortcutHelper = helper;
+ }
+
+ @VisibleForTesting
void setHints(int hints) {
mListenerHints = hints;
}
@@ -3459,10 +3464,14 @@
ArrayList<ConversationChannelWrapper> conversations =
mPreferencesHelper.getConversations(onlyImportant);
for (ConversationChannelWrapper conversation : conversations) {
- conversation.setShortcutInfo(mShortcutHelper.getValidShortcutInfo(
- conversation.getNotificationChannel().getConversationId(),
- conversation.getPkg(),
- UserHandle.of(UserHandle.getUserId(conversation.getUid()))));
+ if (mShortcutHelper == null) {
+ conversation.setShortcutInfo(null);
+ } else {
+ conversation.setShortcutInfo(mShortcutHelper.getValidShortcutInfo(
+ conversation.getNotificationChannel().getConversationId(),
+ conversation.getPkg(),
+ UserHandle.of(UserHandle.getUserId(conversation.getUid()))));
+ }
}
return new ParceledListSlice<>(conversations);
}
@@ -3482,10 +3491,14 @@
ArrayList<ConversationChannelWrapper> conversations =
mPreferencesHelper.getConversations(pkg, uid);
for (ConversationChannelWrapper conversation : conversations) {
- conversation.setShortcutInfo(mShortcutHelper.getValidShortcutInfo(
- conversation.getNotificationChannel().getConversationId(),
- pkg,
- UserHandle.of(UserHandle.getUserId(uid))));
+ if (mShortcutHelper == null) {
+ conversation.setShortcutInfo(null);
+ } else {
+ conversation.setShortcutInfo(mShortcutHelper.getValidShortcutInfo(
+ conversation.getNotificationChannel().getConversationId(),
+ pkg,
+ UserHandle.of(UserHandle.getUserId(uid))));
+ }
}
return new ParceledListSlice<>(conversations);
}
@@ -5680,8 +5693,10 @@
}
}
- r.setShortcutInfo(mShortcutHelper.getValidShortcutInfo(
- notification.getShortcutId(), pkg, user));
+ ShortcutInfo info = mShortcutHelper != null
+ ? mShortcutHelper.getValidShortcutInfo(notification.getShortcutId(), pkg, user)
+ : null;
+ r.setShortcutInfo(info);
if (!checkDisqualifyingFeatures(userId, notificationUid, id, tag, r,
r.getSbn().getOverrideGroupKey() != null)) {
@@ -6214,8 +6229,11 @@
cancelGroupChildrenLocked(r, mCallingUid, mCallingPid, listenerName,
mSendDelete, childrenFlagChecker);
updateLightsLocked();
- mShortcutHelper.maybeListenForShortcutChangesForBubbles(r, true /* isRemoved */,
- mHandler);
+ if (mShortcutHelper != null) {
+ mShortcutHelper.maybeListenForShortcutChangesForBubbles(r,
+ true /* isRemoved */,
+ mHandler);
+ }
} else {
// No notification was found, assume that it is snoozed and cancel it.
if (mReason != REASON_SNOOZED) {
@@ -6453,9 +6471,11 @@
+ n.getPackageName());
}
- mShortcutHelper.maybeListenForShortcutChangesForBubbles(r,
- false /* isRemoved */,
- mHandler);
+ if (mShortcutHelper != null) {
+ mShortcutHelper.maybeListenForShortcutChangesForBubbles(r,
+ false /* isRemoved */,
+ mHandler);
+ }
maybeRecordInterruptionLocked(r);
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
index f083f0e..f9596b5 100755
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
@@ -6504,4 +6504,19 @@
assertNull(conversations.get(0).getShortcutInfo());
assertNull(conversations.get(1).getShortcutInfo());
}
+
+ @Test
+ public void testShortcutHelperNull_doesntCrashEnqueue() throws RemoteException {
+ mService.setShortcutHelper(null);
+ NotificationRecord nr =
+ generateMessageBubbleNotifRecord(mTestNotificationChannel,
+ "testShortcutHelperNull_doesntCrashEnqueue");
+ try {
+ mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(),
+ nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId());
+ waitForIdle();
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+ }
}