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

Commit 4a76a3f3 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Make CHANGE_APP_IDLE_STATE a system API"

parents e69b0721 4470ab9c

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -39925,8 +39925,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";

api/system-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -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";
@@ -7677,6 +7678,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
@@ -43442,8 +43444,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";

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -40322,8 +40322,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";

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

+3 −0
Original line number Diff line number Diff line
@@ -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());

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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.