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

Commit a3ce705f authored by Taesu Lee's avatar Taesu Lee Committed by android-build-merger
Browse files

Merge "Remove UiccController & CommandsInterface from ProxyController" 

am: 994446c6

Change-Id: I375675630fa63b319c94adc9f00a6a07fb5c8c4c
parents 0447c571 994446c6

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

+1 −5
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ public class PhoneFactory { 
    private static @Nullable EuiccController sEuiccController;

    private static @Nullable EuiccCardController sEuiccCardController;



    @UnsupportedAppUsage

    static private CommandsInterface sCommandsInterface = null;

    static private SubscriptionInfoUpdater sSubInfoRecordUpdater = null;



    @UnsupportedAppUsage
@@ -202,7 +200,6 @@ public class PhoneFactory { 
                // FIXME: This is a first best guess at what the defaults will be. It

                // FIXME: needs to be done in a more controlled manner in the future.

                sPhone = sPhones[0];

                sCommandsInterface = sCommandsInterfaces[0];



                // Ensure that we have a default SMS app. Requesting the app with

                // updateIfNeeded set to true is enough to configure a default SMS app.
@@ -266,8 +263,7 @@ public class PhoneFactory { 
                        sContext, sc, Looper.myLooper(), tr, sCommandsInterfaces,

                        sPhones);



                sProxyController = ProxyController.getInstance(context, sPhones,

                        sUiccController, sCommandsInterfaces, sPhoneSwitcher);

                sProxyController = ProxyController.getInstance(context, sPhones, sPhoneSwitcher);



                sIntentBroadcaster = IntentBroadcaster.getInstance(context);

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

+3 −12
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.telephony.TelephonyManager; 
import android.util.Log;



import com.android.internal.telephony.ims.RcsMessageController;

import com.android.internal.telephony.uicc.UiccController;



import java.util.ArrayList;

import java.util.HashSet;
@@ -64,10 +63,6 @@ public class ProxyController { 


    private Phone[] mPhones;



    private UiccController mUiccController;



    private CommandsInterface[] mCi;



    private Context mContext;



    private PhoneSwitcher mPhoneSwitcher;
@@ -109,10 +104,9 @@ public class ProxyController { 




    //***** Class Methods

    public static ProxyController getInstance(Context context, Phone[] phone,

            UiccController uiccController, CommandsInterface[] ci, PhoneSwitcher ps) {

    public static ProxyController getInstance(Context context, Phone[] phone, PhoneSwitcher ps) {

        if (sProxyController == null) {

            sProxyController = new ProxyController(context, phone, uiccController, ci, ps);

            sProxyController = new ProxyController(context, phone, ps);

        }

        return sProxyController;

    }
@@ -122,14 +116,11 @@ public class ProxyController { 
        return sProxyController;

    }



    private ProxyController(Context context, Phone[] phone, UiccController uiccController,

            CommandsInterface[] ci, PhoneSwitcher phoneSwitcher) {

    private ProxyController(Context context, Phone[] phone, PhoneSwitcher phoneSwitcher) {

        logd("Constructor - Enter");



        mContext = context;

        mPhones = phone;

        mUiccController = uiccController;

        mCi = ci;

        mPhoneSwitcher = phoneSwitcher;



        RcsMessageController.init(context);