Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Fix NPE in ScreenshotHelper" into rvc-dev am: a4b9474647 am: 022a82161c" into rvc-d1-dev-plus-aosp am: 3bc82e0fb8

Browse Source 
Change-Id: Ibc6ce20b46b999541d04cb04ce359ec846ceec72
This commit is contained in:
Automerger Merge Worker
2020-05-13 16:54:06 +00:00
parent 9a027a3301 3bc82e0fb8
commit 486f2374b8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/util/ScreenshotHelper.java
View File

@@ -132,6 +132,7 @@ public class ScreenshotHelper {
}
};
}
private static final String TAG = "ScreenshotHelper";
// Time until we give up on the screenshot & show an error instead.
@@ -146,8 +147,6 @@ public class ScreenshotHelper {
mContext = context;
}
/**
* Request a screenshot be taken.
*
@@ -284,8 +283,8 @@ public class ScreenshotHelper {
break;
case SCREENSHOT_MSG_PROCESS_COMPLETE:
synchronized (mScreenshotLock) {
if (mScreenshotConnection == myConn) {
mContext.unbindService(mScreenshotConnection);
if (myConn != null && mScreenshotConnection == myConn) {
mContext.unbindService(myConn);
mScreenshotConnection = null;
mScreenshotService = null;
}