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

Commit df0b5eed authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3276508, 3277765, 3277766, 3277904, 3276473, 3278009,... 

Merge cherrypicks of [3276508, 3277765, 3277766, 3277904, 3276473, 3278009, 3278010, 3277767, 3277768, 3277769, 3277770, 3276509, 3276510, 3278011, 3278012, 3278013, 3278014, 3278099, 3278100, 3278101, 3278102, 3278103, 3278104, 3278105, 3278106, 3277800, 3276474, 3278015, 3278016, 3278017, 3278118, 3278119, 3278120, 3278121, 3278122, 3277946, 3277905, 3277947, 3277906, 3277751, 3278123, 3277752, 3278110, 3277771, 3277907, 3278095, 3277908, 3278111, 3277772, 3276475, 3276476] into oc-mr1-release

Change-Id: I2f4ccf6bf2dd0827493d7cc3429d9535da532ca5
parents 250714c6 228112f3

core/java/android/net/Uri.java

+3 −3
Original line number Diff line number Diff line
@@ -1066,7 +1066,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 
                return null;

            }



            int end = authority.indexOf('@');

            int end = authority.lastIndexOf('@');

            return end == NOT_FOUND ? null : authority.substring(0, end);

        }
@@ -1090,7 +1090,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 
            }



            // Parse out user info and then port.

            int userInfoSeparator = authority.indexOf('@');

            int userInfoSeparator = authority.lastIndexOf('@');

            int portSeparator = authority.indexOf(':', userInfoSeparator);



            String encodedHost = portSeparator == NOT_FOUND
@@ -1116,7 +1116,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 


            // Make sure we look for the port separtor *after* the user info

            // separator. We have URLs with a ':' in the user info.

            int userInfoSeparator = authority.indexOf('@');

            int userInfoSeparator = authority.lastIndexOf('@');

            int portSeparator = authority.indexOf(':', userInfoSeparator);



            if (portSeparator == NOT_FOUND) {

core/jni/android/graphics/Bitmap.cpp

+2 −0
Original line number Diff line number Diff line
@@ -682,6 +682,8 @@ static jobject Bitmap_creator(JNIEnv* env, jobject, jintArray jColors, 


    sk_sp<Bitmap> nativeBitmap = Bitmap::allocateHeapBitmap(&bitmap);

    if (!nativeBitmap) {

        ALOGE("OOM allocating Bitmap with dimensions %i x %i", width, height);

        doThrowOOME(env);

        return NULL;

    }

core/tests/coretests/src/android/net/UriTest.java

+5 −0
Original line number Diff line number Diff line
@@ -187,6 +187,11 @@ public class UriTest extends TestCase { 
        uri = Uri.parse("http://localhost");

        assertEquals("localhost", uri.getHost());

        assertEquals(-1, uri.getPort());



        uri = Uri.parse("http://a:a@example.com:a@example2.com/path");

        assertEquals("a:a@example.com:a@example2.com", uri.getAuthority());

        assertEquals("example2.com", uri.getHost());

        assertEquals(-1, uri.getPort());

    }



    @SmallTest

media/jni/android_mtp_MtpDatabase.cpp

+1 −0
Original line number Diff line number Diff line
@@ -951,6 +951,7 @@ void* MyMtpDatabase::getThumbnail(MtpObjectHandle handle, size_t& outThumbSize) 
                        outThumbSize = image_data.thumbnail.length;

                    } else {

                        free(result);

                        result = NULL;

                    }

                }

                break;

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java

+8 −2
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ public final class NavigationBarTransitions extends BarTransitions { 


    @Override

    protected boolean isLightsOut(int mode) {

        return super.isLightsOut(mode) || (mAutoDim && !mWallpaperVisible);

        return super.isLightsOut(mode) || (mAutoDim && !mWallpaperVisible

                && mode != MODE_WARNING);

    }



    public LightBarTransitionsController getLightTransitionsController() {
@@ -108,7 +109,9 @@ public final class NavigationBarTransitions extends BarTransitions { 
        // ok, everyone, stop it right there

        navButtons.animate().cancel();



        final float navButtonsAlpha = lightsOut ? 0.6f : 1f;

        // Bump percentage by 10% if dark.

        float darkBump = mLightTransitionsController.getCurrentDarkIntensity() / 10;

        final float navButtonsAlpha = lightsOut ? 0.6f + darkBump : 1f;



        if (!animate) {

            navButtons.setAlpha(navButtonsAlpha);
@@ -130,6 +133,9 @@ public final class NavigationBarTransitions extends BarTransitions { 
        for (int i = buttonDispatchers.size() - 1; i >= 0; i--) {

            buttonDispatchers.valueAt(i).setDarkIntensity(darkIntensity);

        }

        if (mAutoDim) {

            applyLightsOut(false, true);

        }

    }



    private final View.OnTouchListener mLightsOutListener = new View.OnTouchListener() {