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

Commit 20690ec5 authored by Edgar Arriaga García's avatar Edgar Arriaga García Committed by Android (Google) Code Review
Browse files

Merge changes from topic "ea-pin-webview" into main 

* changes:
  Expose PinnerService stats via binder service
  Improve pinner service dumpsys output
  Pin webview to memory
  Add webview pinning trunk stable flag
parents 1a058643 cb918559

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ aconfig_srcjars = [ 
    ":android.app.flags-aconfig-java{.generated_srcjars}",

    ":android.credentials.flags-aconfig-java{.generated_srcjars}",

    ":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",

    ":com.android.server.flags.pinner-aconfig-java{.generated_srcjars}",

    ":android.service.voice.flags-aconfig-java{.generated_srcjars}",

    ":android.media.tv.flags-aconfig-java{.generated_srcjars}",

    ":android.service.autofill.flags-aconfig-java{.generated_srcjars}",
@@ -584,6 +585,19 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Pinner Service

aconfig_declarations {

    name: "com.android.server.flags.pinner-aconfig",

    package: "com.android.server.flags",

    srcs: ["services/core/java/com/android/server/flags/pinner.aconfig"],

}



java_aconfig_library {

    name: "com.android.server.flags.pinner-aconfig-java",

    aconfig_declarations: "com.android.server.flags.pinner-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Voice

aconfig_declarations {

    name: "android.service.voice.flags-aconfig",

core/api/test-current.txt

+19 −0
Original line number Diff line number Diff line
@@ -780,6 +780,25 @@ package android.app.job { 


}



package android.app.pinner {



  @FlaggedApi("android.app.pinner_service_client_api") public final class PinnedFileStat implements android.os.Parcelable {

    ctor @FlaggedApi("android.app.pinner_service_client_api") public PinnedFileStat(@NonNull String, long, @NonNull String);

    method @FlaggedApi("android.app.pinner_service_client_api") public int describeContents();

    method @FlaggedApi("android.app.pinner_service_client_api") public long getBytesPinned();

    method @FlaggedApi("android.app.pinner_service_client_api") @NonNull public String getFilename();

    method @FlaggedApi("android.app.pinner_service_client_api") @NonNull public String getGroupName();

    method @FlaggedApi("android.app.pinner_service_client_api") public void writeToParcel(@NonNull android.os.Parcel, int);

    field @FlaggedApi("android.app.pinner_service_client_api") @NonNull public static final android.os.Parcelable.Creator<android.app.pinner.PinnedFileStat> CREATOR;

  }



  @FlaggedApi("android.app.pinner_service_client_api") public class PinnerServiceClient {

    ctor @FlaggedApi("android.app.pinner_service_client_api") public PinnerServiceClient();

    method @FlaggedApi("android.app.pinner_service_client_api") @NonNull public java.util.List<android.app.pinner.PinnedFileStat> getPinnerStats();

  }



}



package android.app.prediction {



  public final class AppPredictor {

core/java/android/app/OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ per-file IEphemeralResolver.aidl = file:/services/core/java/com/android/server/p 
per-file IInstantAppResolver.aidl = file:/services/core/java/com/android/server/pm/OWNERS

per-file InstantAppResolveInfo.aidl = file:/services/core/java/com/android/server/pm/OWNERS



# Pinner

per-file pinner-client.aconfig = file:/core/java/android/app/pinner/OWNERS



# ResourcesManager

per-file ResourcesManager.java = file:RESOURCES_OWNERS

core/java/android/app/pinner-client.aconfig

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



flag {

     namespace: "system_performance"

     name: "pinner_service_client_api"

     description: "Control exposing PinnerService APIs."

     bug: "307594624"

}
 
 No newline at end of file

core/java/android/app/pinner/IPinnerService.aidl

0 → 100644
+12 −0
Original line number Diff line number Diff line 
package android.app.pinner;



import android.app.pinner.PinnedFileStat;



/**

 * Interface for processes to communicate with system's PinnerService.

 * @hide

 */

interface IPinnerService {

    @EnforcePermission("DUMP")

    List<PinnedFileStat> getPinnerStats();

}
 
 No newline at end of file