Merge "Fix issue of CS restriction notification incorrectly disappearing" (d0b462f3) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/RestrictedState.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,10 @@ public class RestrictedState {
		return mCsNormalRestricted && mCsEmergencyRestricted;
		}

		public boolean isAnyCsRestricted() {
		return mCsNormalRestricted \|\| mCsEmergencyRestricted;
		}

		@Override
		public boolean equals (Object o) {
		RestrictedState s;

+3 −3

Original line number	Diff line number	Diff line
		@@ -3668,7 +3668,7 @@ public class ServiceStateTracker extends Handler {
		* and we only need to notify when state is changed.
		*/
		if (mRestrictedState.isCsRestricted()) {
		if (!newRs.isCsRestricted()) {
		if (!newRs.isAnyCsRestricted()) {
		// remove all restriction
		setNotification(CS_DISABLED);
		} else if (!newRs.isCsNormalRestricted()) {
		@@ -3680,7 +3680,7 @@ public class ServiceStateTracker extends Handler {
		}
		} else if (mRestrictedState.isCsEmergencyRestricted() &&
		!mRestrictedState.isCsNormalRestricted()) {
		if (!newRs.isCsRestricted()) {
		if (!newRs.isAnyCsRestricted()) {
		// remove all restriction
		setNotification(CS_DISABLED);
		} else if (newRs.isCsRestricted()) {
		@@ -3692,7 +3692,7 @@ public class ServiceStateTracker extends Handler {
		}
		} else if (!mRestrictedState.isCsEmergencyRestricted() &&
		mRestrictedState.isCsNormalRestricted()) {
		if (!newRs.isCsRestricted()) {
		if (!newRs.isAnyCsRestricted()) {
		// remove all restriction
		setNotification(CS_DISABLED);
		} else if (newRs.isCsRestricted()) {