From f9c6026a7d4672308bc650fe880b72de0669472c Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Mon, 15 Aug 2016 13:57:43 -0400
Subject: [PATCH] QS Footer: Don't update icon from wrong thread.

Change-Id: I25191818579fac57236b67d7291b6ee00dd838b5
Fixes: 30748384
---
 .../SystemUI/src/com/android/systemui/qs/QSFooter.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
index 65d680509be20..15ae4ad6dac01 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
@@ -126,8 +126,8 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene
                 ? R.drawable.ic_qs_branded_vpn
                 : R.drawable.ic_qs_vpn);
             if (mFooterIconId != footerIconId) {
-                mFooterIcon.setImageResource(footerIconId);
                 mFooterIconId = footerIconId;
+                mMainHandler.post(mUpdateIcon);
             }
             mIsVisible = mIsIconVisible;
         }
@@ -207,6 +207,13 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene
         }
     }
 
+    private final Runnable mUpdateIcon = new Runnable() {
+        @Override
+        public void run() {
+            mFooterIcon.setImageResource(mFooterIconId);
+        }
+    };
+
     private final Runnable mUpdateDisplayState = new Runnable() {
         @Override
         public void run() {