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

Commit 189b67e8 authored by Simon MacMullen's avatar Simon MacMullen Committed by Android (Google) Code Review
Browse files

Merge "Store MCC and MNC as system properties on userdebug builds."

parents d4a318a0 a12c7d6a

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

+7 −0
Original line number Diff line number Diff line
@@ -4386,6 +4386,13 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                values.touchscreen,

                values.uiMode);



        // Note: certain tests currently run as platform_app which is not allowed

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

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

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

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

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

        }



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

            final LocaleList locales = values.getLocales();