diff options
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java b/services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java index 7483b43baf13..c7fd979908b9 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java @@ -202,9 +202,9 @@ public final class PersonalAppsSuspensionHelper { private String getDefaultSmsPackage() { //TODO(b/319449037): Unflag the following change. if (Flags.defaultSmsPersonalAppSuspensionFixEnabled()) { - return SmsApplication.getDefaultSmsApplicationAsUser( - mContext, /*updateIfNeeded=*/ false, mContext.getUser()) - .getPackageName(); + ComponentName defaultSmsApp = SmsApplication.getDefaultSmsApplicationAsUser( + mContext, /*updateIfNeeded=*/ false, mContext.getUser()); + return defaultSmsApp != null ? defaultSmsApp.getPackageName() : null; } else { return Telephony.Sms.getDefaultSmsPackage(mContext); } |