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

Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev

Browse Source
This commit is contained in:
xinhe
2014-12-19 00:07:28 +00:00
committed by Android (Google) Code Review
parent 8a0399c442 ac11ae91c7
commit ffe80ab7f6
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -620,7 +620,11 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
final int recordCount = mRecords.size(); final int recordCount = mRecords.size();
for (int i = 0; i < recordCount; i++) { for (int i = 0; i < recordCount; i++) {
if (mRecords.get(i).binder == binder) { if (mRecords.get(i).binder == binder) {
if (VDBG) log("remove: binder=" + binder); if (DBG) {
Record r = mRecords.get(i);
log("remove: binder=" + binder + "r.pkgForDebug" + r.pkgForDebug
+ "r.callback" + r.callback);
}
mRecords.remove(i); mRecords.remove(i);
return; return;
} }
@@ -954,7 +958,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
+ " state=" + state + " isDataConnectivityPossible=" + isDataConnectivityPossible + " state=" + state + " isDataConnectivityPossible=" + isDataConnectivityPossible
+ " reason='" + reason + " reason='" + reason
+ "' apn='" + apn + "' apnType=" + apnType + " networkType=" + networkType + "' apn='" + apn + "' apnType=" + apnType + " networkType=" + networkType
+ " mRecords.size()=" + mRecords.size() + " mRecords=" + mRecords); + " mRecords.size()=" + mRecords.size());
} }
synchronized (mRecords) { synchronized (mRecords) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
@@ -1558,11 +1562,12 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
boolean idMatch(int rSubId, int subId, int phoneId) { boolean idMatch(int rSubId, int subId, int phoneId) {
if(subId < 0) {
// Invalid case, we need compare phoneId with default one.
return (mDefaultPhoneId == phoneId);
}
if(rSubId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) { if(rSubId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
if(subId < 0) {
// Invalid case, we need compare phoneId with default one.
return (mDefaultPhoneId == phoneId);
}
return (subId == mDefaultSubId); return (subId == mDefaultSubId);
} else { } else {
return (rSubId == subId); return (rSubId == subId);