Merge "Check for null service in ScreenshotHelper" into rvc-dev

2020-06-12 19:56:36 +00:00
parent a56a27a943 33aff26285
commit 1e23e8e274
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/util/ScreenshotHelper.java
+++ b/core/java/com/android/internal/util/ScreenshotHelper.java
@@ -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));