Merge "Ensure we don't record 0 MCC/MNC." (dddbe842) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	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
		// only when allowed, we check the current UID.
		if (Process.myUid() == Process.SYSTEM_UID) {
		if (values.mcc != 0) {
		SystemProperties.set("debug.tracing.mcc", Integer.toString(values.mcc));
		}
		if (values.mnc != 0) {
		SystemProperties.set("debug.tracing.mnc", Integer.toString(values.mnc));
		}
		}

		if (!initLocale && !values.getLocales().isEmpty() && values.userSetLocale) {
		final LocaleList locales = values.getLocales();