Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55b23136 authored by Nikita Ioffe's avatar Nikita Ioffe
Browse files

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
parent da436ad3

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java/android/os/PowerManager.java

+6 −3
Original line number Diff line number Diff line
@@ -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();

    }