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

Commit fb9c11c7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix MediaTrancodeManager session priority" into sc-dev am: 1431702c 

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

Change-Id: I6d38c4fafc5e6412f67bc3abf607bf0da97b7a1d
parents 07dfa906 1431702c

apex/media/framework/java/android/media/MediaTranscodeManager.java

+11 −2
Original line number Diff line number Diff line
@@ -629,7 +629,16 @@ public final class MediaTranscodeManager { 
        /* Writes the TranscodingRequest to a parcel. */

        private TranscodingRequestParcel writeToParcel(@NonNull Context context) {

            TranscodingRequestParcel parcel = new TranscodingRequestParcel();

            parcel.priority = mPriority;

            switch (mPriority) {

            case PRIORITY_OFFLINE:

                parcel.priority = TranscodingSessionPriority.kUnspecified;

                break;

            case PRIORITY_REALTIME:

            case PRIORITY_UNKNOWN:

            default:

                parcel.priority = TranscodingSessionPriority.kNormal;

                break;

            }

            parcel.transcodingType = mType;

            parcel.sourceFilePath = mSourceUri.toString();

            parcel.sourceFd = mSourceFileDescriptor;
@@ -1578,7 +1587,7 @@ public final class MediaTranscodeManager { 
                    result = "RESULT_SUCCESS";

                    break;

                case RESULT_ERROR:

                    result = "RESULT_ERROR";

                    result = "RESULT_ERROR(" + mErrorCode + ")";

                    break;

                case RESULT_CANCELED:

                    result = "RESULT_CANCELED";