diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ec273ee..a5743199 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 86.0.4240.92 +* upstream fix for video playback audio issue (fixes https://github.com/bromite/bromite/issues/755) +* fix order of entries in privacy settings (fixes https://github.com/bromite/bromite/issues/758) + # 86.0.4240.73 * re-introduce ARM64 AImageReader mitigations (fixes https://github.com/bromite/bromite/issues/766) * re-introduce menu items for autocomplete, autofill assistant and contextual search (fixes https://github.com/bromite/bromite/issues/763) diff --git a/build/GN_ARGS b/build/GN_ARGS index 4f51574e..186bf589 100644 --- a/build/GN_ARGS +++ b/build/GN_ARGS @@ -1,5 +1,6 @@ android_channel="stable" blink_symbol_level=1 +chrome_pgo_phase=0 dcheck_always_on=false debuggable_apks=false dfmify_dev_ui=false @@ -12,7 +13,7 @@ enable_gvr_services=false enable_hangout_services_extension=false enable_iterator_debugging=false enable_mdns=false -enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true +enable_mse_mpeg2ts_stream_parser=true enable_nacl=false enable_nacl_nonsfi=false enable_platform_dolby_vision=true @@ -21,11 +22,13 @@ enable_remoting=false enable_reporting=true enable_resource_whitelist_generation=false enable_vr=false +ffmpeg_branding="Chrome" fieldtrial_testing_like_official_build=true icu_use_data_file=true is_component_build=false is_debug=false is_official_build=true +proprietary_codecs=true rtc_build_examples=false safe_browsing_mode=0 symbol_level=1 @@ -33,6 +36,6 @@ target_os="android" use_debug_fission=true use_errorprone_java_compiler=false use_official_google_api_keys=false -use_openh264=true chrome_pgo_phase=0 +use_openh264=true use_sysroot=false webview_includes_weblayer=false diff --git a/build/RELEASE b/build/RELEASE index 4ccae782..cfc7d000 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -86.0.4240.73 +86.0.4240.92 diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 8bfb2bf0..833790db 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -1262,3 +1262,6 @@ diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_co // Returns one of {&proxies_for_http, &proxies_for_https, &proxies_for_ftp, // &fallback_proxies}, or NULL if there is no proxy to use. +-- +2.17.1 + diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 6ca43e23..bb5cd00c 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -486,3 +486,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. +-- +2.17.1 + diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index 0b6c4115..f245e93f 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -116,3 +116,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro +-- +2.17.1 + diff --git a/build/patches/Add-history-support-in-incognito-mode.patch b/build/patches/Add-history-support-in-incognito-mode.patch index 675f5b96..f9f13e76 100644 --- a/build/patches/Add-history-support-in-incognito-mode.patch +++ b/build/patches/Add-history-support-in-incognito-mode.patch @@ -231,3 +231,6 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h } // namespace prefs #endif // CHROME_COMMON_PREF_NAMES_H_ +-- +2.17.1 + diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index aa0b93fd..efc4dfa4 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -119,3 +119,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro LINK +-- +2.17.1 + diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 1869f551..6b4619e7 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -10,7 +10,7 @@ Subject: Allow playing audio in background diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc -@@ -1082,6 +1082,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1080,6 +1080,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -23,7 +23,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp void WebMediaPlayerImpl::EnabledAudioTracksChanged( const blink::WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3505,7 +3511,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3493,7 +3499,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { // Audio only stream is allowed to play when in background. // TODO: We should check IsBackgroundOptimizationCandidate here. But we need // to move the logic of checking video frames out of that function. diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 20bc6e9d..c6140baf 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -14249,7 +14249,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli + 'owners': ['tellier@9oo91e.qjz9zk', 'rsorokin@ch40m1um.qjz9zk', 'cros-oac@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:84-'], + 'supported_on': ['chrome_os:86-'], @@ -22998,7 +22998,7 @@ If you disable this policy, web page scrolling to specific text fragments via UR }, { diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index 2858cca5..c98e019a 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -2503,3 +2503,6 @@ diff --git a/content/public/browser/native_file_system_permission_context.h b/co // Returns whether the give |origin| already allows read permission, or it is // possible to request one. This is used to block file dialogs from being +-- +2.17.1 + diff --git a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch index 1074ed5c..89d9a6fa 100644 --- a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch +++ b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch @@ -149,3 +149,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting CheckBoxPreference canMakePaymentPref = (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT); +-- +2.17.1 + diff --git a/build/patches/Remove-signin-and-data-saver-integrations.patch b/build/patches/Remove-signin-and-data-saver-integrations.patch index 35dc1a0d..e3ad3715 100644 --- a/build/patches/Remove-signin-and-data-saver-integrations.patch +++ b/build/patches/Remove-signin-and-data-saver-integrations.patch @@ -952,3 +952,6 @@ diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFe } private void fetchImpl(final String expiredToken) { +-- +2.17.1 + diff --git a/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch b/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch index a503b22e..d88d13e5 100644 --- a/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch +++ b/build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch @@ -97,7 +97,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc -@@ -708,6 +708,12 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, +@@ -710,6 +710,12 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, AdjustInfoToSwiftShader(); } @@ -110,7 +110,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc #if defined(USE_OZONE) if (features::IsUsingOzonePlatform()) { const std::vector -@@ -727,6 +733,11 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, +@@ -729,6 +735,11 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, gl::DirectCompositionSurfaceWin::DisableDecodeSwapChain(); #endif