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

Commit f544a5ec authored by Malcolm Chen's avatar Malcolm Chen Committed by Xiangyu/Malcolm Chen
Browse files

Remove unecessary member variables of PhoneSwitcher. 

It also includes some minor clean ups. The purpose is to make it
compitable with smooth ss <-> ds switch.

Bug: 142514392
Test: manual and unittest
Change-Id: I078a876a66b40d93d12dcb52eb391c4b8a7ecfbd
Merged-In: I078a876a66b40d93d12dcb52eb391c4b8a7ecfbd
parent 7115dd5d

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

+1 −7
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.content.SharedPreferences; 
import android.content.pm.PackageManager;

import android.net.LocalServerSocket;

import android.os.Looper;

import android.os.ServiceManager;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;
@@ -235,9 +234,6 @@ public class PhoneFactory { 
                    Rlog.i(LOG_TAG, "IMS is not supported on this device, skipping ImsResolver.");

                }



                ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(

                        ServiceManager.getService("telephony.registry"));



                sPhoneConfigurationManager = PhoneConfigurationManager.init(sContext);



                sCellularNetworkValidator = CellularNetworkValidator.make(sContext);
@@ -245,9 +241,7 @@ public class PhoneFactory { 
                int maxActivePhones = sPhoneConfigurationManager

                        .getNumberOfModemsWithSimultaneousDataConnections();



                sPhoneSwitcher = PhoneSwitcher.make(maxActivePhones, numPhones,

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

                        sPhones);

                sPhoneSwitcher = PhoneSwitcher.make(maxActivePhones, sContext, Looper.myLooper());



                sProxyController = ProxyController.getInstance(context);

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

+105 −97

File changed.

Preview size limit exceeded, changes collapsed.

tests/telephonytests/src/com/android/internal/telephony/PhoneSwitcherTest.java

+89 −79

File changed.

Preview size limit exceeded, changes collapsed.