Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make LocationProvider exemption SystemApi" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-19 15:22:11 +00:00
committed by Android (Google) Code Review
parent 4b537e9170 1bc2da8435
commit 1628ab397e
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java
View File

@@ -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.

3
apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java
View File

@@ -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;
/**

2
core/api/system-current.txt
View File

@@ -8390,6 +8390,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
@@ -8442,6 +8443,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