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

Merge "Make init.userspace_reboot.is_supported a rw property" into rvc-dev am: d8c1e77cf8 am: a2c34761b3 am: d1635bba87

Browse Source 
Change-Id: I1ab8b944590bc0ab772fd5ecde6ded8cba13538d
This commit is contained in:
Nikita Ioffe
2020-04-02 16:15:22 +00:00
committed by Automerger Merge Worker
parent 0c465b3dc3 d1635bba87
commit 696de130ba
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/PowerManager.java
View File

@@ -32,6 +32,7 @@ import android.app.PropertyInvalidatedCache;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context; import android.content.Context;
import android.service.dreams.Sandman; import android.service.dreams.Sandman;
import android.sysprop.InitProperties;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
@@ -1487,7 +1488,7 @@ public final class PowerManager {
*/ */
// TODO(b/138605180): add link to documentation once it's ready. // TODO(b/138605180): add link to documentation once it's ready.
public boolean isRebootingUserspaceSupported() { public boolean isRebootingUserspaceSupported() {
return SystemProperties.getBoolean("ro.init.userspace_reboot.is_supported", false); return InitProperties.is_userspace_reboot_supported().orElse(false);
} }
/** /**