Merge "Fix "TelephonyRegistry notifies wrong data status"" am: 3b2f202599 am: ff3a7571c7 am: 5676ca8978

am: 9823cc8d70

* commit '9823cc8d708fe786c67dad2b6ccc1e6e923fe2ec':
  Fix "TelephonyRegistry notifies wrong data status"

Change-Id: Ib1b449103c46b6856ddb2ec575ee92123269c27e
This commit is contained in:
xu.peng
2016-05-13 18:02:25 +00:00
committed by android-build-merger

View File

@@ -985,7 +985,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) {