Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 145c4b66 authored by Ayush Sharma's avatar Ayush Sharma Committed by Android (Google) Code Review
Browse files

Merge "Handle null component name for default sms app" into main

parents c1e967be 59facef6

services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java

+3 −3
Original line number Diff line number Diff line
@@ -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);

        }