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

Commit 7cb6822e authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by The Android Automerger
Browse files

Fix errors during user switching 

Fix NPE in getHomeActivityForUser. Skip system processes in
killBackgroundUserProcessesWithRecordAudioPermission.

Bug: 21016983
Change-Id: I97f9ca362f4dbf0a659e3d5d7ae6cd8dbeb6404a
parent c8248dbd

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

+1 −1
Original line number Diff line number Diff line
@@ -19956,7 +19956,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
        public ComponentName getHomeActivityForUser(int userId) {

            synchronized (ActivityManagerService.this) {

                ActivityRecord homeActivity = mStackSupervisor.getHomeActivityForUser(userId);

                return homeActivity.realActivity;

                return homeActivity == null ? null : homeActivity.realActivity;

            }

        }

    }

services/core/java/com/android/server/audio/AudioService.java

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.Manifest.permission.REMOTE_AUDIO_PLAYBACK; 
import static android.media.AudioManager.RINGER_MODE_NORMAL;

import static android.media.AudioManager.RINGER_MODE_SILENT;

import static android.media.AudioManager.RINGER_MODE_VIBRATE;

import static android.os.Process.FIRST_APPLICATION_UID;



import android.Manifest;

import android.app.ActivityManager;
@@ -5024,6 +5025,10 @@ public class AudioService extends IAudioService.Stub { 
        }

        for (int j = packages.size() - 1; j >= 0; j--) {

            PackageInfo pkg = packages.get(j);

            // Skip system processes

            if (UserHandle.getAppId(pkg.applicationInfo.uid) < FIRST_APPLICATION_UID) {

                continue;

            }

            if (homeActivityName != null

                    && pkg.packageName.equals(homeActivityName.getPackageName())

                    && pkg.applicationInfo.isSystemApp()) {