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

Commit 8c389114 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make isSystemProvider field final" into main

parents df1450c5 38855a98

services/core/java/com/android/server/media/MediaRoute2Provider.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -42,15 +42,16 @@ abstract class MediaRoute2Provider { 
    final Object mLock = new Object();

    final Object mLock = new Object();





    Callback mCallback;

    Callback mCallback;

    boolean mIsSystemRouteProvider;

    public final boolean mIsSystemRouteProvider;

    private volatile MediaRoute2ProviderInfo mProviderInfo;

    private volatile MediaRoute2ProviderInfo mProviderInfo;





    @GuardedBy("mLock")

    @GuardedBy("mLock")

    final List<RoutingSessionInfo> mSessionInfos = new ArrayList<>();

    final List<RoutingSessionInfo> mSessionInfos = new ArrayList<>();





    MediaRoute2Provider(@NonNull ComponentName componentName) {

    MediaRoute2Provider(@NonNull ComponentName componentName, boolean isSystemRouteProvider) {

        mComponentName = Objects.requireNonNull(componentName, "Component name must not be null.");

        mComponentName = Objects.requireNonNull(componentName, "Component name must not be null.");

        mUniqueId = componentName.flattenToShortString();

        mUniqueId = componentName.flattenToShortString();

        mIsSystemRouteProvider = isSystemRouteProvider;

    }

    }





    public void setCallback(Callback callback) {

    public void setCallback(Callback callback) {

services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider { 
            @NonNull ComponentName componentName,

            @NonNull ComponentName componentName,

            boolean isSelfScanOnlyProvider,

            boolean isSelfScanOnlyProvider,

            int userId) {

            int userId) {

        super(componentName);

        super(componentName, /* isSystemRouteProvider= */ false);

        mContext = Objects.requireNonNull(context, "Context must not be null.");

        mContext = Objects.requireNonNull(context, "Context must not be null.");

        mRequestIdToSessionCreationRequest = new LongSparseArray<>();

        mRequestIdToSessionCreationRequest = new LongSparseArray<>();

        mSessionOriginalIdToTransferRequest = new HashMap<>();

        mSessionOriginalIdToTransferRequest = new HashMap<>();

services/core/java/com/android/server/media/SystemMediaRoute2Provider.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -90,8 +90,7 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
    private volatile SessionCreationOrTransferRequest mPendingTransferRequest;

    private volatile SessionCreationOrTransferRequest mPendingTransferRequest;





    SystemMediaRoute2Provider(Context context, UserHandle user, Looper looper) {

    SystemMediaRoute2Provider(Context context, UserHandle user, Looper looper) {

        super(COMPONENT_NAME);

        super(COMPONENT_NAME, /* isSystemRouteProvider= */ true);

        mIsSystemRouteProvider = true;

        mContext = context;

        mContext = context;

        mUser = user;

        mUser = user;

        mHandler = new Handler(looper);

        mHandler = new Handler(looper);