diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-04-28 17:53:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-28 17:53:14 +0000 |
| commit | e3e60ebc36b1dcbb085ebe33e04cb6b83c610832 (patch) | |
| tree | 1ded3e42b10ff8bc278b7e254f7371d913243269 /services | |
| parent | f8fdf87c060fa77a1910d8b6f4b6d26c83963033 (diff) | |
| parent | 1466a9c16c2e3bf2a230028d4ac644134cf7ae15 (diff) | |
| download | frameworks_base-e3e60ebc36b1dcbb085ebe33e04cb6b83c610832.zip frameworks_base-e3e60ebc36b1dcbb085ebe33e04cb6b83c610832.tar.gz frameworks_base-e3e60ebc36b1dcbb085ebe33e04cb6b83c610832.tar.bz2 | |
Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 4ee6657..8c6e290 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -759,47 +759,50 @@ 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; } - toStringLogSSC("notifySignalStrengthForSubscriber"); + if (VDBG) { + log("notifySignalStrengthForSubscriber: subId=" + subId + + " signalStrength=" + signalStrength); + toStringLogSSC("notifySignalStrengthForSubscriber"); + } synchronized (mRecords) { int phoneId = SubscriptionManager.getPhoneId(subId); if (validatePhoneId(phoneId)) { - log("notifySignalStrengthForSubscriber: valid phoneId=" + phoneId); + if (VDBG) log("notifySignalStrengthForSubscriber: valid phoneId=" + phoneId); mSignalStrength[phoneId] = signalStrength; for (Record r : mRecords) { - log("notifySignalStrengthForSubscriber: r=" + r + " subId=" + subId - + " phoneId=" + phoneId + " ss=" + signalStrength); + if (VDBG) { + log("notifySignalStrengthForSubscriber: r=" + r + " subId=" + subId + + " phoneId=" + phoneId + " ss=" + signalStrength); + } if (r.matchPhoneStateListenerEvent( PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) && idMatch(r.subId, subId, phoneId)) { try { - log("notifySignalStrengthForSubscriber: callback.onSsS r=" + r - + " subId=" + subId + " phoneId=" + phoneId - + " ss=" + signalStrength); + if (DBG) { + 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); - log("notifySignalStrengthForSubscriber: callback.onSS r=" + r - + " subId=" + subId + " phoneId=" + phoneId - + " gsmSS=" + gsmSignalStrength + " ss=" + ss); + if (DBG) { + 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); } } @@ -807,7 +810,6 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { } else { log("notifySignalStrengthForSubscriber: invalid phoneId=" + phoneId); } - log("notifySignalStrengthForSubscriber: done with all records"); handleRemoveListLocked(); } broadcastSignalStrengthChanged(signalStrength, subId); |