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

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

Merge "Clear dns cache when restoring network access" into main am: 8cdacba7 

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



Change-Id: I11a8a2763d60c3bc01acc3ca0a56a4b79552b61b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f41ab02d 8cdacba7

core/java/android/app/ActivityThread.java

+7 −0
Original line number Diff line number Diff line
@@ -4022,6 +4022,13 @@ public final class ActivityThread extends ClientTransactionHandler 
                    ActivityManager.getService().waitForNetworkStateUpdate(mNetworkBlockSeq);

                    mNetworkBlockSeq = INVALID_PROC_STATE_SEQ;

                } catch (RemoteException ignored) {}

                if (android.app.Flags.clearDnsCacheOnNetworkRulesUpdate()) {

                    // InetAddress will cache UnknownHostException failures. If the rules got

                    // updated and the app has network access now, we need to clear the negative

                    // cache to ensure valid dns queries can work immediately.

                    // TODO: b/329133769 - Clear only the negative cache once it is available.

                    InetAddress.clearDnsCache();

                }

            }

        }

    }

core/java/android/app/network-policy.aconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
package: "android.app"



flag {

     namespace: "backstage_power"

     name: "clear_dns_cache_on_network_rules_update"

     description: "Clears the DNS cache when the network rules update"

     bug: "237556596"

     metadata {

       purpose: PURPOSE_BUGFIX

     }

}
 
 No newline at end of file