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

Commit fafd1f33 authored by Tony Mak's avatar Tony Mak
Browse files

Fix "ActivityTaskManager.requestAssistDataForTask crash on secondary user" 

I only tested the VoiceInteractionService codepath and didn't realize
the Launcher also depends on the assist data API.
The VIS code path has cleared the caller identity before calling into
isAssistDataAllowed. However, requestAssistDataForTask does not.

Test: Create a secondary user. Open an app. Go to the overview screen.
Without the fix, crash observed. With the fix, no more crash.
Test: atest android.voiceinteraction.cts.VoiceInteractionServiceTest

Fixes: 323909861
Change-Id: I59b6e2de9cc3616b0867b128403ff0c4514eb905
parent 4eac1b08

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+9 −4
Original line number Diff line number Diff line
@@ -3522,10 +3522,15 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            if (displayContent == null) {

                return false;

            }

            final long callingIdentity = Binder.clearCallingIdentity();

            try {

                hasRestrictedWindow = displayContent.forAllWindows(windowState -> {

                    return windowState.isOnScreen() && UserManager.isUserTypePrivateProfile(

                            getUserManager().getProfileType(windowState.mShowUserId));

                }, true /* traverseTopToBottom */);

            } finally {

                Binder.restoreCallingIdentity(callingIdentity);

            }

        }

        return DevicePolicyCache.getInstance().isScreenCaptureAllowed(userId)

                && !hasRestrictedWindow;