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

Commit c812ced0 authored by Shashwat Razdan's avatar Shashwat Razdan
Browse files

Make mWmInternal and mDpmInternal nullable. 

Test: Created ATV emulator locally and ensured it boots successfully
Bug: 326143814
Bug: 327413151
Change-Id: I1a83616afc7dbe651eaaa7aaad3f9bc629e0a689
parent 59d3875a

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

+10 −6
Original line number Diff line number Diff line
@@ -181,10 +181,8 @@ public class VoiceInteractionManagerService extends SystemService { 
                LocalServices.getService(ActivityManagerInternal.class));

        mAtmInternal = Objects.requireNonNull(

                LocalServices.getService(ActivityTaskManagerInternal.class));

        mWmInternal = Objects.requireNonNull(

                LocalServices.getService(WindowManagerInternal.class));

        mDpmInternal = Objects.requireNonNull(

                LocalServices.getService(DevicePolicyManagerInternal.class));

        mWmInternal = LocalServices.getService(WindowManagerInternal.class);

        mDpmInternal = LocalServices.getService(DevicePolicyManagerInternal.class);

        LegacyPermissionManagerInternal permissionManagerInternal = LocalServices.getService(

                LegacyPermissionManagerInternal.class);

        permissionManagerInternal.setVoiceInteractionPackagesProvider(
@@ -2750,11 +2748,17 @@ public class VoiceInteractionManagerService extends SystemService { 
                if (isAssistDataAllowed) {

                    visiblePackageNames.add(record.getComponentName().getPackageName());

                }

                if (mDpmInternal.isUserOrganizationManaged(record.getUserId())) {

                if (mDpmInternal != null

                        && mDpmInternal.isUserOrganizationManaged(record.getUserId())) {

                    isManagedProfileVisible = true;

                }

            }

            final ScreenCapture.ScreenshotHardwareBuffer shb = mWmInternal.takeAssistScreenshot();

            final ScreenCapture.ScreenshotHardwareBuffer shb;

            if (mWmInternal != null) {

                shb = mWmInternal.takeAssistScreenshot();

            } else {

                shb = null;

            }

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

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

            if (bm != null) {