From c0b54f7baf3eeb96130c0e730e7702d2216fe82f Mon Sep 17 00:00:00 2001
From: Amir Zaidi <azaidi@live.nl>
Date: Sun, 19 Aug 2018 19:03:54 +0200
Subject: [PATCH] Switch from AIDL Bridge to Rootless Pixel Bridge support

---
 .../libraries/gsa/launcherclient/BaseClientService.java    | 7 +++----
 .../libraries/gsa/launcherclient/LauncherClient.java       | 5 ++++-
 res/values/bridge.xml                                      | 7 +++++++
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 res/values/bridge.xml

diff --git a/lawnchair/src/com/google/android/libraries/gsa/launcherclient/BaseClientService.java b/lawnchair/src/com/google/android/libraries/gsa/launcherclient/BaseClientService.java
index bb9d5df2f9..cb81197b5d 100644
--- a/lawnchair/src/com/google/android/libraries/gsa/launcherclient/BaseClientService.java
+++ b/lawnchair/src/com/google/android/libraries/gsa/launcherclient/BaseClientService.java
@@ -7,8 +7,6 @@ import android.os.IBinder;
 import android.util.Log;
 
 public class BaseClientService implements ServiceConnection {
-    private static final boolean PROXY = true;
-
     private boolean mConnected;
     private final Context mContext;
     private final int mFlags;
@@ -17,7 +15,7 @@ public class BaseClientService implements ServiceConnection {
     BaseClientService(Context context, int flags) {
         mContext = context;
         mFlags = flags;
-        mBridge = PROXY
+        mBridge = LauncherClient.BRIDGE_USE
                 ? new LauncherClientBridge(this)
                 : this;
     }
@@ -25,7 +23,8 @@ public class BaseClientService implements ServiceConnection {
     public final boolean connect() {
         if (!mConnected) {
             try {
-                mConnected = mContext.bindService(LauncherClient.getIntent(mContext, PROXY), mBridge, mFlags);
+                mConnected = mContext.bindService(LauncherClient.getIntent(mContext,
+                        LauncherClient.BRIDGE_USE), mBridge, mFlags);
             } catch (Throwable e) {
                 Log.e("LauncherClient", "Unable to connect to overlay service", e);
             }
diff --git a/lawnchair/src/com/google/android/libraries/gsa/launcherclient/LauncherClient.java b/lawnchair/src/com/google/android/libraries/gsa/launcherclient/LauncherClient.java
index 1c57f70452..be5dda7e2d 100644
--- a/lawnchair/src/com/google/android/libraries/gsa/launcherclient/LauncherClient.java
+++ b/lawnchair/src/com/google/android/libraries/gsa/launcherclient/LauncherClient.java
@@ -25,6 +25,9 @@ import com.google.android.libraries.launcherclient.ILauncherOverlayCallback;
 import java.lang.ref.WeakReference;
 
 public class LauncherClient {
+    public final static boolean BRIDGE_USE = true;
+    public final static String BRIDGE_PACKAGE = "com.google.android.apps.nexuslauncher";
+
     private static int apiVersion = -1;
 
     private ILauncherOverlay mOverlay;
@@ -364,7 +367,7 @@ public class LauncherClient {
     static Intent getIntent(Context context, boolean proxy) {
         String pkg = context.getPackageName();
         return new Intent("com.android.launcher3.WINDOW_OVERLAY")
-                .setPackage(proxy ? "amirz.aidlbridge" : "com.google.android.googlequicksearchbox")
+                .setPackage(proxy ? BRIDGE_PACKAGE : "com.google.android.googlequicksearchbox")
                 .setData(Uri.parse(new StringBuilder(pkg.length() + 18)
                             .append("app://")
                             .append(pkg)
diff --git a/res/values/bridge.xml b/res/values/bridge.xml
new file mode 100644
index 0000000000..dd1765f9ad
--- /dev/null
+++ b/res/values/bridge.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="bridge_signature_hash">0xB662CC2F</integer>
+    <string name="bridge_download_url" translatable="false">https://github.com/amirzaidi/AIDLBridge/releases/download</string>
+    <string name="bridge_download_version" translatable="false">v1</string>
+    <string name="bridge_download_file" translatable="false">pixelbridge.apk</string>
+</resources>
\ No newline at end of file