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

Commit f47b6a33 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "hide restricted notification from unregistered nw"

am: eb450ffe

Change-Id: Ibf9c7b84508328ab351c03140c211e419128595c
parents af64e8c4 eb450ffe
Loading
Loading
Loading
Loading
+16 −1
Original line number Diff line number Diff line
@@ -3587,10 +3587,25 @@ public class ServiceStateTracker extends Handler {
            // cancel previous post notification
            notificationManager.cancel(Integer.toString(mSubId), 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 for this subId
            if (show) {
                notificationManager.notify(Integer.toString(mSubId), notificationId, mNotification);
            }
        }
    }

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