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

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

Merge "Remove UiccController & CommandsInterface from ProxyController" am:... 

Merge "Remove UiccController & CommandsInterface from ProxyController" am: 994446c6 am: a3ce705f am: 7fee31e2
am: 462e7fbc

Change-Id: Ia5608949a2d9c270bbcc1681323380d34d08ade1
parents e4f7ab73 462e7fbc

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

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

    private static @Nullable EuiccController sEuiccController;

    private static @Nullable EuiccCardController sEuiccCardController;

    private static @Nullable EuiccCardController sEuiccCardController;





    @UnsupportedAppUsage

    static private CommandsInterface sCommandsInterface = null;

    static private SubscriptionInfoUpdater sSubInfoRecordUpdater = null;

    static private SubscriptionInfoUpdater sSubInfoRecordUpdater = null;





    @UnsupportedAppUsage

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

                // 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.

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

                sPhone = sPhones[0];

                sPhone = sPhones[0];

                sCommandsInterface = sCommandsInterfaces[0];





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

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

                // updateIfNeeded set to true is enough to configure a default SMS app.

                // 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,

                        sContext, sc, Looper.myLooper(), tr, sCommandsInterfaces,

                        sPhones);

                        sPhones);





                sProxyController = ProxyController.getInstance(context, sPhones,

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

                        sUiccController, sCommandsInterfaces, sPhoneSwitcher);





                sIntentBroadcaster = IntentBroadcaster.getInstance(context);

                sIntentBroadcaster = IntentBroadcaster.getInstance(context);

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

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

import android.util.Log;





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

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

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





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.HashSet;

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




    private Phone[] mPhones;

    private Phone[] mPhones;





    private UiccController mUiccController;



    private CommandsInterface[] mCi;



    private Context mContext;

    private Context mContext;





    private PhoneSwitcher mPhoneSwitcher;

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








    //***** Class Methods

    //***** Class Methods

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

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

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

        if (sProxyController == null) {

        if (sProxyController == null) {

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

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

        }

        }

        return sProxyController;

        return sProxyController;

    }

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

        return sProxyController;

    }

    }





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

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

            CommandsInterface[] ci, PhoneSwitcher phoneSwitcher) {

        logd("Constructor - Enter");

        logd("Constructor - Enter");





        mContext = context;

        mContext = context;

        mPhones = phone;

        mPhones = phone;

        mUiccController = uiccController;

        mCi = ci;

        mPhoneSwitcher = phoneSwitcher;

        mPhoneSwitcher = phoneSwitcher;





        RcsMessageController.init(context);

        RcsMessageController.init(context);