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

Commit ce176a8e authored by Yu-Han Yang's avatar Yu-Han Yang Committed by Automerger Merge Worker
Browse files

Merge "Hold the reference of TelephonyCallback" into tm-dev am: 76de9f1e am:... 

Merge "Hold the reference of TelephonyCallback" into tm-dev am: 76de9f1e am: f60dccf9 am: 6b8fe632

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946240



Change-Id: Ie0c5b0bd63fa1dda89fad1945a400a0ebce3919c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbd02f33 6b8fe632

services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import java.util.Objects; 
public class SystemEmergencyHelper extends EmergencyHelper {



    private final Context mContext;

    private final EmergencyCallTelephonyCallback mEmergencyCallTelephonyCallback =

            new EmergencyCallTelephonyCallback();



    TelephonyManager mTelephonyManager;
@@ -56,7 +58,7 @@ public class SystemEmergencyHelper extends EmergencyHelper { 
        // TODO: this doesn't account for multisim phones



        mTelephonyManager.registerTelephonyCallback(FgThread.getExecutor(),

                new EmergencyCallTelephonyCallback());

                mEmergencyCallTelephonyCallback);

        mContext.registerReceiver(new BroadcastReceiver() {

            @Override

            public void onReceive(Context context, Intent intent) {