summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nikita Ioffe <ioffe@google.com> 2023-08-03 15:20:26 +0100
committer Nikita Ioffe <ioffe@google.com> 2023-08-03 15:23:21 +0100
commit55b231368250448d008b2dec94eb4962e570bfcc (patch)
treea90fe1f50b80db40c0b3536ece874743e5d1d961
parentda436ad3e31f95eae922519ff1cbcf90b60900cb (diff)
Deprecated userspace reboot related APIs
The feature was initially introduced to support Mainline updates, but was never actually used by Mainline (instead Mainline uses reboot-on-resume feature). Bug: 292469129 Test: m Change-Id: Iae60ffcfb3e64d35e0e1444b568d69895b27ff8f
-rw-r--r--core/api/current.txt2
-rw-r--r--core/api/system-current.txt2
-rw-r--r--core/java/android/os/PowerManager.java9
3 files changed, 8 insertions, 5 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index abf3a2f0ddf8..988fcf334e09 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -31970,7 +31970,7 @@ package android.os {
method public boolean isInteractive();
method public boolean isLowPowerStandbyEnabled();
method public boolean isPowerSaveMode();
- method public boolean isRebootingUserspaceSupported();
+ method @Deprecated public boolean isRebootingUserspaceSupported();
method @Deprecated public boolean isScreenOn();
method public boolean isSustainedPerformanceModeSupported();
method public boolean isWakeLockLevelSupported(int);
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 821944f406cd..c893b5432269 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -9627,7 +9627,7 @@ package android.os {
method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.USER_ACTIVITY}) public void userActivity(long, int, int);
field public static final int POWER_SAVE_MODE_TRIGGER_DYNAMIC = 1; // 0x1
field public static final int POWER_SAVE_MODE_TRIGGER_PERCENTAGE = 0; // 0x0
- field public static final String REBOOT_USERSPACE = "userspace";
+ field @Deprecated public static final String REBOOT_USERSPACE = "userspace";
field public static final int SOUND_TRIGGER_MODE_ALL_DISABLED = 2; // 0x2
field public static final int SOUND_TRIGGER_MODE_ALL_ENABLED = 0; // 0x0
field public static final int SOUND_TRIGGER_MODE_CRITICAL_ONLY = 1; // 0x1
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index aa733b5c6d49..bd040b2e9633 100644
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -33,7 +33,6 @@ import android.app.PropertyInvalidatedCache;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.service.dreams.Sandman;
-import android.sysprop.InitProperties;
import android.util.ArrayMap;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
@@ -873,6 +872,8 @@ public final class PowerManager {
/**
* The 'reason' value used for rebooting userspace.
+ *
+ * @deprecated userspace reboot is not supported
* @hide
*/
@SystemApi
@@ -1805,16 +1806,18 @@ public final class PowerManager {
* <p>This method exists solely for the sake of re-using same logic between {@code PowerManager}
* and {@code PowerManagerService}.
*
+ * @deprecated TODO(b/292469129): remove this method.
* @hide
*/
public static boolean isRebootingUserspaceSupportedImpl() {
- return InitProperties.is_userspace_reboot_supported().orElse(false);
+ return false;
}
/**
* Returns {@code true} if this device supports rebooting userspace.
+ *
+ * @deprecated userspace reboot is deprecated, this method always returns {@code false}.
*/
- // TODO(b/138605180): add link to documentation once it's ready.
public boolean isRebootingUserspaceSupported() {
return isRebootingUserspaceSupportedImpl();
}