diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-02-26 19:00:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-26 19:00:05 +0000 |
| commit | 4c98b2cdd6d704be3d6356a6c4a5044f4dd2dda6 (patch) | |
| tree | 2613c6dab722eea63b95040e55165aa0bb5164ec | |
| parent | 93ec05ca470453cc0505d2e387a7f4e3a2fe07d8 (diff) | |
| parent | 6ba726f825162481644df89cf0754f4e20f2793e (diff) | |
| download | frameworks_base-4c98b2cdd6d704be3d6356a6c4a5044f4dd2dda6.zip frameworks_base-4c98b2cdd6d704be3d6356a6c4a5044f4dd2dda6.tar.gz frameworks_base-4c98b2cdd6d704be3d6356a6c4a5044f4dd2dda6.tar.bz2 | |
Merge "Adding logging to debug SignalStrength callback missing issue."
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 8d7a182..376ef2a 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -736,50 +736,47 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { } public void notifySignalStrengthForSubscriber(int subId, SignalStrength signalStrength) { + log("notifySignalStrengthForSubscriber: subId=" + subId + + " signalStrength=" + signalStrength); if (!checkNotifyPermission("notifySignalStrength()")) { + log("notifySignalStrengthForSubscriber: permission check failure"); return; } - if (VDBG) { - log("notifySignalStrengthForSubscriber: subId=" + subId - + " signalStrength=" + signalStrength); - toStringLogSSC("notifySignalStrengthForSubscriber"); - } + toStringLogSSC("notifySignalStrengthForSubscriber"); synchronized (mRecords) { int phoneId = SubscriptionManager.getPhoneId(subId); if (validatePhoneId(phoneId)) { - if (VDBG) log("notifySignalStrengthForSubscriber: valid phoneId=" + phoneId); + log("notifySignalStrengthForSubscriber: valid phoneId=" + phoneId); mSignalStrength[phoneId] = signalStrength; for (Record r : mRecords) { - if (VDBG) { - log("notifySignalStrengthForSubscriber: r=" + r + " subId=" + subId - + " phoneId=" + phoneId + " ss=" + signalStrength); - } + log("notifySignalStrengthForSubscriber: r=" + r + " subId=" + subId + + " phoneId=" + phoneId + " ss=" + signalStrength); if (r.matchPhoneStateListenerEvent( PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) && idMatch(r.subId, subId, phoneId)) { try { - if (DBG) { - log("notifySignalStrengthForSubscriber: callback.onSsS r=" + r - + " subId=" + subId + " phoneId=" + phoneId - + " ss=" + signalStrength); - } + log("notifySignalStrengthForSubscriber: callback.onSsS r=" + r + + " subId=" + subId + " phoneId=" + phoneId + + " ss=" + signalStrength); r.callback.onSignalStrengthsChanged(new SignalStrength(signalStrength)); } catch (RemoteException ex) { + log("notifySignalStrengthForSubscriber: Exception while calling callback!!"); mRemoveList.add(r.binder); } + } else { + log("notifySignalStrengthForSubscriber: no match for LISTEN_SIGNAL_STRENGTHS"); } if (r.matchPhoneStateListenerEvent(PhoneStateListener.LISTEN_SIGNAL_STRENGTH) && idMatch(r.subId, subId, phoneId)){ try { int gsmSignalStrength = signalStrength.getGsmSignalStrength(); int ss = (gsmSignalStrength == 99 ? -1 : gsmSignalStrength); - if (DBG) { - log("notifySignalStrengthForSubscriber: callback.onSS r=" + r - + " subId=" + subId + " phoneId=" + phoneId - + " gsmSS=" + gsmSignalStrength + " ss=" + ss); - } + log("notifySignalStrengthForSubscriber: callback.onSS r=" + r + + " subId=" + subId + " phoneId=" + phoneId + + " gsmSS=" + gsmSignalStrength + " ss=" + ss); r.callback.onSignalStrengthChanged(ss); } catch (RemoteException ex) { + log("notifySignalStrengthForSubscriber: Exception in deprecated LISTEN_SIGNAL_STRENGTH"); mRemoveList.add(r.binder); } } @@ -787,6 +784,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { } else { log("notifySignalStrengthForSubscriber: invalid phoneId=" + phoneId); } + log("notifySignalStrengthForSubscriber: done with all records"); handleRemoveListLocked(); } broadcastSignalStrengthChanged(signalStrength, subId); |