From 4973680e5640afdd10050ab9089d971a10bd6abd Mon Sep 17 00:00:00 2001
From: Charles He <qiurui@google.com>
Date: Mon, 23 Oct 2017 11:06:23 +0100
Subject: [PATCH] AM: clean up screen pinning toasts.

We remove the unnecessary handler thread logic in LockTaskNotify, as all
toasts are already called from the handler thread in LockTaskController.

Bug: 67934620
Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Change-Id: I5019158b649b7b5f2eac4759dab817fa5f443a76
---
 .../java/com/android/server/am/LockTaskNotify.java | 25 ++--------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/services/core/java/com/android/server/am/LockTaskNotify.java b/services/core/java/com/android/server/am/LockTaskNotify.java
index 5d6e9b58881f..1dcb0addc18b 100644
--- a/services/core/java/com/android/server/am/LockTaskNotify.java
+++ b/services/core/java/com/android/server/am/LockTaskNotify.java
@@ -17,8 +17,6 @@
 package com.android.server.am;
 
 import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
 import android.os.SystemClock;
 import android.util.Slog;
 import android.view.WindowManager;
@@ -27,21 +25,19 @@ import android.widget.Toast;
 import com.android.internal.R;
 
 /**
- *  Helper to manage showing/hiding a image to notify them that they are entering
- *  or exiting screen pinning mode.
+ *  Helper to manage showing/hiding a image to notify them that they are entering or exiting screen
+ *  pinning mode. All exposed methods should be called from a handler thread.
  */
 public class LockTaskNotify {
     private static final String TAG = "LockTaskNotify";
     private static final long SHOW_TOAST_MINIMUM_INTERVAL = 1000;
 
     private final Context mContext;
-    private final H mHandler;
     private Toast mLastToast;
     private long mLastShowToastTime;
 
     public LockTaskNotify(Context context) {
         mContext = context;
-        mHandler = new H();
     }
 
     /** Show "Screen pinned" toast. */
@@ -56,10 +52,6 @@ public class LockTaskNotify {
 
     /** Show a toast that describes the gesture the user should use to escape pinned mode. */
     void showEscapeToast() {
-        mHandler.obtainMessage(H.SHOW_ESCAPE_TOAST).sendToTarget();
-    }
-
-    private void handleShowEscapeToast() {
         long showToastTime = SystemClock.elapsedRealtime();
         if ((showToastTime - mLastShowToastTime) < SHOW_TOAST_MINIMUM_INTERVAL) {
             Slog.i(TAG, "Ignore toast since it is requested in very short interval.");
@@ -79,17 +71,4 @@ public class LockTaskNotify {
         toast.show();
         return toast;
     }
-
-    private final class H extends Handler {
-        private static final int SHOW_ESCAPE_TOAST = 3;
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch(msg.what) {
-                case SHOW_ESCAPE_TOAST:
-                    handleShowEscapeToast();
-                    break;
-            }
-        }
-    }
 }
-- 
2.11.0