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

Commit c1c4902b authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge changes I85431728,I803587d4,Iaba879e2 into main 

* changes:
  Add hashCode to TvStreamConfig
  Suppress MissingGetterMatchingBuilder warning
  Suppress UserHandleName warning
parents dd1f85d4 4679be52

media/java/android/media/RoutingSessionInfo.java

+8 −0
Original line number Diff line number Diff line
@@ -901,6 +901,14 @@ public final class RoutingSessionInfo implements Parcelable { 
         * <p>By default the transfer initiation user handle and package name are set to {@code

         * null}.

         */

        // The UserHandleName warning suggests the name should be "doFooAsUser". But the UserHandle

        // parameter of this function is stored in a field, and not used to execute an operation on

        // a specific user.

        // The MissingGetterMatchingBuilder requires a getTransferInitiator function. But said

        // getter is not included because the returned package name and user handle is always either

        // null or the values that correspond to the calling app, and that information is obtainable

        // via RoutingController#wasTransferInitiatedBySelf.

        @SuppressWarnings({"UserHandleName", "MissingGetterMatchingBuilder"})

        @NonNull

        @FlaggedApi(FLAG_ENABLE_BUILT_IN_SPEAKER_ROUTE_SUITABILITY_STATUSES)

        public Builder setTransferInitiator(

media/java/android/media/tv/TvStreamConfig.java

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.util.Log;



import java.util.Objects;



/**

 * @hide

 */
@@ -177,4 +179,9 @@ public class TvStreamConfig implements Parcelable { 
            && config.mMaxWidth == mMaxWidth

            && config.mMaxHeight == mMaxHeight;

    }



    @Override

    public int hashCode() {

        return Objects.hash(mGeneration, mStreamId, mType, mMaxWidth, mMaxHeight);

    }

}