diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-05-13 17:46:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-13 17:46:41 +0000 |
| commit | 3b2f202599bca3da369667bf69ab39df9d8d894d (patch) | |
| tree | d79475dba2768d6765b2a87912d88da2e1d46cdf | |
| parent | e8f373e442a301691aa8f35f1dfb46e8149b450b (diff) | |
| parent | 9071ced8b09db7485ff341b32ec366f58637ac68 (diff) | |
| download | base-android-n-preview-3.tar.gz | |
Merge "Fix "TelephonyRegistry notifies wrong data status""android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 352254a737bc..7962d7442c3e 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -1019,7 +1019,9 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { if (validatePhoneId(phoneId)) { mDataActivity[phoneId] = state; for (Record r : mRecords) { - if (r.matchPhoneStateListenerEvent(PhoneStateListener.LISTEN_DATA_ACTIVITY)) { + // Notify by correct subId. + if (r.matchPhoneStateListenerEvent(PhoneStateListener.LISTEN_DATA_ACTIVITY) && + idMatch(r.subId, subId, phoneId)) { try { r.callback.onDataActivity(state); } catch (RemoteException ex) { |