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

Browse Source
This commit is contained in:
Mark Renouf
2022-08-23 11:54:19 +00:00
committed by Android (Google) Code Review
parent 109ae7874c 326f44e1a4
commit 72534bd4ca
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 { public class TakeScreenshotService extends Service {
private static final String TAG = logTag(TakeScreenshotService.class); private static final String TAG = logTag(TakeScreenshotService.class);
private ScreenshotController mScreenshot; private final ScreenshotController mScreenshot;
private final UserManager mUserManager; private final UserManager mUserManager;
private final DevicePolicyManager mDevicePolicyManager; private final DevicePolicyManager mDevicePolicyManager;
@@ -152,10 +152,7 @@ public class TakeScreenshotService extends Service {
if (DEBUG_SERVICE) { if (DEBUG_SERVICE) {
Log.d(TAG, "onUnbind"); Log.d(TAG, "onUnbind");
} }
if (mScreenshot != null) { mScreenshot.removeWindow();
mScreenshot.removeWindow();
mScreenshot = null;
}
unregisterReceiver(mCloseSystemDialogs); unregisterReceiver(mCloseSystemDialogs);
return false; return false;
} }
@@ -163,10 +160,7 @@ public class TakeScreenshotService extends Service {
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
if (mScreenshot != null) { mScreenshot.onDestroy();
mScreenshot.onDestroy();
mScreenshot = null;
}
if (DEBUG_SERVICE) { if (DEBUG_SERVICE) {
Log.d(TAG, "onDestroy"); Log.d(TAG, "onDestroy");
} }