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

Commit d8ef70a4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make ACTION_SETTING_RESTORED SystemApi" am: 2e2a97c0 

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

Change-Id: I118e03bf063d1d2d70c9a2feabbcfb4db6872dea
parents d6088794 2e2a97c0

core/api/module-lib-current.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -71,6 +71,14 @@ package android.content { 
    field public static final String TEST_NETWORK_SERVICE = "test_network";

    field public static final String TEST_NETWORK_SERVICE = "test_network";

  }

  }





  public class Intent implements java.lang.Cloneable android.os.Parcelable {

    field public static final String ACTION_SETTING_RESTORED = "android.os.action.SETTING_RESTORED";

    field public static final String EXTRA_SETTING_NAME = "setting_name";

    field public static final String EXTRA_SETTING_NEW_VALUE = "new_value";

    field public static final String EXTRA_SETTING_PREVIOUS_VALUE = "previous_value";

    field public static final String EXTRA_SETTING_RESTORED_FROM_SDK_INT = "restored_from_sdk_int";

  }



}

}





package android.content.pm {

package android.content.pm {

core/java/android/content/Intent.java

+38 −7
Original line number Original line Diff line number Diff line
@@ -4206,9 +4206,9 @@ public class Intent implements Parcelable, Cloneable { 
     * restored from (corresponds to {@link android.os.Build.VERSION#SDK_INT}). The first three

     * restored from (corresponds to {@link android.os.Build.VERSION#SDK_INT}). The first three

     * values are represented as strings, the fourth one as int.

     * values are represented as strings, the fourth one as int.

     *

     *

     * <p>This broadcast is sent only for settings provider entries known to require special handling

     * <p>This broadcast is sent only for settings provider entries known to require special

     * around restore time.  These entries are found in the BROADCAST_ON_RESTORE table within

     * handling around restore time to specific receivers. These entries are found in the

     * the provider's backup agent implementation.

     * BROADCAST_ON_RESTORE table within the provider's backup agent implementation.

     *

     *

     * @see #EXTRA_SETTING_NAME

     * @see #EXTRA_SETTING_NAME

     * @see #EXTRA_SETTING_PREVIOUS_VALUE

     * @see #EXTRA_SETTING_PREVIOUS_VALUE
@@ -4216,15 +4216,46 @@ public class Intent implements Parcelable, Cloneable { 
     * @see #EXTRA_SETTING_RESTORED_FROM_SDK_INT

     * @see #EXTRA_SETTING_RESTORED_FROM_SDK_INT

     * {@hide}

     * {@hide}

     */

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @SuppressLint("ActionValue")

    public static final String ACTION_SETTING_RESTORED = "android.os.action.SETTING_RESTORED";

    public static final String ACTION_SETTING_RESTORED = "android.os.action.SETTING_RESTORED";





    /** {@hide} */

    /**

     * String intent extra to be used with {@link ACTION_SETTING_RESTORED}.

     * Contain the name of the restored setting.

     * {@hide}

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @SuppressLint("ActionValue")

    public static final String EXTRA_SETTING_NAME = "setting_name";

    public static final String EXTRA_SETTING_NAME = "setting_name";

    /** {@hide} */



    /**

     * String intent extra to be used with {@link ACTION_SETTING_RESTORED}.

     * Contain the value of the {@link EXTRA_SETTING_NAME} settings entry prior to the restore

     * operation.

     * {@hide}

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @SuppressLint("ActionValue")

    public static final String EXTRA_SETTING_PREVIOUS_VALUE = "previous_value";

    public static final String EXTRA_SETTING_PREVIOUS_VALUE = "previous_value";

    /** {@hide} */



    /**

     * String intent extra to be used with {@link ACTION_SETTING_RESTORED}.

     * Contain the value of the {@link EXTRA_SETTING_NAME} settings entry being restored.

     * {@hide}

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @SuppressLint("ActionValue")

    public static final String EXTRA_SETTING_NEW_VALUE = "new_value";

    public static final String EXTRA_SETTING_NEW_VALUE = "new_value";

    /** {@hide} */



    /**

     * Int intent extra to be used with {@link ACTION_SETTING_RESTORED}.

     * Contain the version of the SDK that the setting has been restored from (corresponds to

     * {@link android.os.Build.VERSION#SDK_INT}).

     * {@hide}

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @SuppressLint("ActionValue")

    public static final String EXTRA_SETTING_RESTORED_FROM_SDK_INT = "restored_from_sdk_int";

    public static final String EXTRA_SETTING_RESTORED_FROM_SDK_INT = "restored_from_sdk_int";





    /**

    /**