From b6ed2b1cff8bf5f0c3b6b844135dd945f3bd82b8 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Wed, 16 Oct 2013 16:43:41 -0700
Subject: [PATCH] Register receivers from ViewFlipper with an explicit Handler

Make sure that the BroadcastReceiver registered by ViewFlipper
enforces that messages come in on the correct (UI) thread.

Bug 11228463

Change-Id: I97f2a1c392f9c58a99afebc60170c9656bba86ad
---
 core/java/android/widget/ViewFlipper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/widget/ViewFlipper.java b/core/java/android/widget/ViewFlipper.java
index 061bb00cfd530..b152297275a81 100644
--- a/core/java/android/widget/ViewFlipper.java
+++ b/core/java/android/widget/ViewFlipper.java
@@ -90,7 +90,7 @@ public class ViewFlipper extends ViewAnimator {
         final IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_SCREEN_OFF);
         filter.addAction(Intent.ACTION_USER_PRESENT);
-        getContext().registerReceiver(mReceiver, filter);
+        getContext().registerReceiver(mReceiver, filter, null, mHandler);
 
         if (mAutoStart) {
             // Automatically start when requested