summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2022-09-22 19:13:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-09-22 19:13:56 +0000
commit4658046b52c19e726b2cab579c3b44b803c1946b (patch)
tree1626a3a3c6eae21d5dd549731e794c72219c933e /core/java
parentdc3bd363183a0f1cae545a4965371dde666f86de (diff)
parent9f8f1fd9a7f22db4c89fbdf0b03885eac70e327f (diff)
Merge changes Iffb62170,I9b795928 into tm-qpr-dev
* changes: Clean up leaked screenshot connections Always reset screenshot preview to alpha=1
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/util/ScreenshotHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/com/android/internal/util/ScreenshotHelper.java b/core/java/com/android/internal/util/ScreenshotHelper.java
index 9474f6fc3252..79c519645a24 100644
--- a/core/java/com/android/internal/util/ScreenshotHelper.java
+++ b/core/java/com/android/internal/util/ScreenshotHelper.java
@@ -377,6 +377,9 @@ public class ScreenshotHelper {
msg.replyTo = new Messenger(h);
if (mScreenshotConnection == null || mScreenshotService == null) {
+ if (mScreenshotConnection != null) {
+ resetConnection();
+ }
final ComponentName serviceComponent = ComponentName.unflattenFromString(
mContext.getResources().getString(
com.android.internal.R.string.config_screenshotServiceComponent));