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

Commit f2aa53cc authored by Jordan Liu's avatar Jordan Liu
Browse files

Use SubscriptionId instead of SubId 

Use the renamed methods in ServiceStateTable which refer to
SubscriptionId instead of SubId.

Change-Id: Ic837535b431c19d952e065b742d678152afafd57
Fixes: 35766624
Test: Existing unit tests pass
parent c4a70ad0

src/java/com/android/internal/telephony/ServiceStateTracker.java

+4 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.internal.telephony;



import static android.provider.Telephony.ServiceStateTable.getContentValuesForServiceState;

import static android.provider.Telephony.ServiceStateTable.getUriForSubId;

import static android.provider.Telephony.ServiceStateTable.getUriForSubscriptionId;



import static com.android.internal.telephony.CarrierActionAgent.CARRIER_ACTION_SET_RADIO_ENABLED;
@@ -2849,7 +2849,8 @@ public class ServiceStateTracker extends Handler { 
            mPhone.notifyServiceStateChanged(mSS);



            // insert into ServiceStateProvider. This will trigger apps to wake through JobScheduler

            mPhone.getContext().getContentResolver().insert(getUriForSubId(mPhone.getSubId()),

            mPhone.getContext().getContentResolver()

                    .insert(getUriForSubscriptionId(mPhone.getSubId()),

                            getContentValuesForServiceState(mSS));



            TelephonyMetrics.getInstance().writeServiceStateChanged(mPhone.getPhoneId(), mSS);