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

am: 5676ca8978

* commit '5676ca8978caa6ce9580eb3f358321fd2746e4f8':
  Fix "TelephonyRegistry notifies wrong data status"

Change-Id: Ia51b2b06f41f2cd4962066c1f223fb3cde13f300
This commit is contained in:
xu.peng
2016-05-13 17:59:53 +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) {