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

Commit a4044358 authored by Simon MacMullen's avatar Simon MacMullen Committed by Automerger Merge Worker
Browse files

Merge "Ensure we don't record 0 MCC/MNC." into udc-dev am: ff7845ea am: 27749c29 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23582662



Change-Id: Icdefe7fea64c953b7987a83b36266ce31684d76f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52267df8 27749c29

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -4505,9 +4505,13 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        // to set debug system properties. To ensure that system properties are set

        // to set debug system properties. To ensure that system properties are set

        // only when allowed, we check the current UID.

        // only when allowed, we check the current UID.

        if (Process.myUid() == Process.SYSTEM_UID) {

        if (Process.myUid() == Process.SYSTEM_UID) {

            if (values.mcc != 0) {

                SystemProperties.set("debug.tracing.mcc", Integer.toString(values.mcc));

                SystemProperties.set("debug.tracing.mcc", Integer.toString(values.mcc));

            }

            if (values.mnc != 0) {

                SystemProperties.set("debug.tracing.mnc", Integer.toString(values.mnc));

                SystemProperties.set("debug.tracing.mnc", Integer.toString(values.mnc));

            }

            }

        }





        if (!initLocale && !values.getLocales().isEmpty() && values.userSetLocale) {

        if (!initLocale && !values.getLocales().isEmpty() && values.userSetLocale) {

            final LocaleList locales = values.getLocales();

            final LocaleList locales = values.getLocales();