[core] Fix write settings (#1156)

core/src/main/java/org/lsposed/lspd/service/ActivityManagerService.java

@@ -25,6 +25,7 @@ import android.app.IActivityManager;
 import android.app.IApplicationThread;
 import android.app.IServiceConnection;
 import android.app.ProfilerInfo;
+import android.content.IContentProvider;
 import android.content.IIntentReceiver;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -163,4 +164,14 @@ public class ActivityManagerService {
         return am.getCurrentUser();
     }
 
+    public static IContentProvider getContentProvider(String auth, int userId) throws RemoteException {
+        IActivityManager am = getActivityManager();
+        if (am == null) return null;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            return am.getContentProviderExternal(auth, userId, token, null).provider;
+        } else {
+            return am.getContentProviderExternal(auth, userId, token).provider;
+        }
+    }
+
 }

core/src/main/java/org/lsposed/lspd/service/LSPManagerService.java

@@ -598,13 +598,13 @@ public class LSPManagerService extends ILSPManagerService.Stub {
 
     @Override
     public void setHiddenIcon(boolean hide) {
-        var settings = new ServiceShellCommand("settings");
+        Bundle args = new Bundle();
-        var enable = hide ? "0" : "1";
+        args.putString("value", hide ? "0" : "1");
-        var args = new String[]{"put", "global", "show_hidden_icon_apps_enabled", enable};
+        args.putString("_user", "0");
         try {
-            settings.shellCommand(FileDescriptor.in, FileDescriptor.out, FileDescriptor.err,
+            ActivityManagerService.getContentProvider("settings", 0)
-                    args, new ResultReceiver(null));
+                    .call("android", null, "settings", "PUT_global", "show_hidden_icon_apps_enabled", args);
-        } catch (RemoteException e) {
+        } catch (RemoteException | NullPointerException e) {
             Log.w(TAG, "setHiddenIcon: ", e);
         }
     }

core/src/main/java/org/lsposed/lspd/service/ServiceShellCommand.java

@@ -1,36 +0,0 @@
-package org.lsposed.lspd.service;
-
-import android.os.IBinder;
-import android.os.Parcel;
-import android.os.RemoteException;
-import android.os.ResultReceiver;
-
-import java.io.FileDescriptor;
-
-class ServiceShellCommand {
-    private static final int SHELL_COMMAND_TRANSACTION = ('_' << 24) | ('C' << 16) | ('M' << 8) | 'D';
-    private final IBinder binder;
-
-    ServiceShellCommand(String name) {
-        binder = android.os.ServiceManager.getService(name);
-    }
-
-    void shellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
-                      String[] args, ResultReceiver resultReceiver) throws RemoteException {
-        Parcel data = Parcel.obtain();
-        Parcel reply = Parcel.obtain();
-        data.writeFileDescriptor(in);
-        data.writeFileDescriptor(out);
-        data.writeFileDescriptor(err);
-        data.writeStringArray(args);
-        data.writeStrongBinder(null);
-        resultReceiver.writeToParcel(data, 0);
-        try {
-            binder.transact(SHELL_COMMAND_TRANSACTION, data, reply, 0);
-            reply.readException();
-        } finally {
-            data.recycle();
-            reply.recycle();
-        }
-    }
-}

core/src/main/java/org/lsposed/lspd/util/ParasiticManagerHooker.java

@@ -95,7 +95,9 @@ public class ParasiticManagerHooker {
                 "android.app.ActivityThread$AppBindData",
                 managerApkHooker);
 
-        XposedBridge.hookAllConstructors(ActivityThread.ActivityClientRecord.class, activityHooker);
+
+        var activityClientRecordClass = XposedHelpers.findClass("android.app.ActivityThread$ActivityClientRecord", ActivityThread.class.getClassLoader());
+        XposedBridge.hookAllConstructors(activityClientRecordClass, activityHooker);
 
         var unhooks = new XC_MethodHook.Unhook[]{null};
         unhooks[0] = XposedHelpers.findAndHookMethod(
@@ -124,6 +126,7 @@ public class ParasiticManagerHooker {
         });
         XposedBridge.hookAllMethods(ActivityThread.class, "installProvider", new XC_MethodHook() {
             private Context originalContext = null;
+
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 Hookers.logD("before install provider");
@@ -152,7 +155,7 @@ public class ParasiticManagerHooker {
             }
         });
 
-        XposedHelpers.findAndHookMethod(ActivityThread.class, "deliverNewIntents", ActivityThread.ActivityClientRecord.class, List.class, new XC_MethodHook() {
+        XposedHelpers.findAndHookMethod(ActivityThread.class, "deliverNewIntents", activityClientRecordClass, List.class, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) {
                 if (param.args[1] == null) return;

hiddenapi-stubs/src/main/java/android/app/ContentProviderHolder.java

@@ -0,0 +1,7 @@
+package android.app;
+
+import android.content.IContentProvider;
+
+public class ContentProviderHolder {
+    public IContentProvider provider;
+}

hiddenapi-stubs/src/main/java/android/app/IActivityManager.java

@@ -97,6 +97,13 @@ public interface IActivityManager extends IInterface {
 
     void setActivityController(IActivityController watcher, boolean imAMonkey) throws RemoteException;
 
+    @RequiresApi(29)
+    ContentProviderHolder getContentProviderExternal(String name, int userId,
+                                                     IBinder token, String tag);
+
+    ContentProviderHolder getContentProviderExternal(String name, int userId,
+                                                     IBinder token);
+
     abstract class Stub extends Binder implements IActivityManager {
         public static int TRANSACTION_setActivityController;
 

hiddenapi-stubs/src/main/java/android/content/IContentProvider.java

@@ -0,0 +1,11 @@
+package android.content;
+
+import android.os.Bundle;
+import android.os.IInterface;
+import android.os.RemoteException;
+
+public interface IContentProvider extends IInterface {
+    Bundle call(String callingPkg, String attributionTag, String authority,
+                String method, String arg, Bundle extras) throws RemoteException;
+
+}