From 6ee17428b68acce00669154329bdb6b2dd624f82 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 7 May 2019 13:22:15 -0700
Subject: [PATCH] Ensure we only remove messages for the same app info

Bug: 130151718
Bug: 132179354
Test: Switch between gesture nav modes, ensure that system and sysui are
      in the right state

Change-Id: I364d155292fc378af552b6ce9e6acca879224693
---
 core/java/android/app/ActivityThread.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 4b37461866d03..bfc8b12043732 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -1069,7 +1069,7 @@ public final class ActivityThread extends ClientTransactionHandler {
         }
 
         public void scheduleApplicationInfoChanged(ApplicationInfo ai) {
-            mH.removeMessages(H.APPLICATION_INFO_CHANGED);
+            mH.removeMessages(H.APPLICATION_INFO_CHANGED, ai);
             sendMessage(H.APPLICATION_INFO_CHANGED, ai);
         }