From e2ca741779fd4a7668ba63129d633afc7d231744 Mon Sep 17 00:00:00 2001 From: Yu-Han Yang Date: Mon, 25 Apr 2022 14:41:52 -0700 Subject: [PATCH] Hold the reference of TelephonyCallback Bug: 227553695 Test: manual Change-Id: I77a4cdeb893076ab937aabdd2ba3e56a7cdf5b28 --- .../server/location/injector/SystemEmergencyHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java b/services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java index 70a222fb09c55..dc5299077cc98 100644 --- a/services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java +++ b/services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java @@ -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) {