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

Commit 32454777 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Fix more crashes during partial telephony stack boot - round 2 

Bug: 331855229
Flag: EXEMPT bugfix
Test: atest CarWatchdogManagerTest
      on aosp_cf_x86_64_only_phone-trunk_staging-userdebug
Change-Id: I56d3742b480429a6fc9471231db9d85161e841dc
parent bb6ecce8

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -1893,7 +1893,10 @@ public class SubscriptionManagerService extends ISub.Stub { 
                    + "carrier privilege");

        }



        if (!mContext.getResources().getBoolean(

                    com.android.internal.R.bool.config_force_phone_globals_creation)) {

            enforceTelephonyFeatureWithException(callingPackage, "getAllSubInfoList");

        }



        return getSubscriptionInfoStreamAsUser(BINDER_WRAPPER.getCallingUserHandle())

                // callers have READ_PHONE_STATE or READ_PRIVILEGED_PHONE_STATE can get a full