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

Ensure we don't record 0 MCC/MNC.

Browse Source 
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
This commit is contained in:
Simon MacMullen
2023-06-05 14:33:39 +00:00
committed by Cherrypicker Worker
parent fb1f31f8ad
commit 08165b907a
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) {