Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5676ca89 authored by xu.peng's avatar xu.peng Committed by android-build-merger
Browse files

Merge "Fix "TelephonyRegistry notifies wrong data status"" am: 3b2f2025 

am: ff3a7571

* commit 'ff3a7571':
  Fix "TelephonyRegistry notifies wrong data status"

Change-Id: I8868f7fc6eafcb710b33c84f63f602e7e71a64c3
parents 6fdaf2f2 ff3a7571

services/core/java/com/android/server/TelephonyRegistry.java

+3 −1
Original line number Diff line number Diff line
@@ -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) {