Merge "Fix "TelephonyRegistry notifies wrong data status""

am: 3b2f202599

* commit '3b2f202599bca3da369667bf69ab39df9d8d894d':
  Fix "TelephonyRegistry notifies wrong data status"

Change-Id: I2d9ecd7132c8028c79b008b737b4b7d6d87211b3
This commit is contained in:
xu.peng
2016-05-13 17:54:56 +00:00
committed by android-build-merger

View File

@@ -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) {