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

Commit 21f8ea37 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Don't worry about mWmInternal being null" into main

parents a288bec9 39c015a1

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+4 −7
Original line number Diff line number Diff line
@@ -180,7 +180,8 @@ public class VoiceInteractionManagerService extends SystemService { 
                LocalServices.getService(ActivityManagerInternal.class));

        mAtmInternal = Objects.requireNonNull(

                LocalServices.getService(ActivityTaskManagerInternal.class));

        mWmInternal = LocalServices.getService(WindowManagerInternal.class);

        mWmInternal = Objects.requireNonNull(

                LocalServices.getService(WindowManagerInternal.class));

        mDpmInternal = LocalServices.getService(DevicePolicyManagerInternal.class);

        LegacyPermissionManagerInternal permissionManagerInternal = LocalServices.getService(

                LegacyPermissionManagerInternal.class);
@@ -2737,12 +2738,8 @@ public class VoiceInteractionManagerService extends SystemService { 
                    isManagedProfileVisible = true;

                }

            }

            final ScreenCapture.ScreenshotHardwareBuffer shb;

            if (mWmInternal != null) {

                shb = mWmInternal.takeAssistScreenshot();

            } else {

                shb = null;

            }

            final ScreenCapture.ScreenshotHardwareBuffer shb =

                    mWmInternal.takeAssistScreenshot();

            final Bitmap bm = shb != null ? shb.asBitmap() : null;

            // Now that everything is fetched, putting it in the launchIntent.

            if (bm != null) {