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

Commit f00698cb authored by Betty Chang's avatar Betty Chang Committed by Gerrit Code Review
Browse files

Merge "[Telephony MainLine] To use HandlerThread to replace BackgroundThread.get"

parents 538afed3 cfe885e6

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import android.content.Context; 
import android.content.SharedPreferences;

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.net.LocalServerSocket;

import android.net.LocalServerSocket;

import android.os.HandlerThread;

import android.os.Looper;

import android.os.Looper;

import android.preference.PreferenceManager;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.provider.Settings;
@@ -38,7 +39,6 @@ import android.telephony.SubscriptionManager; 
import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.util.LocalLog;

import android.util.LocalLog;





import com.android.internal.os.BackgroundThread;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.telephony.dataconnection.TelephonyNetworkFactory;

import com.android.internal.telephony.dataconnection.TelephonyNetworkFactory;

import com.android.internal.telephony.euicc.EuiccCardController;

import com.android.internal.telephony.euicc.EuiccCardController;
@@ -205,8 +205,10 @@ public class PhoneFactory { 
                sMadeDefaults = true;

                sMadeDefaults = true;





                Rlog.i(LOG_TAG, "Creating SubInfoRecordUpdater ");

                Rlog.i(LOG_TAG, "Creating SubInfoRecordUpdater ");

                HandlerThread pfhandlerThread = new HandlerThread("PhoneFactoryHandlerThread");

                pfhandlerThread.start();

                sSubInfoRecordUpdater = new SubscriptionInfoUpdater(

                sSubInfoRecordUpdater = new SubscriptionInfoUpdater(

                        BackgroundThread.get().getLooper(), context, sCommandsInterfaces);

                        pfhandlerThread.getLooper(), context, sCommandsInterfaces);





                // Only bring up IMS if the device supports having an IMS stack.

                // Only bring up IMS if the device supports having an IMS stack.

                if (context.getPackageManager().hasSystemFeature(

                if (context.getPackageManager().hasSystemFeature(