From 30ce989f5eec3584908db0aa49a0b296937b2567 Mon Sep 17 00:00:00 2001 From: Ling Ma Date: Mon, 5 Dec 2022 23:13:18 -0800 Subject: [PATCH] Correct renounceCoarseLocationAccess Bug: 259763304 Test: manually fake roaming with different operatorNumeric and toggle APM. Test: adb shell am broadcast -a com.android.internal.telephony.TestServiceState --ei phone_id 0 --ei data_roaming_type 2 --es operator a,b,123 --ei voice_reg_state 1 Change-Id: Ia6c79acbee41a70ac733e64df131128ea4ba0a0f --- services/core/java/com/android/server/TelephonyRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index bd90d85e3fd02..32afccadf455a 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -1041,7 +1041,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { String callingFeatureId, IPhoneStateListener callback, int[] events, boolean notifyNow) { Set eventList = Arrays.stream(events).boxed().collect(Collectors.toSet()); - listen(renounceFineLocationAccess, renounceFineLocationAccess, callingPackage, + listen(renounceFineLocationAccess, renounceCoarseLocationAccess, callingPackage, callingFeatureId, callback, eventList, notifyNow, subId); } @@ -1606,7 +1606,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { if (DBG) { log("notifyServiceStateForSubscriber: callback.onSSC r=" + r + " subId=" + subId + " phoneId=" + phoneId - + " state=" + state); + + " state=" + stateToSend); } r.callback.onServiceStateChanged(stateToSend); } catch (RemoteException ex) {