am 708bc0e2: am f80a7af0: Merge "Register receivers from ViewFlipper with an explicit Handler" into klp-dev

* commit '708bc0e24e503beb3b4e31eda8705357c77efcd8':
  Register receivers from ViewFlipper with an explicit Handler
This commit is contained in:
Adam Powell
2013-10-17 10:31:47 -07:00
committed by Android Git Automerger

View File

@@ -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