diff options
| author | Muhammed Siju <msiju@codeaurora.org> | 2016-01-04 11:36:55 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-07-02 10:54:35 -0700 |
| commit | 4d75d9e6750cb4240ec69da077abadee13a0d7a2 (patch) | |
| tree | 86114de204f9f099af9b3a25d25924c65b466e89 | |
| parent | 52f0f91c7c2a0a9bdcaa2c89c26811ad96d034c4 (diff) | |
| download | frameworks_base-4d75d9e6750cb4240ec69da077abadee13a0d7a2.zip frameworks_base-4d75d9e6750cb4240ec69da077abadee13a0d7a2.tar.gz frameworks_base-4d75d9e6750cb4240ec69da077abadee13a0d7a2.tar.bz2 | |
MSIM: Restrict data activity change to listeners with matching subId
Currently data activity change callback is invoked on all listeners
irresepctive of subId. This causes wrong data activity value to be
updated from other sub. To fix this add subId match before invoking
callbacks on listeners.
Change-Id: If218ea3ead2b837d9c2d1cac4d353c1d35c5babe
CRs-Fixed: 957838
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 5dac953..f7db045 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -1019,7 +1019,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { if (validatePhoneId(phoneId)) { mDataActivity[phoneId] = state; for (Record r : mRecords) { - if (r.matchPhoneStateListenerEvent(PhoneStateListener.LISTEN_DATA_ACTIVITY)) { + if (r.matchPhoneStateListenerEvent(PhoneStateListener.LISTEN_DATA_ACTIVITY) + && idMatch(r.subId, subId, phoneId)) { try { r.callback.onDataActivity(state); } catch (RemoteException ex) { |