Merge pull request #6102 from brave/android_search_engine_adapter_byt…

…ecode [Android] Fix for bytecode changes for SearchEngineAdapter
brave · Jul 16, 2020 · 1613696 · 1613696
2 parents 8afccd6 + 5f85826
commit 1613696
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
@@ -89,7 +89,7 @@ brave_java_sources = [
  "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java",
  "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java",
  "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSourcePreview.java",
- "../../brave/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEngineAdapter.java",
+ "../../brave/android/java/org/chromium/chrome/browser/search_engines/settings/BraveBaseSearchEngineAdapter.java",
  "../../brave/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java",
  "../../brave/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java",
  "../../brave/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java",

diff --git a/...es/settings/BraveSearchEngineAdapter.java → ...ettings/BraveBaseSearchEngineAdapter.java b/...es/settings/BraveSearchEngineAdapter.java → ...ettings/BraveBaseSearchEngineAdapter.java
@@ -12,8 +12,8 @@
 
 import androidx.annotation.StringRes;
 
-public class BraveSearchEngineAdapter extends BaseAdapter {
- public BraveSearchEngineAdapter() {
+public class BraveBaseSearchEngineAdapter extends BaseAdapter {
+ public BraveBaseSearchEngineAdapter() {
  }
 
  // BaseAdapter:

diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveSearchEngineAdapterClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveSearchEngineAdapterClassAdapter.java
@@ -12,7 +12,7 @@ public class BraveSearchEngineAdapterClassAdapter extends BraveClassVisitor {
  "org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter";
 
  static String sBraveSearchEngineAdapterBaseClassName =
- "org/chromium/chrome/browser/search_engines/settings/BraveSearchEngineAdapter";
+ "org/chromium/chrome/browser/search_engines/settings/BraveBaseSearchEngineAdapter";
 
  static String sMethodGetPermissionsLinkMessage =
  "getPermissionsLinkMessage";
@@ -21,8 +21,8 @@ public BraveSearchEngineAdapterClassAdapter(ClassVisitor visitor) {
  super(visitor);
 
  changeSuperName(sSearchEngineAdapterClassName,
-  sBraveSearchEngineAdapterBaseClassName);
- deleteMethod(sSearchEngineAdapterClassName,
-  sMethodGetPermissionsLinkMessage);
+  sBraveSearchEngineAdapterBaseClassName);
+ changeMethodOwner(sSearchEngineAdapterClassName, sMethodGetPermissionsLinkMessage,
+ sBraveSearchEngineAdapterBaseClassName);
  }
 }