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

Commit 70b615b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make LocationProvider exemption SystemApi" into sc-dev am: 1628ab39 

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

Change-Id: I1a1189a864d3f249574646fd97e27a684b437d45
parents e0bb6d05 1628ab39

apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java

+2 −1
Original line number Diff line number Diff line
@@ -283,9 +283,10 @@ public class PowerExemptionManager { 
     */

    public static final int REASON_PACKAGE_REPLACED = 311;

    /**

     * LocationProviderManager.

     * LocationProvider.

     * @hide

     */

    @SystemApi

    public static final int REASON_LOCATION_PROVIDER = 312;

    /**

     * MediaButtonReceiver.

apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java

+2 −1
Original line number Diff line number Diff line
@@ -284,9 +284,10 @@ public class PowerWhitelistManager { 
     */

    public static final int REASON_PACKAGE_REPLACED = PowerExemptionManager.REASON_PACKAGE_REPLACED;

    /**

     * LocationProviderManager.

     * LocationProvider.

     * @hide

     */

    @SystemApi

    public static final int REASON_LOCATION_PROVIDER =

            PowerExemptionManager.REASON_LOCATION_PROVIDER;

    /**

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -8391,6 +8391,7 @@ package android.os { 
    field public static final int REASON_ACCOUNT_TRANSFER = 104; // 0x68

    field public static final int REASON_ACTIVITY_RECOGNITION = 103; // 0x67

    field public static final int REASON_GEOFENCING = 100; // 0x64

    field public static final int REASON_LOCATION_PROVIDER = 312; // 0x138

    field public static final int REASON_OTHER = 1; // 0x1

    field public static final int REASON_PUSH_MESSAGING = 101; // 0x65

    field public static final int REASON_PUSH_MESSAGING_OVER_QUOTA = 102; // 0x66
@@ -8443,6 +8444,7 @@ package android.os { 
    field @Deprecated public static final int EVENT_UNSPECIFIED = 0; // 0x0

    field @Deprecated public static final int REASON_ACTIVITY_RECOGNITION = 103; // 0x67

    field @Deprecated public static final int REASON_GEOFENCING = 100; // 0x64

    field @Deprecated public static final int REASON_LOCATION_PROVIDER = 312; // 0x138

    field @Deprecated public static final int REASON_OTHER = 1; // 0x1

    field @Deprecated public static final int REASON_PUSH_MESSAGING = 101; // 0x65

    field @Deprecated public static final int REASON_PUSH_MESSAGING_OVER_QUOTA = 102; // 0x66