Fixes SELinux property for HSUM emulation:

- Renames the property
- Removes temporary try/catch

Test: adb shell cmd user set-system-user-mode-emulation full # on HSUM device
Fixes: 226643927

Change-Id: Iaba42fd56dce0d8d794ef129634df78f9599260f
This commit is contained in:
Felipe Leme
2022-04-20 10:59:22 -07:00
parent 661831e2c0
commit ec00eb9336
2 changed files with 11 additions and 18 deletions

View File

@@ -1577,7 +1577,7 @@ public class UserManager {
*
* @hide
*/
public static final String DEV_HEADLESS_SYSTEM_USER_MODE_PROPERTY =
public static final String SYSTEM_USER_MODE_EMULATION_PROPERTY =
"persist.debug.user_mode_emulation";
/** @hide */
@@ -2049,7 +2049,7 @@ public class UserManager {
return realMode;
}
final String emulatedMode = SystemProperties.get(DEV_HEADLESS_SYSTEM_USER_MODE_PROPERTY);
final String emulatedMode = SystemProperties.get(SYSTEM_USER_MODE_EMULATION_PROPERTY);
switch (emulatedMode) {
case SYSTEM_USER_MODE_EMULATION_FULL:
Log.d(TAG, "isHeadlessSystemUserMode(): emulating as false");
@@ -2062,7 +2062,7 @@ public class UserManager {
return realMode;
default:
Log.wtf(TAG, "isHeadlessSystemUserMode(): invalid value of property "
+ DEV_HEADLESS_SYSTEM_USER_MODE_PROPERTY + " (" + emulatedMode + "); using"
+ SYSTEM_USER_MODE_EMULATION_PROPERTY + " (" + emulatedMode + "); using"
+ " default value (headless=" + realMode + ")");
return realMode;
}