Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c2c34bb authored by Winson's avatar Winson
Browse files

Workaround to ensure that a SystemUI process is always available. 

- For a non-primary user, this CL will ensure that the SystemUI process
  is started when we are switched to the user.  This allows us to
  maintain our current user-management model for Recents, which depends
  on this process for preloading and state management.

Bug: 27175589
Change-Id: Id985fc2876e6daf06f303b44c0f9d1d3fd377842
parent 1314d087

packages/SystemUI/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -184,6 +184,14 @@ 
            android:exported="true"

            />



        <!-- Recents depends on every user having their own SystemUI process, so on user switch,

             ensure that the process is created by starting this service.

             -->

        <service android:name="SystemUISecondaryUserService"

            android:exported="true"

            android:permission="com.android.systemui.permission.SELF" />





        <!-- started from PhoneWindowManager

             TODO: Should have an android:permission attribute -->

        <service android:name=".screenshot.TakeScreenshotService"

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

+11 −0
Original line number Diff line number Diff line
@@ -123,6 +123,17 @@ public class SystemUIApplication extends Application { 
        startServicesIfNeeded(SERVICES);

    }



    /**

     * Ensures that all the Secondary user SystemUI services are running. If they are already

     * running, this is a no-op. This is needed to conditinally start all the services, as we only

     * need to have it in the main process.

     *

     * <p>This method must only be called from the main thread.</p>

     */

    void startSecondaryUserServicesIfNeeded() {

        startServicesIfNeeded(SERVICES_PER_USER);

    }



    private void startServicesIfNeeded(Class<?>[] services) {

        if (mServicesStarted) {

            return;

packages/SystemUI/src/com/android/systemui/SystemUISecondaryUserService.java

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui;



import android.app.ActivityManager;

import android.app.Service;

import android.content.Intent;

import android.os.IBinder;

import android.os.Process;



import java.io.FileDescriptor;

import java.io.PrintWriter;



public class SystemUISecondaryUserService extends Service {



    @Override

    public void onCreate() {

        super.onCreate();

        ((SystemUIApplication) getApplication()).startSecondaryUserServicesIfNeeded();

    }



    @Override

    public IBinder onBind(Intent intent) {

        return null;

    }



    @Override

    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        SystemUI[] services = ((SystemUIApplication) getApplication()).getServices();

        if (args == null || args.length == 0) {

            for (SystemUI ui: services) {

                pw.println("dumping service: " + ui.getClass().getName());

                ui.dump(fd, pw, args);

            }

        } else {

            String svc = args[0];

            for (SystemUI ui: services) {

                String name = ui.getClass().getName();

                if (name.endsWith(svc)) {

                    ui.dump(fd, pw, args);

                }

            }

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

+20 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.Notification; 
import android.app.NotificationManager;

import android.app.PendingIntent;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;
@@ -52,6 +53,7 @@ import com.android.settingslib.RestrictedLockUtils; 
import com.android.systemui.BitmapHelper;

import com.android.systemui.GuestResumeSessionReceiver;

import com.android.systemui.R;

import com.android.systemui.SystemUISecondaryUserService;

import com.android.systemui.qs.QSTile;

import com.android.systemui.qs.tiles.UserDetailView;

import com.android.systemui.statusbar.phone.ActivityStarter;
@@ -101,6 +103,8 @@ public class UserSwitcherController { 
    private boolean mSimpleUserSwitcher;

    private boolean mAddUsersWhenLocked;

    private boolean mPauseRefreshUsers;

    private int mSecondaryUser = UserHandle.USER_NULL;

    private Intent mSecondaryUserServiceIntent;

    private SparseBooleanArray mForcePictureLoadForUserId = new SparseBooleanArray(2);



    public UserSwitcherController(Context context, KeyguardMonitor keyguardMonitor,
@@ -121,6 +125,8 @@ public class UserSwitcherController { 
        mContext.registerReceiverAsUser(mReceiver, UserHandle.SYSTEM, filter,

                null /* permission */, null /* scheduler */);



        mSecondaryUserServiceIntent = new Intent(context, SystemUISecondaryUserService.class);



        filter = new IntentFilter();

        filter.addAction(ACTION_REMOVE_GUEST);

        filter.addAction(ACTION_LOGOUT_USER);
@@ -477,6 +483,20 @@ public class UserSwitcherController { 
                }

                notifyAdapters();



                // Disconnect from the old secondary user's service

                if (mSecondaryUser != UserHandle.USER_NULL) {

                    context.stopServiceAsUser(mSecondaryUserServiceIntent,

                            UserHandle.of(mSecondaryUser));

                    mSecondaryUser = UserHandle.USER_NULL;

                }

                // Connect to the new secondary user's service (purely to ensure that a persistent

                // SystemUI application is created for that user)

                if (userInfo != null && !userInfo.isPrimary()) {

                    context.startServiceAsUser(mSecondaryUserServiceIntent,

                            UserHandle.of(userInfo.id));

                    mSecondaryUser = userInfo.id;

                }



                if (UserManager.isSplitSystemUser() && userInfo != null && !userInfo.isGuest()

                        && userInfo.id != UserHandle.USER_SYSTEM) {

                    showLogoutNotification(currentId);