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

Commit bfa61814 authored by Peter Wang's avatar Peter Wang Committed by Android (Google) Code Review
Browse files

Merge "[Telephony Mainline] Refactored more service manager calls"

parents cbc5a98a 5dfd7a06

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+6 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import android.os.HandlerThread; 
import android.os.Message;

import android.os.PersistableBundle;

import android.os.RegistrantList;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.preference.PreferenceManager;
@@ -82,6 +81,7 @@ import android.telephony.ServiceState.RilRadioTechnology; 
import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.telephony.SubscriptionPlan;

import android.telephony.TelephonyFrameworkInitializer;

import android.telephony.TelephonyManager;

import android.telephony.cdma.CdmaCellLocation;

import android.telephony.data.ApnSetting;
@@ -950,7 +950,11 @@ public class DcTracker extends Handler { 


    // Turn telephony radio on or off.

    private void setRadio(boolean on) {

        final ITelephony phone = ITelephony.Stub.asInterface(ServiceManager.checkService("phone"));

        final ITelephony phone = ITelephony.Stub.asInterface(

                TelephonyFrameworkInitializer

                        .getTelephonyServiceManager()

                        .getTelephonyServiceRegisterer()

                        .get());

        try {

            phone.setRadio(on);

        } catch (Exception e) {

src/java/com/android/internal/telephony/euicc/EuiccCardController.java

+5 −2
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ import android.content.pm.ComponentInfo; 
import android.os.Binder;

import android.os.Handler;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.service.euicc.EuiccProfileInfo;

import android.telephony.TelephonyFrameworkInitializer;

import android.telephony.TelephonyManager;

import android.telephony.euicc.EuiccCardManager;

import android.telephony.euicc.EuiccNotification;
@@ -108,7 +108,10 @@ public class EuiccCardController extends IEuiccCardController.Stub { 


    private EuiccCardController(Context context) {

        this(context, new Handler(), EuiccController.get(), UiccController.getInstance());

        ServiceManager.addService("euicc_card_controller", this);

        TelephonyFrameworkInitializer

                .getTelephonyServiceManager()

                .getEuiccCardControllerServiceRegisterer()

                .register(this);

    }



    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

src/java/com/android/internal/telephony/euicc/EuiccController.java

+3 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.content.pm.PackageInfo; 
import android.content.pm.PackageManager;

import android.os.Binder;

import android.os.Bundle;

import android.os.ServiceManager;

import android.provider.Settings;

import android.service.euicc.DownloadSubscriptionResult;

import android.service.euicc.EuiccService;
@@ -36,6 +35,7 @@ import android.service.euicc.GetDownloadableSubscriptionMetadataResult; 
import android.service.euicc.GetEuiccProfileInfoListResult;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyFrameworkInitializer;

import android.telephony.TelephonyManager;

import android.telephony.UiccAccessRule;

import android.telephony.UiccCardInfo;
@@ -109,7 +109,8 @@ public class EuiccController extends IEuiccController.Stub { 


    private EuiccController(Context context) {

        this(context, new EuiccConnector(context));

        ServiceManager.addService("econtroller", this);

        TelephonyFrameworkInitializer

                .getTelephonyServiceManager().getEuiccControllerService().register(this);

    }



    @VisibleForTesting