Merge "Logging carrier restriction status information in case of debug binary" into main (fda1f432) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierRestrictionRules.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -463,8 +463,9 @@ public final class CarrierRestrictionRules implements Parcelable {
		public String toString() {
		return "CarrierRestrictionRules(allowed:" + mAllowedCarriers + ", excluded:"
		+ mExcludedCarriers + ", default:" + mCarrierRestrictionDefault
		+ ", MultiSim policy:" + mMultiSimPolicy + getCarrierInfoList() +
		" mIsCarrierLockInfoSupported = " + mUseCarrierLockInfo + ")";
		+ ", MultiSim policy:" + mMultiSimPolicy + getCarrierInfoList()
		+ ", mIsCarrierLockInfoSupported = " + mUseCarrierLockInfo
		+ getCarrierRestrictionStatusToLog() + ")";
		}

		private String getCarrierInfoList() {
		@@ -476,6 +477,13 @@ public final class CarrierRestrictionRules implements Parcelable {
		}
		}

		private String getCarrierRestrictionStatusToLog() {
		if(android.os.Build.isDebuggable()) {
		return ", CarrierRestrictionStatus = " + mCarrierRestrictionStatus;
		}
		return "";
		}

		/**
		* Builder for a {@link CarrierRestrictionRules}.
		*/