Merge "Make init.userspace_reboot.is_supported a rw property" into rvc-dev

This commit is contained in:
Nikita Ioffe
2020-04-02 15:20:34 +00:00
committed by Android (Google) Code Review

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);
} }
/** /**