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

Merge "Make mScreenshotController final and @NonNull" into tm-qpr-dev am: 72534bd4ca

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19673753

Change-Id: I05ee5df2e0ac7f0103c67dde6a2e90293486f871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mark Renouf
2022-08-23 20:31:23 +00:00
committed by Automerger Merge Worker
parent fb1ae8298a 72534bd4ca
commit 093b373e62
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java
View File

@@ -70,7 +70,7 @@ import javax.inject.Inject;
public class TakeScreenshotService extends Service {
private static final String TAG = logTag(TakeScreenshotService.class);
private ScreenshotController mScreenshot;
private final ScreenshotController mScreenshot;
private final UserManager mUserManager;
private final DevicePolicyManager mDevicePolicyManager;
@@ -152,10 +152,7 @@ public class TakeScreenshotService extends Service {
if (DEBUG_SERVICE) {
Log.d(TAG, "onUnbind");
}
if (mScreenshot != null) {
mScreenshot.removeWindow();
mScreenshot = null;
}
mScreenshot.removeWindow();
unregisterReceiver(mCloseSystemDialogs);
return false;
}
@@ -163,10 +160,7 @@ public class TakeScreenshotService extends Service {
@Override
public void onDestroy() {
super.onDestroy();
if (mScreenshot != null) {
mScreenshot.onDestroy();
mScreenshot = null;
}
mScreenshot.onDestroy();
if (DEBUG_SERVICE) {
Log.d(TAG, "onDestroy");
}