commit c3a2764012603f8124713d1562436afa83d7bd05
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 29 05:10:06 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 29 05:10:06 2024 +0000
tree b3a9ea28c9b2b2fe5e30fd81a8033f47adfa8028
parent 323c15448a9bb64cee65f3c95c0138112fe629db
parent 5023143dcfa8478ea1eb33457613beca3ca78164

Merge "Add a new module-only API to preload HttpEngine" into main

framework/Android.bp

diff --git a/framework/Android.bp b/framework/Android.bp
index a5a7d61..a93a532 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -158,6 +158,7 @@
 java_defaults {
     name: "CronetJavaDefaults",
     srcs: [":httpclient_api_sources"],
+    static_libs: ["com.android.net.http.flags-aconfig-java"],
     libs: [
         "androidx.annotation_annotation",
     ],
@@ -218,6 +219,7 @@
     },
     aconfig_declarations: [
         "com.android.net.flags-aconfig",
+        "com.android.net.http.flags-aconfig",
         "com.android.networksecurity.flags-aconfig",
     ],
 }

framework/api/module-lib-current.txt

diff --git a/framework/api/module-lib-current.txt b/framework/api/module-lib-current.txt
index cd7307f..0129e5c 100644
--- a/framework/api/module-lib-current.txt
+++ b/framework/api/module-lib-current.txt
@@ -247,3 +247,11 @@
 
 }
 
+package android.net.http {
+
+  public abstract class HttpEngine {
+    method @FlaggedApi("android.net.http.preload_httpengine_in_zygote") public static void preload();
+  }
+
+}
+