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

Commit e55d075b authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

Merge "Support test skipping when power save modes aren't enabled." am: 57538e6b 

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



Change-Id: I2d1a097a920c6d0057b17e895765b8d8efa0030f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c713acd 57538e6b

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -1565,8 +1565,10 @@ public class AppStandbyController 
    @Override

    @Override

    @StandbyBuckets public int getAppStandbyBucket(String packageName, int userId,

    @StandbyBuckets public int getAppStandbyBucket(String packageName, int userId,

            long elapsedRealtime, boolean shouldObfuscateInstantApps) {

            long elapsedRealtime, boolean shouldObfuscateInstantApps) {

        if (!mAppIdleEnabled || (shouldObfuscateInstantApps

        if (!mAppIdleEnabled) {

                && mInjector.isPackageEphemeral(userId, packageName))) {

            return STANDBY_BUCKET_EXEMPTED;

        }

        if (shouldObfuscateInstantApps && mInjector.isPackageEphemeral(userId, packageName)) {

            return STANDBY_BUCKET_ACTIVE;

            return STANDBY_BUCKET_ACTIVE;

        }

        }

core/api/test-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -683,6 +683,7 @@ package android.app.usage { 




  public final class UsageStatsManager {

  public final class UsageStatsManager {

    method public void forceUsageSourceSettingRead();

    method public void forceUsageSourceSettingRead();

    method public boolean isAppStandbyEnabled();

  }

  }





}

}
@@ -1834,6 +1835,7 @@ package android.os { 
  }

  }





  public final class PowerManager {

  public final class PowerManager {

    method public boolean areAutoPowerSaveModesEnabled();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_LOW_POWER_STANDBY, android.Manifest.permission.DEVICE_POWER}) public void forceLowPowerStandbyActive(boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_LOW_POWER_STANDBY, android.Manifest.permission.DEVICE_POWER}) public void forceLowPowerStandbyActive(boolean);

    field public static final String ACTION_ENHANCED_DISCHARGE_PREDICTION_CHANGED = "android.os.action.ENHANCED_DISCHARGE_PREDICTION_CHANGED";

    field public static final String ACTION_ENHANCED_DISCHARGE_PREDICTION_CHANGED = "android.os.action.ENHANCED_DISCHARGE_PREDICTION_CHANGED";

    field @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public static final int SYSTEM_WAKELOCK = -2147483648; // 0x80000000

    field @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public static final int SYSTEM_WAKELOCK = -2147483648; // 0x80000000

core/java/android/app/usage/IUsageStatsManager.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ interface IUsageStatsManager { 
    UsageEvents queryEventsForPackageForUser(long beginTime, long endTime, int userId, String pkg, String callingPackage);

    UsageEvents queryEventsForPackageForUser(long beginTime, long endTime, int userId, String pkg, String callingPackage);

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    void setAppInactive(String packageName, boolean inactive, int userId);

    void setAppInactive(String packageName, boolean inactive, int userId);

    boolean isAppStandbyEnabled();

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    boolean isAppInactive(String packageName, int userId, String callingPackage);

    boolean isAppInactive(String packageName, int userId, String callingPackage);

    void onCarrierPrivilegedAppsChanged();

    void onCarrierPrivilegedAppsChanged();

core/java/android/app/usage/UsageStatsManager.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -641,6 +641,19 @@ public final class UsageStatsManager { 
        return aggregatedStats;

        return aggregatedStats;

    }

    }





    /**

     * Returns whether the app standby bucket feature is enabled.

     * @hide

     */

    @TestApi

    public boolean isAppStandbyEnabled() {

        try {

            return mService.isAppStandbyEnabled();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

    /**

     * Returns whether the specified app is currently considered inactive. This will be true if the

     * Returns whether the specified app is currently considered inactive. This will be true if the

     * app hasn't been used directly or indirectly for a period of time defined by the system. This

     * app hasn't been used directly or indirectly for a period of time defined by the system. This

core/java/android/os/IPowerManager.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ interface IPowerManager 
    float getBrightnessConstraint(int constraint);

    float getBrightnessConstraint(int constraint);

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    boolean isInteractive();

    boolean isInteractive();

    boolean areAutoPowerSaveModesEnabled();

    boolean isPowerSaveMode();

    boolean isPowerSaveMode();

    PowerSaveState getPowerSaveState(int serviceType);

    PowerSaveState getPowerSaveState(int serviceType);

    boolean setPowerSaveModeEnabled(boolean mode);

    boolean setPowerSaveModeEnabled(boolean mode);