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

am 8161ed81: Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev

Browse Source 
* commit '8161ed8121f88d58cb7a2bab3a7197e3d661ba49':
  RSSI indicator says that SIMless device has a SIM
This commit is contained in:
xinhe
2014-11-06 19:56:06 +00:00
committed by Android Git Automerger
parent 0fc133e07e 8161ed8121
commit eb6990ac93
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -596,7 +596,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
+ " phoneId=" + phoneId + " state=" + state); + " phoneId=" + phoneId + " state=" + state);
} }
if (((r.events & PhoneStateListener.LISTEN_SERVICE_STATE) != 0) && if (((r.events & PhoneStateListener.LISTEN_SERVICE_STATE) != 0) &&
subIdMatch(r.subId, subId)) { idMatch(r.subId, subId, phoneId)) {
try { try {
if (DBG) { if (DBG) {
log("notifyServiceStateForSubscriber: callback.onSSC r=" + r log("notifyServiceStateForSubscriber: callback.onSSC r=" + r
@@ -641,7 +641,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
+ " phoneId=" + phoneId + " ss=" + signalStrength); + " phoneId=" + phoneId + " ss=" + signalStrength);
} }
if (((r.events & PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) != 0) && if (((r.events & PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) != 0) &&
subIdMatch(r.subId, subId)) { idMatch(r.subId, subId, phoneId)) {
try { try {
if (DBG) { if (DBG) {
log("notifySignalStrengthForSubscriber: callback.onSsS r=" + r log("notifySignalStrengthForSubscriber: callback.onSsS r=" + r
@@ -654,7 +654,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
} }
if (((r.events & PhoneStateListener.LISTEN_SIGNAL_STRENGTH) != 0) && if (((r.events & PhoneStateListener.LISTEN_SIGNAL_STRENGTH) != 0) &&
subIdMatch(r.subId, subId)){ idMatch(r.subId, subId, phoneId)){
try { try {
int gsmSignalStrength = signalStrength.getGsmSignalStrength(); int gsmSignalStrength = signalStrength.getGsmSignalStrength();
int ss = (gsmSignalStrength == 99 ? -1 : gsmSignalStrength); int ss = (gsmSignalStrength == 99 ? -1 : gsmSignalStrength);
@@ -696,7 +696,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
mCellInfo.set(phoneId, cellInfo); mCellInfo.set(phoneId, cellInfo);
for (Record r : mRecords) { for (Record r : mRecords) {
if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_INFO) && if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_INFO) &&
subIdMatch(r.subId, subId)) { idMatch(r.subId, subId, phoneId)) {
try { try {
if (DBG_LOC) { if (DBG_LOC) {
log("notifyCellInfo: mCellInfo=" + cellInfo + " r=" + r); log("notifyCellInfo: mCellInfo=" + cellInfo + " r=" + r);
@@ -751,7 +751,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
mMessageWaiting[phoneId] = mwi; mMessageWaiting[phoneId] = mwi;
for (Record r : mRecords) { for (Record r : mRecords) {
if (((r.events & PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR) != 0) && if (((r.events & PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR) != 0) &&
subIdMatch(r.subId, subId)) { idMatch(r.subId, subId, phoneId)) {
try { try {
r.callback.onMessageWaitingIndicatorChanged(mwi); r.callback.onMessageWaitingIndicatorChanged(mwi);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -782,7 +782,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
mCallForwarding[phoneId] = cfi; mCallForwarding[phoneId] = cfi;
for (Record r : mRecords) { for (Record r : mRecords) {
if (((r.events & PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR) != 0) && if (((r.events & PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR) != 0) &&
subIdMatch(r.subId, subId)) { idMatch(r.subId, subId, phoneId)) {
try { try {
r.callback.onCallForwardingIndicatorChanged(cfi); r.callback.onCallForwardingIndicatorChanged(cfi);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -879,7 +879,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
for (Record r : mRecords) { for (Record r : mRecords) {
if (((r.events & PhoneStateListener.LISTEN_DATA_CONNECTION_STATE) != 0) && if (((r.events & PhoneStateListener.LISTEN_DATA_CONNECTION_STATE) != 0) &&
subIdMatch(r.subId, subId)) { idMatch(r.subId, subId, phoneId)) {
try { try {
log("Notify data connection state changed on sub: " + log("Notify data connection state changed on sub: " +
subId); subId);
@@ -965,7 +965,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
mCellLocation[phoneId] = cellLocation; mCellLocation[phoneId] = cellLocation;
for (Record r : mRecords) { for (Record r : mRecords) {
if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_LOCATION) && if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_LOCATION) &&
subIdMatch(r.subId, subId)) { idMatch(r.subId, subId, phoneId)) {
try { try {
if (DBG_LOC) { if (DBG_LOC) {
log("notifyCellLocation: cellLocation=" + cellLocation log("notifyCellLocation: cellLocation=" + cellLocation
@@ -1386,7 +1386,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
@Override @Override
public String toString() { public String toString() {
return mS + " " + mTime.toString() + " " + mSubId + " " + mPhoneId + " " + mState; return mS + " Time " + mTime.toString() + " mSubId " + mSubId + " mPhoneId " + mPhoneId + " mState " + mState;
} }
} }
@@ -1429,8 +1429,12 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
} }
boolean subIdMatch(int rSubId, int subId) { boolean idMatch(int rSubId, int subId, int phoneId) {
if(rSubId == SubscriptionManager.DEFAULT_SUB_ID) { if(rSubId == SubscriptionManager.DEFAULT_SUB_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);