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

Commit 41cd577c authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Send USER_FOREGROUND and USER_BACKGROUND to all related profiles 

Also do a check for null applicationInfo object during user creation.

Bug: 16211029
Change-Id: Ib49c241cf3698735e273edf5704bef277f1142a5
parent 47e91f20

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

+26 −14
Original line number Diff line number Diff line
@@ -17047,22 +17047,34 @@ public final class ActivityManagerService extends ActivityManagerNative 
        try {

            Intent intent;

            if (oldUserId >= 0) {

                // Send USER_BACKGROUND broadcast to all profiles of the outgoing user

                List<UserInfo> profiles = mUserManager.getProfiles(oldUserId, false);

                int count = profiles.size();

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

                    int profileUserId = profiles.get(i).id;

                    intent = new Intent(Intent.ACTION_USER_BACKGROUND);

                    intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY

                            | Intent.FLAG_RECEIVER_FOREGROUND);

                intent.putExtra(Intent.EXTRA_USER_HANDLE, oldUserId);

                    intent.putExtra(Intent.EXTRA_USER_HANDLE, profileUserId);

                    broadcastIntentLocked(null, null, intent,

                            null, null, 0, null, null, null, AppOpsManager.OP_NONE,

                        false, false, MY_PID, Process.SYSTEM_UID, oldUserId);

                            false, false, MY_PID, Process.SYSTEM_UID, profileUserId);

                }

            }

            if (newUserId >= 0) {

                // Send USER_FOREGROUND broadcast to all profiles of the incoming user

                List<UserInfo> profiles = mUserManager.getProfiles(newUserId, false);

                int count = profiles.size();

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

                    int profileUserId = profiles.get(i).id;

                    intent = new Intent(Intent.ACTION_USER_FOREGROUND);

                    intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY

                            | Intent.FLAG_RECEIVER_FOREGROUND);

                intent.putExtra(Intent.EXTRA_USER_HANDLE, newUserId);

                    intent.putExtra(Intent.EXTRA_USER_HANDLE, profileUserId);

                    broadcastIntentLocked(null, null, intent,

                            null, null, 0, null, null, null, AppOpsManager.OP_NONE,

                        false, false, MY_PID, Process.SYSTEM_UID, newUserId);

                            false, false, MY_PID, Process.SYSTEM_UID, profileUserId);

                }

                intent = new Intent(Intent.ACTION_USER_SWITCHED);

                intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY

                        | Intent.FLAG_RECEIVER_FOREGROUND);

services/core/java/com/android/server/pm/Settings.java

+3 −0
Original line number Diff line number Diff line
@@ -3136,6 +3136,9 @@ final class Settings { 
        FileUtils.setPermissions(path.toString(), FileUtils.S_IRWXU | FileUtils.S_IRWXG

                | FileUtils.S_IXOTH, -1, -1);

        for (PackageSetting ps : mPackages.values()) {

            if (ps.pkg == null || ps.pkg.applicationInfo == null) {

                continue;

            }

            // Only system apps are initially installed.

            ps.setInstalled((ps.pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0, userHandle);

            // Need to create a data directory for all apps under this user.