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

Commit d1061295 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE hide restricted notification from unregistered nw" into pi-dev

parents 1e077be1 081bacdc
Loading
Loading
Loading
Loading
+16 −1
Original line number Diff line number Diff line
@@ -3588,10 +3588,25 @@ public class ServiceStateTracker extends Handler {
            // cancel previous post notification
            notificationManager.cancel(notificationId);
        } else {
            boolean show = false;
            if (mNewSS.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) {
                // 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.
                show = true;
            }
            // update restricted state notification
            if (show) {
                notificationManager.notify(notificationId, mNotification);
            }
        }
    }

    /**
     * Selects the resource ID, which depends on rejection cause that is sent by the network when CS