diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/usage/UsageStatsManager.java | 3 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 |
5 files changed, 10 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 5a947ddcddf9..7f6cfaaff95e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39924,8 +39924,8 @@ package android.telephony { field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int"; field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool"; - field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool"; + field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array"; field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool"; field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool"; field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int"; diff --git a/api/system-current.txt b/api/system-current.txt index c0d106f5b615..077ac6439edf 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -88,6 +88,7 @@ package android { field public static final java.lang.String CAPTURE_SECURE_VIDEO_OUTPUT = "android.permission.CAPTURE_SECURE_VIDEO_OUTPUT"; field public static final java.lang.String CAPTURE_TV_INPUT = "android.permission.CAPTURE_TV_INPUT"; field public static final java.lang.String CAPTURE_VIDEO_OUTPUT = "android.permission.CAPTURE_VIDEO_OUTPUT"; + field public static final java.lang.String CHANGE_APP_IDLE_STATE = "android.permission.CHANGE_APP_IDLE_STATE"; field public static final java.lang.String CHANGE_COMPONENT_ENABLED_STATE = "android.permission.CHANGE_COMPONENT_ENABLED_STATE"; field public static final java.lang.String CHANGE_CONFIGURATION = "android.permission.CHANGE_CONFIGURATION"; field public static final java.lang.String CHANGE_DEVICE_IDLE_TEMP_WHITELIST = "android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"; @@ -7676,6 +7677,7 @@ package android.app.usage { method public java.util.List<android.app.usage.ConfigurationStats> queryConfigurations(int, long, long); method public android.app.usage.UsageEvents queryEvents(long, long); method public java.util.List<android.app.usage.UsageStats> queryUsageStats(int, long, long); + method public void setAppStandbyBucket(java.lang.String, int); method public void whitelistAppTemporarily(java.lang.String, long, android.os.UserHandle); field public static final int INTERVAL_BEST = 4; // 0x4 field public static final int INTERVAL_DAILY = 0; // 0x0 @@ -43440,8 +43442,8 @@ package android.telephony { field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int"; field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool"; - field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool"; + field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array"; field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool"; field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool"; field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int"; diff --git a/api/test-current.txt b/api/test-current.txt index c32ca21fff1c..ec7047370197 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -40318,8 +40318,8 @@ package android.telephony { field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int"; field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool"; - field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool"; + field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array"; field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool"; field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool"; field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int"; diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index c827432a8b0b..3a3e16e0956c 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -261,7 +261,10 @@ public final class UsageStatsManager { /** * @hide + * Changes the app standby state to the provided bucket. */ + @SystemApi + @RequiresPermission(android.Manifest.permission.CHANGE_APP_IDLE_STATE) public void setAppStandbyBucket(String packageName, @StandbyBuckets int bucket) { try { mService.setAppStandbyBucket(packageName, bucket, mContext.getUserId()); diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 77bfec345b1f..4a4de248b2a1 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3062,10 +3062,10 @@ android:protectionLevel="signature|privileged|development|appop" /> <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" /> - <!-- @hide Allows an application to change the app idle state of an app. + <!-- @hide @SystemApi Allows an application to change the app idle state of an app. <p>Not for use by third-party applications. --> <permission android:name="android.permission.CHANGE_APP_IDLE_STATE" - android:protectionLevel="signature" /> + android:protectionLevel="signature|privileged" /> <!-- @hide @SystemApi Allows an application to temporarily whitelist an inactive app to access the network and acquire wakelocks. |