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

Commit 74cd449d authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge tag '91.0.4472.146' of https://github.com/bromite/bromite into backlog_3405-all-upstream

parents 3e019522 df446ba6
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
# 91.0.4472.146
* removed flags for device motion/orientation (fixes https://github.com/bromite/bromite/issues/1204)
* prevent crash on download on API level 21 (fixes https://github.com/bromite/bromite/issues/1184)
* fix crash reporting garbled UI for small screens (thanks to @uazo, https://github.com/bromite/bromite/pull/1236)
* add flag to enable/disable vibration API (fixes https://github.com/bromite/bromite/issues/1045)

# 91.0.4472.143
* add support for ISupportHelpAndFeedback
* JIT-less toggle (fixes https://github.com/bromite/bromite/issues/1235)
+1 −1
Original line number Diff line number Diff line
91.0.4472.143
91.0.4472.146
+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ Open-YouTube-links-in-Bromite.patch
Add-exit-menu-item.patch
AudioBuffer-AnalyserNode-fp-mitigations.patch
Multiple-fingerprinting-mitigations.patch
Add-flags-to-disable-device-motion-orientation-APIs.patch
Disable-metrics-on-all-I-O-threads.patch
Always-respect-async-dns-flag-regardless-of-SDK-version.patch
Add-flag-to-configure-maximum-connections-per-host.patch
@@ -149,4 +148,6 @@ Add-flag-to-disable-external-intent-requests.patch
Logcat-crash-reports-UI.patch
Add-support-for-ISupportHelpAndFeedback.patch
JIT-less-toggle.patch
API-level-21-prevent-crash-on-download.patch
Add-vibration-flag.patch
Automated-domain-substitution.patch
+38 −0
Original line number Diff line number Diff line
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sun, 27 Jun 2021 16:53:48 +0200
Subject: API level 21: prevent crash on download

On Lollipop 5.0.x it is not possible to use the system persistent bundle.
This patch ignores boolean settings for them and prevents the crash.

See also: https://github.com/bromite/bromite/issues/1184
---
 .../internal/BundleToPersistableBundleConverter.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java
--- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java
+++ b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java
@@ -85,9 +85,17 @@ class BundleToPersistableBundleConverter {
             if (obj == null) {
                 persistableBundle.putString(key, null);
             } else if (obj instanceof Boolean) {
-                persistableBundle.putBoolean(key, (Boolean) obj);
+                if Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP {
+                    failedKeys.add(key);
+                } else {
+                    persistableBundle.putBoolean(key, (Boolean) obj);
+                }
             } else if (obj instanceof boolean[]) {
-                persistableBundle.putBooleanArray(key, (boolean[]) obj);
+                if Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP {
+                    failedKeys.add(key);
+                } else {
+                    persistableBundle.putBooleanArray(key, (boolean[]) obj);
+                }
             } else if (obj instanceof Double) {
                 persistableBundle.putDouble(key, (Double) obj);
             } else if (obj instanceof double[]) {
-- 
2.17.1
+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Subject: Add IsCleartextPermitted flag
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -7364,6 +7364,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7358,6 +7358,11 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(
          chrome::android::kBookmarksExportUseSaf)},
 
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1392,6 +1392,10 @@ const char kHostedAppShimCreationName[] =
@@ -1384,6 +1384,10 @@ const char kHostedAppShimCreationName[] =
 const char kHostedAppShimCreationDescription[] =
     "Create app shims on Mac when creating a hosted app.";
 
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -820,6 +820,9 @@ extern const char kHostedAppQuitNotificationDescription[];
@@ -814,6 +814,9 @@ extern const char kHostedAppQuitNotificationDescription[];
 extern const char kHostedAppShimCreationName[];
 extern const char kHostedAppShimCreationDescription[];
 
Loading