Refactor service setup

Author: Tornaco

android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/IThanos.aidl

@@ -17,7 +17,6 @@ import github.tornaco.android.thanos.core.backup.IBackupAgent;
 import github.tornaco.android.thanos.core.wm.IWindowManager;
 import github.tornaco.android.thanos.core.power.IPowerManager;
 import github.tornaco.android.thanos.core.input.IInputManager;
-import github.tornaco.android.thanos.core.plus.IRS;
 import github.tornaco.android.thanos.core.net.INetworkManager;
 import github.tornaco.android.thanos.core.IPluginLogger;
 import github.tornaco.android.thanos.core.app.infinite.InfiniteZ;
@@ -65,8 +64,6 @@ interface IThanos {
 
     List<String> getPatchingSource();
 
-    IRS getRS();
-
     IUsageStatsManager getUsageStatsManager();
     IPushDelegateManager getPushDelegateManager();
     INetworkManager getNetworkManager();

android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/app/IActivityManager.aidl

@@ -7,6 +7,7 @@ import github.tornaco.android.thanos.core.IPrinter;
 import github.tornaco.android.thanos.core.app.RunningAppProcessInfoCompat;
 import github.tornaco.android.thanos.core.app.usage.ProcessCpuUsageStats;
 import github.tornaco.android.thanos.core.os.SwapInfo;
+import github.tornaco.android.thanos.core.os.SynchronousResultReceiver;
 
 interface IActivityManager {
     String getCurrentFrontApp();
@@ -252,4 +253,5 @@ interface IActivityManager {
     void removeAppStabilityUpKeepExceptions(in List<Pkg> pkgs);
 
     long fastGetProcessPss(int pid);
+    long setupService(int taskId, in Intent intent, in SynchronousResultReceiver receiver);
 }

android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/app/ThanosManager.java

@@ -35,8 +35,6 @@
 import github.tornaco.android.thanos.core.ops.OpsManager;
 import github.tornaco.android.thanos.core.os.IServiceManager;
 import github.tornaco.android.thanos.core.os.ServiceManager;
-import github.tornaco.android.thanos.core.plus.IRS;
-import github.tornaco.android.thanos.core.plus.RSManager;
 import github.tornaco.android.thanos.core.pm.IPkgManager;
 import github.tornaco.android.thanos.core.pm.PackageManager;
 import github.tornaco.android.thanos.core.power.IPowerManager;
@@ -159,11 +157,6 @@ public IPushManager getPushManager() throws RemoteException {
             return new IPushManager.Default();
         }
 
-        @Override
-        public IRS getRS() throws RemoteException {
-            return new IRS.Default();
-        }
-
         @Override
         public IUsageStatsManager getUsageStatsManager() throws RemoteException {
             return new IUsageStatsManager.Default();
@@ -189,6 +182,10 @@ public ThanosManager(Context context, IThanos service) {
         this.service = service;
     }
 
+    public IThanos getService() {
+        return service;
+    }
+
     public boolean isServiceInstalled() {
         boolean firstCheck = service != null
                 && sDefaultFallbackService != service
@@ -283,11 +280,6 @@ public PowerManager getPowerManager() {
         return new PowerManager(service.getPowerManager());
     }
 
-    @SneakyThrows
-    public RSManager getRSManager() {
-        return new RSManager(service.getRS());
-    }
-
     @SneakyThrows
     public UsageStatsManager getUsageStatsManager() {
         return new UsageStatsManager(service.getUsageStatsManager());

android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/os/ByteArrayCompressor.kt

@@ -0,0 +1,52 @@
+package github.tornaco.android.thanos.core.os
+
+import android.util.Log
+import java.io.ByteArrayOutputStream
+import java.util.zip.Deflater
+import java.util.zip.Inflater
+
+internal object ByteArrayCompressor {
+
+    fun compress(data: ByteArray): ByteArray {
+        val deflater = Deflater()
+        deflater.setInput(data)
+        deflater.finish()
+
+        val buffer = ByteArray(1024)
+        val outputStream = ByteArrayOutputStream()
+        try {
+            while (!deflater.finished()) {
+                val count = deflater.deflate(buffer)
+                outputStream.write(buffer, 0, count)
+            }
+        } finally {
+            deflater.end()
+        }
+        return outputStream.toByteArray().also {
+            Log.v("ByteArrayCompressor", "After compress size: ${it.size}")
+        }
+    }
+
+
+    fun decompress(data: ByteArray): ByteArray {
+        return runCatching {
+            val inflater = Inflater()
+            inflater.setInput(data)
+
+            val buffer = ByteArray(1024)
+            val outputStream = ByteArrayOutputStream()
+            try {
+                while (!inflater.finished()) {
+                    val count = inflater.inflate(buffer)
+                    outputStream.write(buffer, 0, count)
+                }
+            } finally {
+                inflater.end()
+            }
+            outputStream.toByteArray()
+        }.getOrElse {
+            // Fallback to raw data for compat(shortcut stub) issue.
+            data
+        }
+    }
+}

android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/os/ByteArrayWrapper.kt

@@ -0,0 +1,43 @@
+package github.tornaco.android.thanos.core.os
+
+import android.os.Parcel
+import android.os.Parcelable
+
+data class ByteArrayWrapper(val byteData: ByteArray) : Parcelable {
+    constructor(parcel: Parcel) : this(ByteArrayCompressor.decompress(parcel.createByteArray()))
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeByteArray(ByteArrayCompressor.compress(byteData))
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ByteArrayWrapper
+
+        return byteData.contentEquals(other.byteData)
+    }
+
+    override fun hashCode(): Int {
+        return byteData.contentHashCode()
+    }
+
+    companion object CREATOR : Parcelable.Creator<ByteArrayWrapper> {
+        override fun createFromParcel(parcel: Parcel): ByteArrayWrapper {
+            return ByteArrayWrapper(parcel)
+        }
+
+        override fun newArray(size: Int): Array<ByteArrayWrapper?> {
+            return arrayOfNulls(size)
+        }
+    }
+}
+
+fun ByteArray.wrap(): ByteArrayWrapper {
+    return ByteArrayWrapper(this)
+}

android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/os/ByteArrayWrapperKt.kt

@@ -0,0 +1,3 @@
+package github.tornaco.android.thanos.core.os
+
+val emptyByteArrayWrapper = ByteArrayWrapper(byteArrayOf())

…o/android/thanos/core/plus/Callback.java …aco/android/thanos/core/os/Callback.javaandroid/android_framework/base/src/main/java/github/tornaco/android/thanos/core/plus/Callback.java renamed to android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/os/Callback.java android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/plus/Callback.java renamed to android/android_framework/base/src/main/java/github/tornaco/android/thanos/core/os/Callback.java

@@ -1,10 +1,12 @@
-package github.tornaco.android.thanos.core.plus;
+package github.tornaco.android.thanos.core.os;
 
 import android.os.Handler;
 import android.os.Looper;
 
 import com.elvishew.xlog.XLog;
 
+import github.tornaco.android.thanos.core.plus.ICallback;
+
 public class Callback extends ICallback.Stub {
     private final Handler handler = new Handler(Looper.getMainLooper());