base: Add method to restart SystemUI

* Killing com.android.systemui using IActivityManager doesnt work always.
* Instead use CommandQueue callback to make SystemUI kill itself. Works!

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>

Author: neobuddy89

core/java/com/android/internal/statusbar/IStatusBar.aidl

@@ -413,4 +413,6 @@ oneway interface IStatusBar
     * @param displayId the id of the current display.
     */
     void moveFocusedTaskToDesktop(int displayId);
+
+    void restartSystemUI();
 }

core/java/com/android/internal/statusbar/IStatusBarService.aidl

@@ -254,4 +254,6 @@ interface IStatusBarService
      * Toggle recent apps.
      */
     void toggleRecentApps();
+
+    void restartSystemUI();
 }

core/java/com/android/internal/util/evolution/Utils.java

@@ -32,11 +32,14 @@
 import android.content.pm.ResolveInfo;
 import android.os.AsyncTask;
 import android.os.PowerManager;
+import android.os.RemoteException;
+import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.util.Log;
 
+import com.android.internal.statusbar.IStatusBarService;
 import com.android.internal.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -147,6 +150,15 @@ public static boolean hasNavbarByDefault(Context context) {
         return needsNav;
     }
 
+    public static void restartSystemUI() {
+        final IStatusBarService mBarService = IStatusBarService.Stub.asInterface(
+                ServiceManager.getService(Context.STATUS_BAR_SERVICE));
+        try {
+            mBarService.restartSystemUI();
+        } catch (RemoteException e) {
+        }
+    }
+
     public static String getDefaultLauncher(Context context) {
         final RoleManager roleManager = context.getSystemService(RoleManager.class);
         final String packageName = CollectionUtils.firstOrNull(

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

@@ -189,6 +189,7 @@ public class CommandQueue extends IStatusBar.Stub implements
     private static final int MSG_WALLET_ACTION_LAUNCH_GESTURE = 83 << MSG_SHIFT;
     private static final int MSG_DISPLAY_REMOVE_SYSTEM_DECORATIONS = 85 << MSG_SHIFT;
     private static final int MSG_DISABLE_ALL  = 86 << MSG_SHIFT;
+    private static final int MSG_RESTART_SYSTEMUI = 87 << MSG_SHIFT;
 
     public static final int FLAG_EXCLUDE_NONE = 0;
     public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
@@ -594,6 +595,8 @@ default void immersiveModeChanged(int rootDisplayAreaId, boolean isImmersiveMode
          * @see IStatusBar#moveFocusedTaskToDesktop(int)
          */
         default void moveFocusedTaskToDesktop(int displayId) {}
+
+        default void restartSystemUI() {}
     }
 
     @VisibleForTesting
@@ -1550,6 +1553,13 @@ public void moveFocusedTaskToDesktop(int displayId) {
         mHandler.obtainMessage(MSG_ENTER_DESKTOP, args).sendToTarget();
     }
 
+    @Override
+    public void restartSystemUI() {
+        synchronized (mLock) {
+            mHandler.removeMessages(MSG_RESTART_SYSTEMUI);
+            mHandler.obtainMessage(MSG_RESTART_SYSTEMUI).sendToTarget();
+        }
+    }
 
     private final class H extends Handler {
         private H(Looper l) {
@@ -2094,6 +2104,11 @@ public void handleMessage(Message msg) {
                     }
                     break;
                 }
+                case MSG_RESTART_SYSTEMUI:
+                    for (int i = 0; i < mCallbacks.size(); i++) {
+                        mCallbacks.get(i).restartSystemUI();
+                    }
+                    break;
             }
         }
     }

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

@@ -807,6 +807,11 @@ public void onRotationLockStateChanged(boolean rotationLocked, boolean affordanc
         }
     }
 
+    @Override
+    public void restartSystemUI() {
+        Process.killProcess(Process.myPid());
+    }
+
     private void updateHeadsetPlug(Intent intent) {
         boolean connected = intent.getIntExtra("state", 0) != 0;
         boolean hasMic = intent.getIntExtra("microphone", 0) != 0;

services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java

@@ -290,4 +290,6 @@ void showMediaOutputSwitcher(String targetPackageName, UserHandle targetUserHand
 
     /** Passes through the given shell commands to SystemUI */
     void passThroughShellCommand(String[] args, FileDescriptor fd);
+
+    void restartSystemUI();
 }

services/core/java/com/android/server/statusbar/StatusBarManagerService.java

@@ -1027,6 +1027,17 @@ public void removeQsTile(ComponentName tile) {
         public void passThroughShellCommand(String[] args, FileDescriptor fd) {
             StatusBarManagerService.this.passThroughShellCommand(args, fd);
         }
+
+        @Override
+        public void restartSystemUI() {
+            IStatusBar bar = mBar;
+            if (bar != null) {
+                try {
+                    bar.restartSystemUI();
+                } catch (RemoteException e) {
+                }
+            }
+        }
     };
 
     private final GlobalActionsProvider mGlobalActionsProvider = new GlobalActionsProvider() {
@@ -1983,6 +1994,24 @@ public void restart() {
         }
     }
 
+    /**
+     * Allows SystemUI restart only
+     */
+    @Override
+    public void restartSystemUI() {
+        enforceStatusBarService();
+        enforceValidCallingUser();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            mHandler.post(() -> {
+                mInternalService.restartSystemUI();
+            });
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
     @Override
     public void onGlobalActionsShown() {
         enforceStatusBarService();