Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb66b5d4 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 406e9a01: am 708bc0e2: am f80a7af0: Merge "Register receivers from... 

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

* commit '406e9a01':
  Register receivers from ViewFlipper with an explicit Handler
parents d25134b9 406e9a01

core/java/android/widget/ViewFlipper.java

+1 −1
Original line number Diff line number Diff line
@@ -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