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

Commit fa4c182a authored by Santiago Seifert's avatar Santiago Seifert Committed by Automerger Merge Worker
Browse files

Merge "Replace new with sp<>::make" am: 88aed3b8 am: e1e9a0dc am:... 

Merge "Replace new with sp<>::make" am: 88aed3b8 am: e1e9a0dc am: 301ef0b7 am: 0c1d31cc am: 3814f492

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878353

Change-Id: Ic74946a21a66ce078c7b47087f326135a336947a
parents d3b09c9d 3814f492

media/jni/android_media_MediaPlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ android_media_MediaPlayer_native_setup(JNIEnv *env, jobject thiz, jobject weak_t 
    Parcel* parcel = parcelForJavaObject(env, jAttributionSource);

    android::content::AttributionSourceState attributionSource;

    attributionSource.readFromParcel(parcel);

    sp<MediaPlayer> mp = new MediaPlayer(attributionSource);

    sp<MediaPlayer> mp = sp<MediaPlayer>::make(attributionSource);

    if (mp == NULL) {

        jniThrowException(env, "java/lang/RuntimeException", "Out of memory");

        return;