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

Store MCC and MNC as system properties on userdebug builds.

Browse Source 
This is so that we can read the properties, and thus infer the carrier, in Perfetto traces.

Bug: 259231861
Test: Recorded Perfetto trace.
Change-Id: Iddad52f28ac743cccbf8f6bf80d2d7d54c6a769b
This commit is contained in:
Simon MacMullen
2022-11-25 12:51:11 +00:00
parent 6b5d003f17
commit a12c7d6a8d
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4386,6 +4386,13 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
values.touchscreen,
values.uiMode);
// Note: certain tests currently run as platform_app which is not allowed
// 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 (!initLocale && !values.getLocales().isEmpty() && values.userSetLocale) {
final LocaleList locales = values.getLocales();