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

Commit 0278c898 authored by Patrick Williams's avatar Patrick Williams Committed by Android (Google) Code Review
Browse files

Merge "Add role protection level to READ_FRAME_BUFFER" into main

parents 187ddc89 3d62b3aa
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -1569,6 +1569,18 @@ java_aconfig_library {
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
}

java_aconfig_library {
    name: "surfaceflinger_exported_flags_lib",
    aconfig_declarations: "surfaceflinger_flags",
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
    mode: "exported",
    min_sdk_version: "30",
    apex_available: [
        "//apex_available:platform",
        "com.android.permission",
    ],
}

java_aconfig_library {
    name: "libgui_flags_java_lib",
    aconfig_declarations: "libgui_flags",
+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ package android {
    field public static final String READ_CONTENT_RATING_SYSTEMS = "android.permission.READ_CONTENT_RATING_SYSTEMS";
    field public static final String READ_DEVICE_CONFIG = "android.permission.READ_DEVICE_CONFIG";
    field public static final String READ_DREAM_STATE = "android.permission.READ_DREAM_STATE";
    field @FlaggedApi("com.android.graphics.surfaceflinger.flags.readback_screenshot") public static final String READ_FRAME_BUFFER = "android.permission.READ_FRAME_BUFFER";
    field public static final String READ_GLOBAL_APP_SEARCH_DATA = "android.permission.READ_GLOBAL_APP_SEARCH_DATA";
    field @FlaggedApi("android.content.pm.get_resolved_apk_path") public static final String READ_INSTALLED_SESSION_PATHS = "android.permission.READ_INSTALLED_SESSION_PATHS";
    field public static final String READ_INSTALL_SESSIONS = "android.permission.READ_INSTALL_SESSIONS";
+1 −1
Original line number Diff line number Diff line
@@ -4165,7 +4165,7 @@ package android.view.contentcapture {
package android.view.displayhash {

  public final class DisplayHashManager {
    method @RequiresPermission("android.permission.READ_FRAME_BUFFER") public void setDisplayHashThrottlingEnabled(boolean);
    method @RequiresPermission(android.Manifest.permission.READ_FRAME_BUFFER) public void setDisplayHashThrottlingEnabled(boolean);
  }

}
+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ android_app {
        "appsearch_aconfig_flags",
        "aconfig_trade_in_mode_flags",
        "com.android.media.flags.projection-aconfig",
        "surfaceflinger_flags",
    ],
}

+12 −1
Original line number Diff line number Diff line
@@ -6668,7 +6668,18 @@
          @hide
          @removed -->
    <permission android:name="android.permission.READ_FRAME_BUFFER"
        android:protectionLevel="signature|recents" />
        android:protectionLevel="signature|recents"
        android:featureFlag="!com.android.graphics.surfaceflinger.flags.readback_screenshot" />
    <!-- Allows an application to take screen shots and more generally
         get access to the frame buffer data.
         <p>Not for use by third-party applications.
          @FlaggedApi(com.android.graphics.surfaceflinger.flags.Flags.FLAG_READBACK_SCREENSHOT)
          @SystemApi
          @hide -->
    <permission android:name="android.permission.READ_FRAME_BUFFER"
        android:protectionLevel="signature|recents|role"
        android:featureFlag="com.android.graphics.surfaceflinger.flags.readback_screenshot" />
      <!-- Allows an application to change the touch mode state.
           Without this permission, an app can only change the touch mode