Site settings UI hooks refactors; Utility class for reflecting members in java; Support fetching DCL states; Set jitless flags based on DCL states and reflect on UI

args.gn

@@ -8,7 +8,7 @@ android_default_version_name = "148.0.7778.167"
 android_default_version_code = "777816700"
 
 ext_version_enabled = true
-ext_version_increment = "0"
+ext_version_increment = "1"
 
 is_component_build = false
 is_debug = false
@@ -49,8 +49,8 @@ trichrome_library_package = "app.vanadium.trichromelibrary"
 
 config_apk_package = "app.vanadium.config"
 config_apk_certdigest = "c6adb8b83c6d4c17d292afde56fd488a51d316ff8f2c11c5410223bff8a7dbb3"
-config_apk_version_name = "178"
-config_apk_version_code = "178"
+config_apk_version_name = "179"
+config_apk_version_code = "179"
 config_apk_is_debug = false
 
 # Explicitly disable static analysis as intended for official builds.

patches/0037-disable-sensors-access-by-default.patch → patches/0036-disable-sensors-access-by-default.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] disable sensors access by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index 73701662ea02a..b135d39e3b796 100644
+index 22c06c3a0825f..05f4bcca28443 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
 @@ -359,7 +359,7 @@ void ContentSettingsRegistry::Init() {

patches/0038-ask-before-playing-protected-media-by-default.patch → patches/0037-ask-before-playing-protected-media-by-default.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] ask before playing protected media by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index b135d39e3b796..7378a0e6dbddc 100644
+index 05f4bcca28443..cfe792f8f47df 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
 @@ -217,7 +217,7 @@ void ContentSettingsRegistry::Init() {

patches/0040-disable-background-sync-by-default.patch → patches/0039-disable-background-sync-by-default.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] disable background sync by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index 7378a0e6dbddc..625d38d8eee31 100644
+index cfe792f8f47df..d0b10fda002da 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
 @@ -244,7 +244,7 @@ void ContentSettingsRegistry::Init() {

patches/0141-config-parser-Add-config-parser-for-browser-and-webv.patch → patches/0140-config-parser-Add-config-parser-for-browser-and-webv.patch

@@ -14,8 +14,8 @@ Changes since:
 ---
  vanadium/android_config/proto/BUILD.gn        |  11 +
  .../config/VanadiumConfConditionals.java      |  42 ++
- .../vanadium/config/VanadiumConfParser.java   | 487 ++++++++++++++++++
- 3 files changed, 540 insertions(+)
+ .../vanadium/config/VanadiumConfParser.java   | 486 ++++++++++++++++++
+ 3 files changed, 539 insertions(+)
  create mode 100644 vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfConditionals.java
  create mode 100644 vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 
@@ -88,10 +88,10 @@ index 0000000000000..39d8de8b26056
 +}
 diff --git a/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 new file mode 100644
-index 0000000000000..bf72c17a87bbc
+index 0000000000000..91897eb883c71
 --- /dev/null
 +++ b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
-@@ -0,0 +1,487 @@
+@@ -0,0 +1,486 @@
 +package app.vanadium.config;
 +
 +import android.content.Context;
@@ -473,7 +473,6 @@ index 0000000000000..bf72c17a87bbc
 +        }
 +
 +        {
-+            boolean hasOtherComponentApks = false;
 +            final SparseArray<ParsedFlagSet> pendingFlags = new SparseArray<>();
 +            final SparseArray<ParsedComponent> pendingComponents = new SparseArray<>();
 +

patches/0147-Add-support-for-upstream-file-based-parsing-of-unind.patch → patches/0146-Add-support-for-upstream-file-based-parsing-of-unind.patch

@@ -116,7 +116,7 @@ index 0000000000000..a42d38734d266
 +    }
 +}
 diff --git a/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
