Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not notify SS change with invalid subId" into qt-r1-dev

Browse Source
This commit is contained in:
Jordan Liu
2019-07-11 19:06:34 +00:00
committed by Android (Google) Code Review
parent 2b4e2b9110 6db77174a2
commit edee6e6c2a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -1027,7 +1027,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
log(str);
}
mLocalLog.log(str);
if (validatePhoneId(phoneId)) {
// for service state updates, don't notify clients when subId is invalid. This prevents
// us from sending incorrect notifications like b/133140128
// In the future, we can remove this logic for every notification here and add a
// callback so listeners know when their PhoneStateListener's subId becomes invalid, but
// for now we use the simplest fix.
if (validatePhoneId(phoneId) && SubscriptionManager.isValidSubscriptionId(subId)) {
mServiceState[phoneId] = state;
for (Record r : mRecords) {
@@ -1059,7 +1064,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
}
} else {
log("notifyServiceStateForSubscriber: INVALID phoneId=" + phoneId);
log("notifyServiceStateForSubscriber: INVALID phoneId=" + phoneId
+ " or subId=" + subId);
}
handleRemoveListLocked();
}