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

Merge "Reduced more radio log spam" into mm-wireless-dev

Browse Source 
am: 24c5e7c4ce

* commit '24c5e7c4ceb31c85868fe2c03e8a507e2cb0520f':
  Reduced more radio log spam
This commit is contained in:
Jack Yu
2016-01-28 00:05:14 +00:00
committed by android-build-merger
parent 72c3927f86 24c5e7c4ce
commit b98fac6f1f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -1857,9 +1857,6 @@ public class PhoneNumberUtils
// to the list.
number = extractNetworkPortionAlt(number);
Rlog.d(LOG_TAG, "subId:" + subId + ", defaultCountryIso:" +
((defaultCountryIso == null) ? "NULL" : defaultCountryIso));
String emergencyNumbers = "";
int slotId = SubscriptionManager.getSlotId(subId);
@@ -1869,7 +1866,8 @@ public class PhoneNumberUtils
emergencyNumbers = SystemProperties.get(ecclist, "");
Rlog.d(LOG_TAG, "slotId:" + slotId + ", emergencyNumbers: " + emergencyNumbers);
Rlog.d(LOG_TAG, "slotId:" + slotId + " subId:" + subId + " country:"
+ defaultCountryIso + " emergencyNumbers: " + emergencyNumbers);
if (TextUtils.isEmpty(emergencyNumbers)) {
// then read-only ecclist property since old RIL only uses this

6
telephony/java/android/telephony/ServiceState.java
View File

@@ -37,6 +37,7 @@ public class ServiceState implements Parcelable {
static final String LOG_TAG = "PHONE";
static final boolean DBG = true;
static final boolean VDBG = false; // STOPSHIP if true
/**
* Normal operation condition, the phone is registered
@@ -829,7 +830,7 @@ public class ServiceState implements Parcelable {
/** @hide */
public void setDataRegState(int state) {
mDataRegState = state;
if (DBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRegState=" + mDataRegState);
if (VDBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRegState=" + mDataRegState);
}
public void setRoaming(boolean roaming) {
@@ -1017,7 +1018,8 @@ public class ServiceState implements Parcelable {
/** @hide */
public void setRilDataRadioTechnology(int rt) {
this.mRilDataRadioTechnology = rt;
if (DBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRadioTechnology=" + mRilDataRadioTechnology);
if (VDBG) Rlog.d(LOG_TAG, "[ServiceState] setRilDataRadioTechnology=" +
mRilDataRadioTechnology);
}
/** @hide */