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

Commit 0c77138e authored by fionaxu's avatar fionaxu
Browse files

restricted notification should reply on mSS not mNewSS 

Bug: 70168086
Test: Build
Change-Id: I0876f94b78223e3c48fa9be7891c40a84d36772e
(cherry picked from commit a1e5b416)
Merged-in: I0876f94b78223e3c48fa9be7891c40a84d36772e
parent c015e32e

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

+2 −2
Original line number Diff line number Diff line
@@ -3612,13 +3612,13 @@ public class ServiceStateTracker extends Handler { 
            notificationManager.cancel(Integer.toString(mSubId), notificationId);

        } else {

            boolean show = false;

            if (mNewSS.isEmergencyOnly() && notifyType == CS_EMERGENCY_ENABLED) {

            if (mSS.isEmergencyOnly() && notifyType == CS_EMERGENCY_ENABLED) {

                // if reg state is emergency only, always show restricted emergency notification.

                show = true;

            } else if (notifyType == CS_REJECT_CAUSE_ENABLED) {

                // always show notification due to CS reject irrespective of service state.

                show = true;

            } else if (mNewSS.getState() == ServiceState.STATE_IN_SERVICE) {

            } else if (mSS.getState() == ServiceState.STATE_IN_SERVICE) {

                // for non in service states, we have system UI and signal bar to indicate limited

                // service. No need to show notification again. This also helps to mitigate the

                // issue if phone go to OOS and camp to other networks and received restricted ind.