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

Commit c4b46046 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add the aconfig flag enable_chips for WebView feature CHIPS"" into main

parents 0890b9a3 724d7d6c

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -19271,7 +19271,6 @@ package android.webkit { 
    method @Deprecated public abstract void setUseWebViewBackgroundForOverscrollBackground(boolean);

    method @Deprecated public abstract void setUserAgent(int);

    method public abstract void setVideoOverlayForEmbeddedEncryptedVideoEnabled(boolean);

    field @FlaggedApi("android.webkit.enable_chips") public static final long ENABLE_CHIPS = 380890146L; // 0x16b3ec22L

    field public static final long ENABLE_SIMPLIFIED_DARK_MODE = 214741472L; // 0xcccb1e0L

    field @FlaggedApi("android.webkit.user_agent_reduction") public static final long ENABLE_USER_AGENT_REDUCTION = 371034303L; // 0x161d88bfL

  }

core/java/android/webkit/WebSettings.java

+0 −13
Original line number Diff line number Diff line
@@ -1789,17 +1789,4 @@ public abstract class WebSettings { 
     * @see #setDisabledActionModeMenuItems

     */

    public static final int MENU_ITEM_PROCESS_TEXT = 1 << 2;



    /**

     * Enable CHIPS for webview.

     * This provides a means to check if partitioned cookies are enabled by default.

     * CHIPS will only be enabled by default for apps targeting Android B or above.

     *

     * @hide

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM)

    @FlaggedApi(android.webkit.Flags.FLAG_ENABLE_CHIPS)

    @SystemApi

    public static final long ENABLE_CHIPS = 380890146L;

}

core/java/android/webkit/flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -35,14 +35,6 @@ flag { 
    bug: "371034303"

}



flag {

    name: "enable_chips"

    is_exported: true

    namespace: "webview"

    description: "New feature enable CHIPS for webview"

    bug: "359448044"

}



flag {

    name: "file_system_access"

    is_exported: true