Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75e56271 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by android-build-merger
Browse files

Merge "Fix issue of CS restriction notification incorrectly disappearing" am: 6b1cdff0 

am: d0b462f3

Change-Id: If57b43bbb2c0043849257355e06df134723952c1
parents 1f4580b3 d0b462f3

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;

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

+3 −3
Original line number Diff line number Diff line
@@ -3672,7 +3672,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()) {
@@ -3684,7 +3684,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()) {
@@ -3696,7 +3696,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()) {