Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix low probability deadlock"

Browse Source 
am: bb5cbc539f

Change-Id: Ife7dd96618b75fd492aaf0397870653d63cf0d5e
This commit is contained in:
Xiangyu/Malcolm Chen
2018-02-21 23:01:42 +00:00
committed by android-build-merger
parent 486190f87b bb5cbc539f
commit e05aa02d59
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -503,6 +503,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
} }
int phoneId = SubscriptionManager.getPhoneId(subId);
synchronized (mRecords) { synchronized (mRecords) {
// register // register
IBinder b = callback.asBinder(); IBinder b = callback.asBinder();
@@ -525,9 +526,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} else {//APP specify subID } else {//APP specify subID
r.subId = subId; r.subId = subId;
} }
r.phoneId = SubscriptionManager.getPhoneId(r.subId); r.phoneId = phoneId;
int phoneId = r.phoneId;
r.events = events; r.events = events;
if (DBG) { if (DBG) {
log("listen: Register r=" + r + " r.subId=" + r.subId + " phoneId=" + phoneId); log("listen: Register r=" + r + " r.subId=" + r.subId + " phoneId=" + phoneId);
@@ -1013,9 +1012,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
log("notifyCellInfoForSubscriber: subId=" + subId log("notifyCellInfoForSubscriber: subId=" + subId
+ " cellInfo=" + cellInfo); + " cellInfo=" + cellInfo);
} }
int phoneId = SubscriptionManager.getPhoneId(subId);
synchronized (mRecords) { synchronized (mRecords) {
int phoneId = SubscriptionManager.getPhoneId(subId);
if (validatePhoneId(phoneId)) { if (validatePhoneId(phoneId)) {
mCellInfo.set(phoneId, cellInfo); mCellInfo.set(phoneId, cellInfo);
for (Record r : mRecords) { for (Record r : mRecords) {
@@ -1103,8 +1101,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
log("notifyCallForwardingChangedForSubscriber: subId=" + subId log("notifyCallForwardingChangedForSubscriber: subId=" + subId
+ " cfi=" + cfi); + " cfi=" + cfi);
} }
int phoneId = SubscriptionManager.getPhoneId(subId);
synchronized (mRecords) { synchronized (mRecords) {
int phoneId = SubscriptionManager.getPhoneId(subId);
if (validatePhoneId(phoneId)) { if (validatePhoneId(phoneId)) {
mCallForwarding[phoneId] = cfi; mCallForwarding[phoneId] = cfi;
for (Record r : mRecords) { for (Record r : mRecords) {
@@ -1131,8 +1129,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
if (!checkNotifyPermission("notifyDataActivity()" )) { if (!checkNotifyPermission("notifyDataActivity()" )) {
return; return;
} }
int phoneId = SubscriptionManager.getPhoneId(subId);
synchronized (mRecords) { synchronized (mRecords) {
int phoneId = SubscriptionManager.getPhoneId(subId);
if (validatePhoneId(phoneId)) { if (validatePhoneId(phoneId)) {
mDataActivity[phoneId] = state; mDataActivity[phoneId] = state;
for (Record r : mRecords) { for (Record r : mRecords) {
@@ -1173,8 +1171,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
+ "' apn='" + apn + "' apnType=" + apnType + " networkType=" + networkType + "' apn='" + apn + "' apnType=" + apnType + " networkType=" + networkType
+ " mRecords.size()=" + mRecords.size()); + " mRecords.size()=" + mRecords.size());
} }
int phoneId = SubscriptionManager.getPhoneId(subId);
synchronized (mRecords) { synchronized (mRecords) {
int phoneId = SubscriptionManager.getPhoneId(subId);
if (validatePhoneId(phoneId)) { if (validatePhoneId(phoneId)) {
boolean modified = false; boolean modified = false;
if (state == TelephonyManager.DATA_CONNECTED) { if (state == TelephonyManager.DATA_CONNECTED) {
@@ -1297,8 +1295,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
log("notifyCellLocationForSubscriber: subId=" + subId log("notifyCellLocationForSubscriber: subId=" + subId
+ " cellLocation=" + cellLocation); + " cellLocation=" + cellLocation);
} }
int phoneId = SubscriptionManager.getPhoneId(subId);
synchronized (mRecords) { synchronized (mRecords) {
int phoneId = SubscriptionManager.getPhoneId(subId);
if (validatePhoneId(phoneId)) { if (validatePhoneId(phoneId)) {
mCellLocation[phoneId] = cellLocation; mCellLocation[phoneId] = cellLocation;
for (Record r : mRecords) { for (Record r : mRecords) {