-index bf72c17a87bbc..b4bc1463030bf 100644
+index 91897eb883c71..5d7d00cefd311 100644
 --- a/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 +++ b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 @@ -317,6 +317,9 @@ public final class VanadiumConfParser {

patches/0150-Add-hooks-for-initializing-contents-of-VanadiumConfi.patch → patches/0149-Add-hooks-for-initializing-contents-of-VanadiumConfi.patch

@@ -4,19 +4,19 @@ Date: Thu, 14 Dec 2023 16:54:04 +0000
 Subject: [PATCH] Add hooks for initializing contents of VanadiumConfig app
 
 ---
- .../base/config/VanadiumConfigBridge.java     | 102 ++++++++++++++++++
+ .../base/config/VanadiumConfigBridge.java     | 114 ++++++++++++++++++
  .../library_loader/LibraryLoaderHooks.java    |   5 +
  base/base_library_loader_java_ext_deps.gni    |   1 +
  base/base_library_loader_java_ext_sources.gni |   1 +
- 4 files changed, 109 insertions(+)
+ 4 files changed, 121 insertions(+)
  create mode 100644 base/android/java/src/org/chromium/base/config/VanadiumConfigBridge.java
 
 diff --git a/base/android/java/src/org/chromium/base/config/VanadiumConfigBridge.java b/base/android/java/src/org/chromium/base/config/VanadiumConfigBridge.java
 new file mode 100644
-index 0000000000000..f214548ae9e57
+index 0000000000000..8043d64761a01
 --- /dev/null
 +++ b/base/android/java/src/org/chromium/base/config/VanadiumConfigBridge.java
-@@ -0,0 +1,102 @@
+@@ -0,0 +1,114 @@
 +package org.chromium.base.config;
 +
 +import static org.chromium.base.command_line.VanadiumCommandLineUtils.getCommaDelimitedSwitchValue;
@@ -57,6 +57,18 @@ index 0000000000000..f214548ae9e57
 +    }
 +
 +    public static void applyFlagFromConfigs(Context appCtx, @LibraryProcessType int libraryProcessType) {
++        switch (libraryProcessType) {
++            case LibraryProcessType.PROCESS_BROWSER:
++            case LibraryProcessType.PROCESS_WEBVIEW:
++                break;
++            case LibraryProcessType.PROCESS_CHILD:
++            case LibraryProcessType.PROCESS_WEBVIEW_NONEMBEDDED:
++            case LibraryProcessType.PROCESS_WEBVIEW_CHILD:
++                return;
++            default:
++                throw new IllegalStateException();
++        }
++
 +        if (!VanadiumConfParser.isInitialized()) {
 +            Log.e(TAG, "Config app not parsed nor initialized, returning early");
 +            return;

patches/0023-Implement-UI-for-JIT-site-settings.patch → patches/0159-Implement-UI-for-JIT-site-settings.patch

@@ -5,8 +5,8 @@ Subject: [PATCH] Implement UI for JIT site settings
 
 ---
  .../JavascriptJitSettingsHooks.java           | 171 ++++++++++++++++++
- .../site_settings/SiteSettingsCategory.java   |  15 +-
- .../SiteSettingsHooksRegistry.java            |   7 +
+ .../site_settings/SiteSettingsCategory.java   |  10 +-
+ .../SiteSettingsHooksRegistry.java            |   6 +
  ...site_settings_android_java_ext_sources.gni |   1 +
  .../android/website_preference_bridge.cc      |   1 +
  .../strings/android/site_settings_ext.grdp    |  22 +++
@@ -15,7 +15,7 @@ Subject: [PATCH] Implement UI for JIT site settings
  components/page_info/page_info.cc             |   6 +
  components/page_info/page_info_ui.cc          |   2 +
  components/site_settings_strings_ext.grdp     |   6 +
- 11 files changed, 234 insertions(+), 2 deletions(-)
+ 11 files changed, 228 insertions(+), 2 deletions(-)
  create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/JavascriptJitSettingsHooks.java
 
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/JavascriptJitSettingsHooks.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/JavascriptJitSettingsHooks.java
@@ -196,7 +196,7 @@ index 0000000000000..6e7c250268f65
 +    }
 +}
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
-index b51d43d085ab4..05b8ef43302e4 100644
+index c5c26f7c7049c..ddfea3fd63f61 100644
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
 @@ -86,6 +86,10 @@ public class SiteSettingsCategory {
@@ -210,90 +210,64 @@ index b51d43d085ab4..05b8ef43302e4 100644
          Type.NUM_ENTRIES,
          // Three lines of placeholder comment to minimize cascading conflicts.
          // Three lines of placeholder comment to minimize cascading conflicts.
-@@ -138,6 +142,10 @@ public class SiteSettingsCategory {
-         /** Number of handled categories used for calculating array sizes. */
-         int NUM_ENTRIES_CHROMIUM = 39;
-
-+        // Three lines of placeholder comment to minimize cascading conflicts.
-+        // Three lines of placeholder comment to minimize cascading conflicts.
-+        // Three lines of placeholder comment to minimize cascading conflicts.
-+        int JAVASCRIPT_JIT = SiteSettingsCategory.Type.NUM_ENTRIES_CHROMIUM + SiteSettingsCategory.ExtType.JAVASCRIPT_JIT;
+@@ -141,7 +145,11 @@ public class SiteSettingsCategory {
          // Three lines of placeholder comment to minimize cascading conflicts.
          // Three lines of placeholder comment to minimize cascading conflicts.
          // Three lines of placeholder comment to minimize cascading conflicts.
-@@ -148,13 +156,18 @@ public class SiteSettingsCategory {
-     }
-
-     @IntDef({
-+        ExtType.JAVASCRIPT_JIT,
-         ExtType.NUM_ENTRIES,
-     })
-     @interface ExtType {
-         // Three lines of placeholder comment to minimize cascading conflicts.
-         // Three lines of placeholder comment to minimize cascading conflicts.
-         // Three lines of placeholder comment to minimize cascading conflicts.
--        int NUM_ENTRIES = 0;
-+        int JAVASCRIPT_JIT = 0;
+-        int NUM_ENTRIES_EXT = 0;
++        int JAVASCRIPT_JIT = NUM_ENTRIES_CHROMIUM + 0;
 +        // Three lines of placeholder comment to minimize cascading conflicts.
 +        // Three lines of placeholder comment to minimize cascading conflicts.
 +        // Three lines of placeholder comment to minimize cascading conflicts.
-+        int NUM_ENTRIES = 1;
++        int NUM_ENTRIES_EXT = 1;
          // Three lines of placeholder comment to minimize cascading conflicts.
          // Three lines of placeholder comment to minimize cascading conflicts.
          // Three lines of placeholder comment to minimize cascading conflicts.
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsHooksRegistry.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsHooksRegistry.java
-index e35725146caeb..9639018faf7ca 100644
+index 113bdb933cd4b..b5b24f05ef0be 100644
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsHooksRegistry.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsHooksRegistry.java
-@@ -13,6 +13,7 @@ public final class SiteSettingsHooksRegistry {
-     public static int getExtTypeFromCategoryType(
+@@ -14,6 +14,7 @@ public final class SiteSettingsHooksRegistry {
+     public static SingleCategorySettingsHooks getSingleCategorySettingsHooks(
              @SiteSettingsCategory.Type int categoryType) {
          return switch (categoryType) {
-+            case SiteSettingsCategory.Type.JAVASCRIPT_JIT -> SiteSettingsCategory.ExtType.JAVASCRIPT_JIT;
-             default -> SiteSettingsCategory.ExtType.NUM_ENTRIES;
-         };
-     }
-@@ -23,6 +24,7 @@ public final class SiteSettingsHooksRegistry {
-         @SiteSettingsCategory.ExtType
-         int extType = getExtTypeFromCategoryType(categoryType);
-         return switch (extType) {
-+            case SiteSettingsCategory.ExtType.JAVASCRIPT_JIT -> new JavascriptJitSettingsHooks.SingleCategorySettingsHooksImpl();
++            case SiteSettingsCategory.Type.JAVASCRIPT_JIT -> new JavascriptJitSettingsHooks.SingleCategorySettingsHooksImpl();
              default -> SingleCategorySettingsHooks.getDefaultInstance();
          };
      }
-@@ -31,6 +33,7 @@ public final class SiteSettingsHooksRegistry {
+@@ -22,6 +23,7 @@ public final class SiteSettingsHooksRegistry {
      public static SingleWebsiteSettingsHooks getSingleWebsiteSettingsHooks(
              @ContentSettingsType.EnumType int contentType) {
          return switch (contentType) {
 +            case ContentSettingsType.JAVASCRIPT_JIT -> new JavascriptJitSettingsHooks.SingleWebsiteSettingsHooksImpl();
              default -> SingleWebsiteSettingsHooks.getDefaultInstance();
          };
      }
-@@ -41,6 +44,7 @@ public final class SiteSettingsHooksRegistry {
-         @SiteSettingsCategory.ExtType
-         int extType = getExtTypeFromCategoryType(categoryType);
-         return switch (extType) {
-+            case SiteSettingsCategory.ExtType.JAVASCRIPT_JIT -> new JavascriptJitSettingsHooks.CategoryHooksImpl();
+@@ -30,6 +32,7 @@ public final class SiteSettingsHooksRegistry {
+     public static SiteSettingsCategoryHooks getCategoryHooks(
+             @SiteSettingsCategory.Type int categoryType) {
+         return switch (categoryType) {
++            case SiteSettingsCategory.Type.JAVASCRIPT_JIT -> new JavascriptJitSettingsHooks.CategoryHooksImpl();
              default -> SiteSettingsCategoryHooks.getDefaultInstance();
          };
      }
-@@ -49,6 +53,7 @@ public final class SiteSettingsHooksRegistry {
+@@ -38,6 +41,7 @@ public final class SiteSettingsHooksRegistry {
      public static SiteSettingsResourcesHooks getResourcesHooks(
              @ContentSettingsType.EnumType int contentType) {
          return switch (contentType) {
 +            case ContentSettingsType.JAVASCRIPT_JIT -> new JavascriptJitSettingsHooks.ResourcesHooksImpl();
              default -> SiteSettingsResourcesHooks.getDefaultInstance();
          };
      }
-@@ -59,6 +64,7 @@ public final class SiteSettingsHooksRegistry {
-         @SiteSettingsCategory.ExtType
-         int extType = getExtTypeFromCategoryType(categoryType);
-         return switch (extType) {
-+            case SiteSettingsCategory.ExtType.JAVASCRIPT_JIT -> new JavascriptJitSettingsHooks.SiteSettingsScreenHooksImpl();
+@@ -46,6 +50,7 @@ public final class SiteSettingsHooksRegistry {
+     public static SiteSettingsScreenHooks getSiteSettingsScreenHooks(
+             @SiteSettingsCategory.Type int categoryType) {
+         return switch (categoryType) {
++            case SiteSettingsCategory.Type.JAVASCRIPT_JIT -> new JavascriptJitSettingsHooks.SiteSettingsScreenHooksImpl();
              default -> SiteSettingsScreenHooks.getDefaultInstance();
          };
      }
-@@ -67,6 +73,7 @@ public final class SiteSettingsHooksRegistry {
+@@ -54,6 +59,7 @@ public final class SiteSettingsHooksRegistry {
      public static WebsitePermissionsFetcherHooks getWebsitePermissionsFetcherHooks(
              @ContentSettingsType.EnumType int contentType) {
          return switch (contentType) {
@@ -356,7 +330,7 @@ index 4f00e4661d3cf..3a51bad2da3a7 100644
 +  </message>
  </grit-part>
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index 22c06c3a0825f..73701662ea02a 100644
+index d0b10fda002da..625d38d8eee31 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
 @@ -579,7 +579,7 @@ void ContentSettingsRegistry::Init() {

patches/0161-Use-the-old-naming-convention-of-Ads-in-ads-site-set.patch → patches/0166-Use-the-old-naming-convention-of-Ads-in-ads-site-set.patch

@@ -42,10 +42,10 @@ index 7558180af3f65..d07f11f4debee 100644
              case ContentSettingsType.ANTI_ABUSE:
                  return new ResourceItem(
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-index 76a8468578198..7c8a9246315a7 100644
+index 8278042cfa409..9a4ec4a9f52e1 100644
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -1259,10 +1259,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1261,10 +1261,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
                          && findPreference(assumeNonNull(getPreferenceKey(ContentSettingsType.ADS)))
                                  != null;
 

patches/0188-Extend-site-setting-category-visibility-check-on-sin.patch → patches/0190-Extend-site-setting-category-visibility-check-on-sin.patch

@@ -9,10 +9,10 @@ Subject: [PATCH] Extend site setting category visibility check on single
  1 file changed, 7 insertions(+)
 
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-index 7c8a9246315a7..93ed7e4912414 100644
+index 9a4ec4a9f52e1..46fc44b804d8b 100644
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -1431,6 +1431,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1433,6 +1433,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
              Preference preference, @ContentSetting @Nullable Integer value) {
          @ContentSettingsType.EnumType
          int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey());