gmscompat: add hooks for overriding BinderProxy transactions

Author: muhomorr

core/java/android/os/BinderProxy.java

@@ -24,6 +24,8 @@
 import android.util.SparseIntArray;
 
 import com.android.internal.annotations.GuardedBy;
+import com.android.internal.gmscompat.GmsCompatLib;
+import com.android.internal.gmscompat.IGmsCompatLib;
 import com.android.internal.os.BinderInternal;
 
 import libcore.util.NativeAllocationRegistry;
@@ -503,10 +505,23 @@ private static class NoImagePreloadHolder {
      */
     public native boolean isBinderAlive();
 
-    /**
-     * Retrieve a local interface - always null in case of a proxy
-     */
+    private IInterface mLocalInterface;
+    private static final IInterface NO_LOCAL_INTERFACE = () -> null;
+
     public IInterface queryLocalInterface(String descriptor) {
+        IGmsCompatLib gmcLib = GmsCompatLib.get();
+        if (gmcLib != null) {
+            synchronized (this) {
+                IInterface cache = mLocalInterface;
+                if (cache != null) {
+                    return cache == NO_LOCAL_INTERFACE ? null : cache;
+                }
+                IInterface res = gmcLib.maybeProvideBinderProxyInterface(this, descriptor);
+                mLocalInterface = res != null ? res : NO_LOCAL_INTERFACE;
+                return res;
+            }
+
+        }
         return null;
     }
 
@@ -719,6 +734,12 @@ private native boolean removeFrozenStateChangeCallbackNative(
      * @throws RemoteException
      */
     public void dump(FileDescriptor fd, String[] args) throws RemoteException {
+        IGmsCompatLib gmcLib = GmsCompatLib.get();
+        if (gmcLib != null) {
+            if (gmcLib.maybeInterceptBinderProxyDump(this, fd, args, false)) {
+                return;
+            }
+        }
         Parcel data = Parcel.obtain();
         Parcel reply = Parcel.obtain();
         data.writeFileDescriptor(fd);
@@ -740,6 +761,12 @@ public void dump(FileDescriptor fd, String[] args) throws RemoteException {
      * @throws RemoteException
      */
     public void dumpAsync(FileDescriptor fd, String[] args) throws RemoteException {
+        IGmsCompatLib gmcLib = GmsCompatLib.get();
+        if (gmcLib != null) {
+            if (gmcLib.maybeInterceptBinderProxyDump(this, fd, args, true)) {
+                return;
+            }
+        }
         Parcel data = Parcel.obtain();
         Parcel reply = Parcel.obtain();
         data.writeFileDescriptor(fd);

core/java/com/android/internal/gmscompat/GmsCompatLib.java

@@ -33,6 +33,6 @@ public static void init(Context appContext, String processName) {
             throw new IllegalStateException(e);
         }
         instance = lib;
-        lib.init(appContext, processName);
+        lib.init(appContext, libCtx, processName);
     }
 }

core/java/com/android/internal/gmscompat/IGmsCompatLib.java

@@ -5,14 +5,25 @@
 import android.content.Context.BindServiceFlags;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.BinderProxy;
+import android.os.IInterface;
 import android.os.UserHandle;
 
+import java.io.FileDescriptor;
 import java.util.concurrent.Executor;
 
 public interface IGmsCompatLib {
-    void init(Context appContext, String processName);
+    void init(Context appContext, Context libContext, String processName);
 
-    /** @see android.content.Context#bindService(Intent, BindServiceFlags, Executor, ServiceConnection) */
+    /** @see Context#bindService(Intent, BindServiceFlags, Executor, ServiceConnection) */
     @Nullable
     ServiceConnection maybeReplaceServiceConnection(Intent service, long flags, UserHandle user, ServiceConnection orig);
+
+    /** @see BinderProxy#queryLocalInterface(String)  */
+    @Nullable
+    IInterface maybeProvideBinderProxyInterface(BinderProxy binderProxy, String ifaceDescriptor);
+
+    /** @see BinderProxy#dump(FileDescriptor, String[])
+     *  @see BinderProxy#dumpAsync(FileDescriptor, String[]) */
+    boolean maybeInterceptBinderProxyDump(BinderProxy binderProxy, FileDescriptor fd, String[] args, boolean async);
 }