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

Commit e620ce75 authored by yifan.bai's avatar yifan.bai Committed by Xiangyu/Malcolm Chen
Browse files

Fix low probability deadlock 

Low probability deadlock in com.android.phone and system_server.
Bug: 70865607

Test: Build pass
parent 1c81aa63

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

+7 −9
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                }

            }



            int phoneId = SubscriptionManager.getPhoneId(subId);

            synchronized (mRecords) {

                // register

                IBinder b = callback.asBinder();
@@ -525,9 +526,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                 } else {//APP specify subID

                    r.subId = subId;

                }

                r.phoneId = SubscriptionManager.getPhoneId(r.subId);



                int phoneId = r.phoneId;

                r.phoneId = phoneId;

                r.events = events;

                if (DBG) {

                    log("listen:  Register r=" + r + " r.subId=" + r.subId + " phoneId=" + phoneId);
@@ -1013,9 +1012,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            log("notifyCellInfoForSubscriber: subId=" + subId

                + " cellInfo=" + cellInfo);

        }



        synchronized (mRecords) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

                mCellInfo.set(phoneId, cellInfo);

                for (Record r : mRecords) {
@@ -1103,8 +1101,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            log("notifyCallForwardingChangedForSubscriber: subId=" + subId

                + " cfi=" + cfi);

        }

        synchronized (mRecords) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

                mCallForwarding[phoneId] = cfi;

                for (Record r : mRecords) {
@@ -1131,8 +1129,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        if (!checkNotifyPermission("notifyDataActivity()" )) {

            return;

        }

        synchronized (mRecords) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

                mDataActivity[phoneId] = state;

                for (Record r : mRecords) {
@@ -1173,8 +1171,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                + "' apn='" + apn + "' apnType=" + apnType + " networkType=" + networkType

                + " mRecords.size()=" + mRecords.size());

        }

        synchronized (mRecords) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

                boolean modified = false;

                if (state == TelephonyManager.DATA_CONNECTED) {
@@ -1297,8 +1295,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            log("notifyCellLocationForSubscriber: subId=" + subId

                + " cellLocation=" + cellLocation);

        }

        synchronized (mRecords) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        synchronized (mRecords) {

            if (validatePhoneId(phoneId)) {

                mCellLocation[phoneId] = cellLocation;

                for (Record r : mRecords) {