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

Commit 38855a98 authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Make isSystemProvider field final 

Right now it's virtually final, but not quite. This change fixes that.

Bug: b/205124386
Test: presubmit
Flag: EXEMPT refactor
Change-Id: I70ed35ac45dbf22f01cb531bcb55fcc98d88c961
parent f7ff135d

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

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



    Callback mCallback;

    boolean mIsSystemRouteProvider;

    public final boolean mIsSystemRouteProvider;

    private volatile MediaRoute2ProviderInfo mProviderInfo;



    @GuardedBy("mLock")

    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.");

        mUniqueId = componentName.flattenToShortString();

        mIsSystemRouteProvider = isSystemRouteProvider;

    }



    public void setCallback(Callback callback) {

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

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

            boolean isSelfScanOnlyProvider,

            int userId) {

        super(componentName);

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

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

        mRequestIdToSessionCreationRequest = new LongSparseArray<>();

        mSessionOriginalIdToTransferRequest = new HashMap<>();

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

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



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

        super(COMPONENT_NAME);

        mIsSystemRouteProvider = true;

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

        mContext = context;

        mUser = user;

        mHandler = new Handler(looper);