0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor logging improvements for bookmarks import/export patch

Browse source
This commit is contained in:
csagan5 2022-04-11 20:02:57 +02:00 • committed by Yifeng Wu
parent 84abb88959
commit a0fbcba0d6
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/patches/Add-bookmark-import-export-actions.patch
View file

@ -8,7 +8,7 @@ Completely remove contacts picker permission from the file dialog
---
base/android/content_uri_utils.cc | 10 +
base/android/content_uri_utils.h | 4 +
.../org/chromium/base/ContentUriUtils.java | 32 ++
.../org/chromium/base/ContentUriUtils.java | 33 ++
chrome/android/java/AndroidManifest.xml | 1 -
.../res/menu/bookmark_action_bar_menu.xml | 14 +
.../browser/TabbedModeTabDelegateFactory.java | 5 +-
@ -44,7 +44,7 @@ Completely remove contacts picker permission from the file dialog
ui/shell_dialogs/select_file_dialog.h | 2 +
.../select_file_dialog_android.cc | 6 +
ui/shell_dialogs/select_file_dialog_android.h | 2 +
38 files changed, 892 insertions(+), 29 deletions(-)
38 files changed, 893 insertions(+), 29 deletions(-)
diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc
--- a/base/android/content_uri_utils.cc
@ -93,7 +93,7 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base
/**
* This class provides methods to access content URI schemes.
*/
@@ -89,6 +92,35 @@ public abstract class ContentUriUtils {
@@ -89,6 +92,36 @@ public abstract class ContentUriUtils {
return -1;
}
@ -109,7 +109,7 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base
+ client.close();
+ return fd;
+ } catch (Exception e) {
+ Log.e(TAG, "Cannot open intermediate Uri.", e);
+ Log.e(TAG, "Cannot open intermediate URI", e);
+ }
+ return -1;
+ }
@ -121,7 +121,8 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base
+ ParcelFileDescriptor pfd = resolver.openFileDescriptor(uri, "r");
+ path = Os.readlink("/proc/self/fd/" + pfd.getFd());
+ pfd.close();
+ } catch (Throwable t) {
+ } catch (Exception e) {
+ Log.w(TAG, "Cannot get file path from content URI", e);
+ }
+ return path;
+ }
@ -820,7 +821,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
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
@@ -7993,6 +7993,12 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7994,6 +7994,12 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
#endif