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

Commit 2139b617 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2374621, 2374525, 2374320, 2374526, 2374587, 2374550,... 

Merge cherrypicks of [2374621, 2374525, 2374320, 2374526, 2374587, 2374550, 2374624, 2374527, 2374433, 2374551] into oc-release

Change-Id: I3eb39ce6323e504acbe6e61086c62465ccd5b3e2
parents 9bd18b2f e024e21b

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

+4 −4
Original line number Diff line number Diff line
@@ -3817,7 +3817,7 @@ public class ServiceStateTracker extends Handler { 
                }

                notificationId = PS_NOTIFICATION;

                title = context.getText(com.android.internal.R.string.RestrictedOnDataTitle);

                details = context.getText(com.android.internal.R.string.RestrictedOnDataContent);

                details = context.getText(com.android.internal.R.string.RestrictedStateContent);

                break;

            case PS_DISABLED:

                notificationId = PS_NOTIFICATION;
@@ -3825,16 +3825,16 @@ public class ServiceStateTracker extends Handler { 
            case CS_ENABLED:

                title = context.getText(com.android.internal.R.string.RestrictedOnAllVoiceTitle);

                details = context.getText(

                        com.android.internal.R.string.RestrictedOnAllVoiceContent);

                        com.android.internal.R.string.RestrictedStateContent);

                break;

            case CS_NORMAL_ENABLED:

                title = context.getText(com.android.internal.R.string.RestrictedOnNormalTitle);

                details = context.getText(com.android.internal.R.string.RestrictedOnNormalContent);

                details = context.getText(com.android.internal.R.string.RestrictedStateContent);

                break;

            case CS_EMERGENCY_ENABLED:

                title = context.getText(com.android.internal.R.string.RestrictedOnEmergencyTitle);

                details = context.getText(

                        com.android.internal.R.string.RestrictedOnEmergencyContent);

                        com.android.internal.R.string.RestrictedStateContent);

                break;

            case CS_DISABLED:

                // do nothing and cancel the notification later