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

Merge "Store MCC and MNC as system properties on userdebug builds."

Browse Source
This commit is contained in:
Simon MacMullen
2022-12-05 11:48:59 +00:00
committed by Android (Google) Code Review
parent d4a318a0a4 a12c7d6a8d
commit 189b67e821
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();