diff options
| author | Adam Powell <adamp@google.com> | 2013-10-17 17:26:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-17 17:26:10 +0000 |
| commit | f80a7af0febcf09b47eb7122c6ad4cff6c4330fc (patch) | |
| tree | 685940499ed7a71ba3aae520248b46bf5227f101 /core/java/android | |
| parent | b346270dde839029f9d4994cf2c3fc670a4249a6 (diff) | |
| parent | b6ed2b1cff8bf5f0c3b6b844135dd945f3bd82b8 (diff) | |
Merge "Register receivers from ViewFlipper with an explicit Handler" into klp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/ViewFlipper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/ViewFlipper.java b/core/java/android/widget/ViewFlipper.java index 061bb00cfd53..b152297275a8 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 |