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

Commit 33aff262 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Check for null service in ScreenshotHelper 

We were testing whether mScreenshotConnection was null as a proxy
for whether we had a running screenshot service. In principle
mScreenshotService should never be null if mScreenshotConnection
is not null, but it's safer to check. This may fix the crash noticed in
early May (attached bug), and either way is better for the stability
of the process.

Bug: 156366251
Fix: 156366251
Test: manual
Change-Id: Iea669a5a2ca2334760141ec6fec8ec7ffb01f25c
parent b278a5c4

core/java/com/android/internal/util/ScreenshotHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ public class ScreenshotHelper { 
            };

            msg.replyTo = new Messenger(h);



            if (mScreenshotConnection == null) {

            if (mScreenshotConnection == null || mScreenshotService == null) {

                final ComponentName serviceComponent = ComponentName.unflattenFromString(

                        mContext.getResources().getString(

                                com.android.internal.R.string.config_screenshotServiceComponent));