Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Icdefe7fea64c953b7987a83b36266ce31684d76f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Simon MacMullen
2023-06-06 15:40:36 +00:00
committed by Automerger Merge Worker
parent 52267df89f 27749c29ed
commit a4044358aa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -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) {