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

Commit 3347a6c3 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager" am: ed4117ff am:... 

Merge "Move ACTION_CLEAR_DNS_CACHE to ConnectivityManager" am: ed4117ff am: d40e1709 am: 52b89218

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

Change-Id: I5fd350d67065211b84dbea769d258daff9780276
parents 99d2eef8 52b89218

core/api/module-lib-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ package android.content { 
    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_CLEAR_DNS_CACHE = "android.intent.action.CLEAR_DNS_CACHE";

  }



}



package android.content.pm {

core/java/android/content/Intent.java

+0 −8
Original line number Diff line number Diff line
@@ -2400,14 +2400,6 @@ public class Intent implements Parcelable, Cloneable { 
     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_TIMEZONE_CHANGED = "android.intent.action.TIMEZONE_CHANGED";

    /**

     * Clear DNS Cache Action: This is broadcast when networks have changed and old

     * DNS entries should be tossed.

     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static final String ACTION_CLEAR_DNS_CACHE = "android.intent.action.CLEAR_DNS_CACHE";

    /**

     * Alarm Changed Action: This is broadcast when the AlarmClock

     * application's alarm is set or unset.  It is used by the

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ 
    <protected-broadcast android:name="android.nfc.handover.intent.action.HANDOVER_SEND_MULTIPLE" />

    <protected-broadcast android:name="com.android.nfc.handover.action.CANCEL_HANDOVER_TRANSFER" />



    <protected-broadcast android:name="android.intent.action.CLEAR_DNS_CACHE" />

    <protected-broadcast android:name="android.net.action.CLEAR_DNS_CACHE" />

    <protected-broadcast android:name="android.intent.action.PROXY_CHANGE" />



    <protected-broadcast android:name="android.os.UpdateLock.UPDATE_LOCK_CHANGED" />

packages/Connectivity/framework/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ package android.net { 
    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void startCaptivePortalApp(@NonNull android.net.Network);

    method public void systemReady();

    field public static final String ACTION_CLEAR_DNS_CACHE = "android.net.action.CLEAR_DNS_CACHE";

    field public static final String ACTION_PROMPT_LOST_VALIDATION = "android.net.action.PROMPT_LOST_VALIDATION";

    field public static final String ACTION_PROMPT_PARTIAL_CONNECTIVITY = "android.net.action.PROMPT_PARTIAL_CONNECTIVITY";

    field public static final String ACTION_PROMPT_UNVALIDATED = "android.net.action.PROMPT_UNVALIDATED";

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+9 −0
Original line number Diff line number Diff line
@@ -449,6 +449,15 @@ public class ConnectivityManager { 
    public static final String ACTION_PROMPT_PARTIAL_CONNECTIVITY =

            "android.net.action.PROMPT_PARTIAL_CONNECTIVITY";



    /**

     * Clear DNS Cache Action: This is broadcast when networks have changed and old

     * DNS entries should be cleared.

     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static final String ACTION_CLEAR_DNS_CACHE = "android.net.action.CLEAR_DNS_CACHE";



    /**

     * Invalid tethering type.

     * @see #startTethering(int, boolean, OnStartTetheringCallback)