From 8947d75873b9f5204aadaa73816f263ec6efbcb9 Mon Sep 17 00:00:00 2001 From: Beverly Date: Tue, 17 Mar 2020 08:59:43 -0400 Subject: onDestroy, remove messages+callbacks on handler Messages in the the KeyguardUpdateMonitor handler were still being called after a test was finished, causing an assertMainThread exception while running tests sometimes, so we would see flaky tests. Test: atest SystemUITests Fixes: 150592614 Change-Id: Ibd25e09948711054a4ef144cb54eaacfe566eeca --- packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 431c4519bd81..90df124c85ca 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -2740,6 +2740,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver); mBroadcastDispatcher.unregisterReceiver(mBroadcastAllReceiver); + + mHandler.removeCallbacksAndMessages(null); } @Override -- cgit v1.2.3-59-g8ed1b