PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings: Fix force close for telephony callback exceeding limitation" into main am: 380a136e50 am: bca026c182

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2995004

Change-Id: I2c15c609239927bd2a87da19c99c8f3ee34e9a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tom Hsu
2024-03-25 07:14:10 +00:00
committed by Automerger Merge Worker
parent ddd539d590 bca026c182
commit 2625ca4e7d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/MobileNetworkRepository.java
View File

@@ -245,7 +245,11 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
} }
private void createTelephonyManagerBySubId(int subId) { private void createTelephonyManagerBySubId(int subId) {
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID
|| mTelephonyCallbackMap.containsKey(subId)) {
if (DEBUG) {
Log.d(TAG, "createTelephonyManagerBySubId: directly return for subId = " + subId);
}
return; return;
} }
PhoneCallStateTelephonyCallback PhoneCallStateTelephonyCallback