23 changed files with 5517 additions and 295 deletions
Split View
Diff Options
-
+2 -2.build_config
-
+8 -0CHANGELOG.md
-
+4 -4android_flags.gn
-
+1 -0android_flags.release.gn
-
BINandroidx-override/core-release.aar
-
+50 -0androidx-override/core_core.patch
-
+52 -22build.sh
-
+1 -1bundle_generate_apk.sh
-
+248 -152domain_sub_2.list
-
+4726 -0misc/UnindexedRules
-
BINmisc/aidl
-
+7 -7patches/Bromite/AImageReader-CFI-crash-mitigations.patch
-
+20 -21patches/Bromite/Add-a-proxy-configuration-page.patch
-
+4 -5patches/Bromite/Add-an-always-incognito-mode.patch
-
+123 -45patches/Bromite/Add-bookmark-import-export-actions.patch
-
+5 -5patches/Bromite/Add-exit-menu-item.patch
-
+1 -1patches/Bromite/Add-option-to-not-persist-tabs-across-sessions.patch
-
+6 -2patches/Bromite/Change-default-webRTC-policy-to-not-use-any-address.patch
-
+9 -6patches/Bromite/DoH-secure-mode-by-default.patch
-
+13 -5patches/Other/debug-fix.patch
-
+3 -1patches/series
-
+46 -16patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.play.core.splitcompat-com.google.android.play.core.splitinstall.patch
-
+188 -0patches/ungoogled-chromium-android/Remove-reference-to-android-s.patch
+ 2
- 2
.build_config
View File
+ 8
- 0
CHANGELOG.md
View File
+ 4
- 4
android_flags.gn
View File
+ 1
- 0
android_flags.release.gn
View File
BIN
androidx-override/core-release.aar
View File
+ 50
- 0
androidx-override/core_core.patch
View File
| @ -0,0 +1,50 @@ | |||
| diff --git a/frameworks/support/core/core/src/main/res/attrs.xml b/frameworks/support/core/core/src/main/res/attrs.xml | |||
| --- a/frameworks/support/core/core/src/main/res/attrs.xml | |||
| +++ b/frameworks/support/core/core/src/main/res/attrs.xml | |||
| @@ -110,9 +110,6 @@ | |||
| <!-- Alpha multiplier applied to the base color. --> | |||
| <attr name="alpha" format="float" /> | |||
| <attr name="android:alpha"/> | |||
| - <!-- Perceptual luminance applied to the base color. From 0 to 100. --> | |||
| - <attr name="lStar" format="float" /> | |||
| - <attr name="android:lStar" /> | |||
| </declare-styleable> | |||
| <!-- Used to describe the gradient for fill or stroke in a path of VectorDrawable. --> | |||
| diff --git a/frameworks/support/core/core/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java b/frameworks/support/core/core/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java | |||
| --- a/frameworks/support/core/core/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java | |||
| +++ b/frameworks/support/core/core/src/main/java/androidx/core/content/res/ColorStateListInflaterCompat.java | |||
| @@ -167,14 +167,6 @@ public final class ColorStateListInflaterCompat { | |||
| alphaMod = a.getFloat(R.styleable.ColorStateListItem_alpha, alphaMod); | |||
| } | |||
| - final float lStar; | |||
| - if (BuildCompat.isAtLeastS() | |||
| - && a.hasValue(R.styleable.ColorStateListItem_android_lStar)) { | |||
| - lStar = a.getFloat(R.styleable.ColorStateListItem_android_lStar, -1.0f); | |||
| - } else { | |||
| - lStar = a.getFloat(R.styleable.ColorStateListItem_lStar, -1.0f); | |||
| - } | |||
| - | |||
| a.recycle(); | |||
| // Parse all unrecognized attributes as state specifiers. | |||
| @@ -185,8 +177,7 @@ public final class ColorStateListInflaterCompat { | |||
| final int stateResId = attrs.getAttributeNameResource(i); | |||
| if (stateResId != android.R.attr.color | |||
| && stateResId != android.R.attr.alpha | |||
| - && stateResId != R.attr.alpha | |||
| - && stateResId != R.attr.lStar) { | |||
| + && stateResId != R.attr.alpha) { | |||
| // Unrecognized attribute, add to state set | |||
| stateSpec[j++] = attrs.getAttributeBooleanValue(i, false) | |||
| ? stateResId : -stateResId; | |||
| @@ -197,7 +188,7 @@ public final class ColorStateListInflaterCompat { | |||
| // Apply alpha and luminance modulation. If we couldn't resolve the color or | |||
| // alpha yet, the default values leave us enough information to | |||
| // modulate again during applyTheme(). | |||
| - final int color = modulateColorAlpha(baseColor, alphaMod, lStar); | |||
| + final int color = modulateColorAlpha(baseColor, alphaMod, -1.0f); | |||
| colorList = GrowingArrayUtils.append(colorList, listSize, color); | |||
| stateSpecList = GrowingArrayUtils.append(stateSpecList, listSize, stateSpec); | |||
+ 52
- 22
build.sh
View File
+ 1
- 1
bundle_generate_apk.sh
View File
+ 248
- 152
domain_sub_2.list
File diff suppressed because it is too large
View File
+ 4726
- 0
misc/UnindexedRules
File diff suppressed because it is too large
View File
BIN
misc/aidl
View File
+ 7
- 7
patches/Bromite/AImageReader-CFI-crash-mitigations.patch
View File
+ 20
- 21
patches/Bromite/Add-a-proxy-configuration-page.patch
View File
+ 4
- 5
patches/Bromite/Add-an-always-incognito-mode.patch
View File
+ 123
- 45
patches/Bromite/Add-bookmark-import-export-actions.patch
View File
+ 5
- 5
patches/Bromite/Add-exit-menu-item.patch
View File
+ 1
- 1
patches/Bromite/Add-option-to-not-persist-tabs-across-sessions.patch
View File
+ 6
- 2
patches/Bromite/Change-default-webRTC-policy-to-not-use-any-address.patch
View File
+ 9
- 6
patches/Bromite/DoH-secure-mode-by-default.patch
View File
| @ -1,15 +1,15 @@ | |||
| From: csagan5 <[email protected]> | |||
| Date: Sat, 26 Sep 2020 14:23:19 +0100 | |||
| Subject: DoH secure mode by default | |||
| Subject: DoH secure mode by default. Policy fix thanks to @uazo. | |||
| --- | |||
| chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfo.java | 2 - | |||
| chrome/browser/net/stub_resolver_config_reader.cc | 17 ---------- | |||
| 2 files changed, 2 insertions(+), 17 deletions(-) | |||
| .../browser/net/stub_resolver_config_reader.cc | 17 +---------------- | |||
| 1 file changed, 1 insertion(+), 16 deletions(-) | |||
| diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc | |||
| --- a/chrome/browser/net/stub_resolver_config_reader.cc | |||
| +++ b/chrome/browser/net/stub_resolver_config_reader.cc | |||
| @@ -154,7 +154,7 @@ StubResolverConfigReader::StubResolverCo | |||
| @@ -154,7 +154,7 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state, | |||
| if (entries.count("[email protected]")) { | |||
| // The user has "Enabled" selected. | |||
| local_state_->SetString(prefs::kDnsOverHttpsMode, | |||
| @ -18,7 +18,7 @@ Subject: DoH secure mode by default | |||
| } else if (entries.count("[email protected]")) { | |||
| // The user has "Disabled" selected. | |||
| local_state_->SetString(prefs::kDnsOverHttpsMode, | |||
| @@ -334,22 +334,7 @@ SecureDnsConfig StubResolverConfigReader | |||
| @@ -334,22 +334,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration( | |||
| check_parental_controls = false; | |||
| } | |||
| @ -52,3 +52,6 @@ Subject: DoH secure mode by default | |||
| /** A simple tuple to hold onto named fields about the state of ownership. */ | |||
| public static class OwnedState { | |||
| -- | |||
| 2.17.1 | |||
+ 13
- 5
patches/Other/debug-fix.patch
View File
+ 3
- 1
patches/series
View File
+ 46
- 16
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.play.core.splitcompat-com.google.android.play.core.splitinstall.patch
View File
+ 188
- 0
patches/ungoogled-chromium-android/Remove-reference-to-android-s.patch
View File
| @ -0,0 +1,188 @@ | |||
| description: For whatever reason the new APIs are not in beta SDK yet. Remove reference to Android S until we can update sdk rebuilds. | |||
| author: Wengling Chen <[email protected]> | |||
| --- | |||
| base/android/java/src/org/chromium/base/compat/ApiHelperForS.java | 13 ++----- | |||
| chrome/android/java/AndroidManifest.xml | 2 - | |||
| chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java | 2 - | |||
| chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java | 7 ---- | |||
| chrome/browser/share/android/java_sources.gni | 2 - | |||
| components/permissions/android/java/src/org/chromium/components/permissions/BluetoothChooserDialog.java | 17 ---------- | |||
| device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java | 5 -- | |||
| 7 files changed, 9 insertions(+), 39 deletions(-) | |||
| --- a/base/android/java/src/org/chromium/base/compat/ApiHelperForS.java | |||
| +++ b/base/android/java/src/org/chromium/base/compat/ApiHelperForS.java | |||
| @@ -36,7 +36,7 @@ public final class ApiHelperForS { | |||
| * See {@link ClipDescription#isStyleText()}. | |||
| */ | |||
| public static boolean isStyleText(ClipDescription clipDescription) { | |||
| - return clipDescription.isStyledText(); | |||
| + return false; | |||
| } | |||
| /** | |||
| @@ -44,7 +44,7 @@ public final class ApiHelperForS { | |||
| */ | |||
| public static float getConfidenceScore( | |||
| ClipDescription clipDescription, @NonNull String entityType) { | |||
| - return clipDescription.getConfidenceScore(entityType); | |||
| + return 0.f; | |||
| } | |||
| /** | |||
| @@ -52,20 +52,18 @@ public final class ApiHelperForS { | |||
| * ClipDescription.CLASSIFICATION_COMPLETE. | |||
| */ | |||
| public static boolean isGetClassificationStatusIsComplete(ClipDescription clipDescription) { | |||
| - return clipDescription.getClassificationStatus() == ClipDescription.CLASSIFICATION_COMPLETE; | |||
| + return false; | |||
| } | |||
| /** | |||
| * See {@link ClipData.Item#getTextLinks()}. | |||
| */ | |||
| public static TextLinks getTextLinks(ClipData.Item item) { | |||
| - return item.getTextLinks(); | |||
| + return null; | |||
| } | |||
| public static boolean hasBluetoothConnectPermission() { | |||
| - return ApiCompatibilityUtils.checkPermission(ContextUtils.getApplicationContext(), | |||
| - Manifest.permission.BLUETOOTH_CONNECT, Process.myPid(), Process.myUid()) | |||
| - == PackageManager.PERMISSION_GRANTED; | |||
| + return false; | |||
| } | |||
| /** | |||
| @@ -73,6 +71,5 @@ public final class ApiHelperForS { | |||
| */ | |||
| public static void setAutoEnterEnabled( | |||
| PictureInPictureParams.Builder builder, boolean enabled) { | |||
| - builder.setAutoEnterEnabled(enabled); | |||
| } | |||
| } | |||
| --- a/chrome/android/java/AndroidManifest.xml | |||
| +++ b/chrome/android/java/AndroidManifest.xml | |||
| @@ -57,7 +57,7 @@ by a child template that "extends" this | |||
| filtered view of devices. | |||
| --> | |||
| <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_SCAN" | |||
| - android:usesPermissionFlags="neverForLocation"/> | |||
| + /> | |||
| <uses-permission-sdk-23 android:name="android.permission.READ_CONTACTS"/> | |||
| <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/> | |||
| --- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java | |||
| +++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java | |||
| @@ -220,10 +220,7 @@ final class ChromeBluetoothAdapter exten | |||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { | |||
| Context context = mAdapter.getContext(); | |||
| - return context.checkCallingOrSelfPermission(Manifest.permission.BLUETOOTH_SCAN) | |||
| - == PackageManager.PERMISSION_GRANTED | |||
| - && context.checkCallingOrSelfPermission(Manifest.permission.BLUETOOTH_CONNECT) | |||
| - == PackageManager.PERMISSION_GRANTED; | |||
| + return false; | |||
| } | |||
| LocationUtils locationUtils = LocationUtils.getInstance(); | |||
| --- a/components/permissions/android/java/src/org/chromium/components/permissions/BluetoothChooserDialog.java | |||
| +++ b/components/permissions/android/java/src/org/chromium/components/permissions/BluetoothChooserDialog.java | |||
| @@ -361,16 +361,9 @@ public class BluetoothChooserDialog | |||
| break; | |||
| case LinkType.REQUEST_PERMISSIONS: | |||
| mItemChooserDialog.setIgnorePendingWindowFocusChangeForClose(true); | |||
| - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { | |||
| - mWindowAndroid.requestPermissions( | |||
| - new String[] {Manifest.permission.BLUETOOTH_SCAN, | |||
| - Manifest.permission.BLUETOOTH_CONNECT}, | |||
| - BluetoothChooserDialog.this); | |||
| - } else { | |||
| - mWindowAndroid.requestPermissions( | |||
| + mWindowAndroid.requestPermissions( | |||
| new String[] {Manifest.permission.ACCESS_FINE_LOCATION}, | |||
| BluetoothChooserDialog.this); | |||
| - } | |||
| break; | |||
| case LinkType.REQUEST_LOCATION_SERVICES: | |||
| mItemChooserDialog.setIgnorePendingWindowFocusChangeForClose(true); | |||
| @@ -393,19 +386,11 @@ public class BluetoothChooserDialog | |||
| } | |||
| private static boolean hasSystemPermissions(WindowAndroid windowAndroid) { | |||
| - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { | |||
| - return windowAndroid.hasPermission(Manifest.permission.BLUETOOTH_SCAN) | |||
| - && windowAndroid.hasPermission(Manifest.permission.BLUETOOTH_CONNECT); | |||
| - } | |||
| return windowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION); | |||
| } | |||
| private static boolean canRequestSystemPermissions(WindowAndroid windowAndroid) { | |||
| - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { | |||
| - return windowAndroid.canRequestPermission(Manifest.permission.BLUETOOTH_SCAN) | |||
| - && windowAndroid.canRequestPermission(Manifest.permission.BLUETOOTH_CONNECT); | |||
| - } | |||
| return windowAndroid.canRequestPermission(Manifest.permission.ACCESS_FINE_LOCATION); | |||
| } | |||
| --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java | |||
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java | |||
| @@ -74,7 +74,6 @@ import org.chromium.chrome.browser.prefe | |||
| import org.chromium.chrome.browser.profiles.Profile; | |||
| import org.chromium.chrome.browser.read_later.ReadLaterIPHController; | |||
| import org.chromium.chrome.browser.share.ShareDelegate; | |||
| -import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager; | |||
| import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl; | |||
| import org.chromium.chrome.browser.signin.ui.SigninPromoUtil; | |||
| import org.chromium.chrome.browser.status_indicator.StatusIndicatorCoordinator; | |||
| @@ -152,7 +151,6 @@ public class TabbedRootUiCoordinator ext | |||
| private TabObscuringHandler.Observer mContinuousSearchTabObscuringHandlerObserver; | |||
| private FindToolbarObserver mContinuousSearchFindToolbarObserver; | |||
| private MerchantTrustSignalsCoordinator mMerchantTrustSignalsCoordinator; | |||
| - private @Nullable ScrollCaptureManager mScrollCaptureManager; | |||
| private CommerceSubscriptionsService mCommerceSubscriptionsService; | |||
| private UndoGroupSnackbarController mUndoGroupSnackbarController; | |||
| private final IntentRequestTracker mIntentRequestTracker; | |||
| @@ -382,10 +380,6 @@ public class TabbedRootUiCoordinator ext | |||
| mCommerceSubscriptionsService = null; | |||
| } | |||
| - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && mScrollCaptureManager != null) { | |||
| - mScrollCaptureManager.destroy(); | |||
| - mScrollCaptureManager = null; | |||
| - } | |||
| super.onDestroy(); | |||
| } | |||
| @@ -544,7 +538,6 @@ public class TabbedRootUiCoordinator ext | |||
| return; | |||
| } | |||
| - mScrollCaptureManager = new ScrollCaptureManager(mActivityTabProvider); | |||
| } | |||
| // Protected class methods | |||
| --- a/chrome/browser/share/android/java_sources.gni | |||
| +++ b/chrome/browser/share/android/java_sources.gni | |||
| @@ -51,8 +51,6 @@ share_java_sources = [ | |||
| "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetView.java", | |||
| "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetViewBinder.java", | |||
| "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetViewProperties.java", | |||
| - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/scroll_capture/ScrollCaptureCallbackImpl.java", | |||
| - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/scroll_capture/ScrollCaptureManager.java", | |||
| "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetAdapter.java", | |||
| "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java", | |||
| "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/MetricsRecorder.java", | |||
| --- a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java | |||
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java | |||
| @@ -114,7 +114,7 @@ public class MultiWindowUtils implements | |||
| ComponentName comp = new ComponentName(packageName, className); | |||
| try { | |||
| int launchMode = context.getPackageManager().getActivityInfo(comp, 0).launchMode; | |||
| - return launchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE_PER_TASK; | |||
| + return false; | |||
| } catch (PackageManager.NameNotFoundException e) { | |||
| return false; | |||
| } | |||