From 08165b907a2a2aa69f75d41fab6d01fcc687a084 Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Mon, 5 Jun 2023 14:33:39 +0000 Subject: [PATCH] Ensure we don't record 0 MCC/MNC. We see lots of traces where correct-looking MCC/MNC are replaced by 0/0. Bug: 285879449 Test: recorded a trace. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c9bb739def1dbf743e892e1950aeaaf7b4c8f33d) Merged-In: I532e2b97f7fb9337850613d56f70cfd3377462f0 Change-Id: I532e2b97f7fb9337850613d56f70cfd3377462f0 --- .../com/android/server/wm/ActivityTaskManagerService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index d332dfdbadb42..47b51ac164b95 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -4505,8 +4505,12 @@ 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) { - SystemProperties.set("debug.tracing.mcc", Integer.toString(values.mcc)); - SystemProperties.set("debug.tracing.mnc", Integer.toString(values.mnc)); + 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) {