diff options
| author | 2023-06-06 15:30:45 +0000 | |
|---|---|---|
| committer | 2023-06-06 15:30:45 +0000 | |
| commit | af6702bffedffd7c45d4006ecb07fc5d4f9843c9 (patch) | |
| tree | dd16b1c14000693200230638bfce419e5a300755 | |
| parent | b9111d9142340bc075b04413c541c26f07ac3a72 (diff) | |
| parent | ff7845ea7eea76000c7c5a0eaac0d54b68657f3d (diff) | |
Merge "Ensure we don't record 0 MCC/MNC." into udc-dev am: ff7845ea7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23582662
Change-Id: Ia153a43fc7a8c4c112eebf07dbb56b86b7421e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityTaskManagerService.java | 8 |
1 files 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 d332dfdbadb4..47b51ac164b9 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) { |