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

Commit f7fb5331 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
parents c7388e35 c4fee633

core/java/android/widget/ProgressBar.java

+16 −0
Original line number Diff line number Diff line
@@ -947,4 +947,20 @@ public class ProgressBar extends View { 
        setProgress(ss.progress);

        setSecondaryProgress(ss.secondaryProgress);

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        if (mIndeterminate) {

            startAnimation();

        }

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        if (mIndeterminate) {

            stopAnimation();

        }

    }

}

media/libdrm/mobile2/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ LOCAL_MODULE := libdrm2 


ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86)

LOCAL_CFLAGS += -DUSTL_ANDROID_X86

else

  ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-sh)

  LOCAL_CFLAGS += -DUSTL_ANDROID_SH

  endif

endif



include $(BUILD_STATIC_LIBRARY)

media/libdrm/mobile2/src/util/ustl-1.0/uutility.h

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ namespace simd { 
/// implicit casts to pointer from an integral type. Ironically, such an

/// implicit cast is already detected by gcc.

///

#if defined(USTL_ANDROID_X86)

#if defined(USTL_ANDROID_X86) || defined(USTL_ANDROID_SH)

#define OVERLOAD_POINTER_AND_SIZE_T_V2(name, arg1type)

#else

#define OVERLOAD_POINTER_AND_SIZE_T_V2(name, arg1type)						\