Merge "carrier_restriction_rules_enhancement Flag cleanup." into main (c47f1e1d) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierRestrictionRules.java

+14 −24

Original line number	Diff line number	Diff line
		@@ -197,12 +197,10 @@ public final class CarrierRestrictionRules implements Parcelable {
		mCarrierRestrictionDefault = in.readInt();
		mMultiSimPolicy = in.readInt();
		mCarrierRestrictionStatus = in.readInt();
		if (Flags.carrierRestrictionRulesEnhancement()) {
		in.readTypedList(mAllowedCarrierInfo, CarrierInfo.CREATOR);
		in.readTypedList(mExcludedCarrierInfo, CarrierInfo.CREATOR);
		mUseCarrierLockInfo = in.readBoolean();
		}
		}

		/**
		* Creates a new builder for this class
		@@ -220,7 +218,7 @@ public final class CarrierRestrictionRules implements Parcelable {
		== TelephonyManager.CARRIER_RESTRICTION_STATUS_NOT_RESTRICTED) {
		return true;
		}
		if (Flags.carrierRestrictionRulesEnhancement() && mUseCarrierLockInfo) {
		if (mUseCarrierLockInfo) {
		return (mAllowedCarrierInfo.isEmpty() && mExcludedCarrierInfo.isEmpty()
		&& mCarrierRestrictionDefault == CARRIER_RESTRICTION_DEFAULT_ALLOWED);
		}
		@@ -427,12 +425,10 @@ public final class CarrierRestrictionRules implements Parcelable {
		out.writeInt(mCarrierRestrictionDefault);
		out.writeInt(mMultiSimPolicy);
		out.writeInt(mCarrierRestrictionStatus);
		if (Flags.carrierRestrictionRulesEnhancement()) {
		out.writeTypedList(mAllowedCarrierInfo);
		out.writeTypedList(mExcludedCarrierInfo);
		out.writeBoolean(mUseCarrierLockInfo);
		}
		}

		/**
		* {@link Parcelable#describeContents}
		@@ -469,12 +465,8 @@ public final class CarrierRestrictionRules implements Parcelable {
		}

		private String getCarrierInfoList() {
		if (Flags.carrierRestrictionRulesEnhancement()) {
		return ", allowedCarrierInfoList:" + mAllowedCarrierInfo
		+ ", excludedCarrierInfoList:" + mExcludedCarrierInfo;
		} else {
		return "";
		}
		}

		private String getCarrierRestrictionStatusToLog() {
		@@ -506,13 +498,11 @@ public final class CarrierRestrictionRules implements Parcelable {
		mRules.mAllowedCarriers.clear();
		mRules.mExcludedCarriers.clear();
		mRules.mCarrierRestrictionDefault = CARRIER_RESTRICTION_DEFAULT_ALLOWED;
		if (Flags.carrierRestrictionRulesEnhancement()) {
		mRules.mCarrierRestrictionStatus =
		TelephonyManager.CARRIER_RESTRICTION_STATUS_NOT_RESTRICTED;
		mRules.mAllowedCarrierInfo.clear();
		mRules.mExcludedCarrierInfo.clear();
		mRules.mUseCarrierLockInfo = false;
		}
		return this;
		}