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

Commit 6a0ec320 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Deprecated userspace reboot related APIs" into main am: 9089e915 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2692646



Change-Id: I3569b3ccca3d9dd9b730c474d3bc8176f5903e6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba1789e9 9089e915

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();

    }