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

Commit 42979622 authored by Kenny Guy's avatar Kenny Guy
Browse files

Add foreground profile changed to user switch observer. 

Called when the focused activity changes from one profile
to another to allow sys ui to vary display based on the
current profile.
This reverts commit 735a3f90.
Resubmitting with fix for build break in another package.

Bug: 19531782
Change-Id: I98cd2968ade3b1d23feb90d98057f306695d569e
parent 735a3f90

core/java/android/app/IUserSwitchObserver.aidl

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ import android.os.IRemoteCallback; 
oneway interface IUserSwitchObserver {

    void onUserSwitching(int newUserId, IRemoteCallback reply);

    void onUserSwitchComplete(int newUserId);

    void onForegroundProfileSwitch(int newProfileId);

}

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+4 −0
Original line number Diff line number Diff line
@@ -722,6 +722,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
                                    newUserId, 0));

                            mSwitchingUser = false;

                        }

                        @Override

                        public void onForegroundProfileSwitch(int newProfileId) {

                            // Ignore.

                        }

                    });

        } catch (RemoteException e) {

            // TODO Auto-generated catch block

services/core/java/com/android/server/InputMethodManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -796,6 +796,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                        @Override

                        public void onUserSwitchComplete(int newUserId) throws RemoteException {

                        }



                        @Override

                        public void onForegroundProfileSwitch(int newProfileId) {

                            // Ignore.

                        }

                    });

            userId = ActivityManagerNative.getDefault().getCurrentUser().id;

        } catch (RemoteException e) {

services/core/java/com/android/server/TextServicesManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -116,6 +116,11 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { 
                        @Override

                        public void onUserSwitchComplete(int newUserId) throws RemoteException {

                        }



                        @Override

                        public void onForegroundProfileSwitch(int newProfileId) {

                            // Ignore.

                        }

                    });

            userId = ActivityManagerNative.getDefault().getCurrentUser().id;

        } catch (RemoteException e) {

services/core/java/com/android/server/am/ActivityManagerService.java

+21 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
    static final int NOTIFY_CLEARTEXT_NETWORK_MSG = 50;

    static final int POST_DUMP_HEAP_NOTIFICATION_MSG = 51;

    static final int DELETE_DUMPHEAP_MSG = 52;

    static final int FOREGROUND_PROFILE_CHANGED_MSG = 53;















    static final int FIRST_ACTIVITY_STACK_MSG = 100;















    static final int FIRST_BROADCAST_QUEUE_MSG = 200;










@@ -1915,6 +1916,9 @@ public final class ActivityManagerService extends ActivityManagerNative













                    mMemWatchDumpUid = -1;















                }















            } break;













            case FOREGROUND_PROFILE_CHANGED_MSG: {













                dispatchForegroundProfileChanged(msg.arg1);













            } break;















            }















        }















    };










@@ -2509,6 +2513,11 @@ public final class ActivityManagerService extends ActivityManagerNative













                mWindowManager.setFocusedApp(r.appToken, true);















            }















            applyUpdateLockStateLocked(r);













            if (last != null && last.userId != mFocusedActivity.userId) {













                mHandler.removeMessages(FOREGROUND_PROFILE_CHANGED_MSG);













                mHandler.sendMessage(mHandler.obtainMessage(FOREGROUND_PROFILE_CHANGED_MSG,













                                mFocusedActivity.userId, 0));













            }















        }















        EventLog.writeEvent(EventLogTags.AM_FOCUSED_ACTIVITY, mCurrentUserId,















                mFocusedActivity == null ? "NULL" : mFocusedActivity.shortComponentName);










@@ -19032,6 +19041,18 @@ public final class ActivityManagerService extends ActivityManagerNative













        return true;















    }



























    void dispatchForegroundProfileChanged(int userId) {













        final int N = mUserSwitchObservers.beginBroadcast();













        for (int i = 0; i < N; i++) {













            try {













                mUserSwitchObservers.getBroadcastItem(i).onForegroundProfileSwitch(userId);













            } catch (RemoteException e) {













                // Ignore













            }













        }













        mUserSwitchObservers.finishBroadcast();













    }



























    void sendUserSwitchBroadcastsLocked(int oldUserId, int newUserId) {















        long ident = Binder.clearCallingIdentity();















        try {