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

Commit 21a20a39 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Fix the build."

parents a09bb0d2 dcc490f2

core/java/android/view/ViewGroup.java

+4 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
    

    /**

     * {@inheritDoc}

     * 

     * @hide

     */

    @Override

    public void dispatchStartTemporaryDetach() {
@@ -1081,6 +1083,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
    

    /**

     * {@inheritDoc}

     * 

     * @hide

     */

    @Override

    public void dispatchFinishTemporaryDetach() {

core/java/android/widget/TextView.java

+3 −0
Original line number Diff line number Diff line
@@ -6372,6 +6372,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        mBlink.postAtTime(mBlink, mShowCursor + BLINK);

    }



    /**

     * @hide

     */

    @Override

    public void dispatchFinishTemporaryDetach() {

        mDispatchTemporaryDetach = true;