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

Commit 0581c5f0 authored by Shenqiu Zhang's avatar Shenqiu Zhang Committed by Android (Google) Code Review
Browse files

Merge "Remove redundant flag annotations" into main

parents f4b81220 54227f6f

media/java/android/media/MediaRoute2Info.java

+1 −2
Original line number Diff line number Diff line
@@ -961,8 +961,7 @@ public final class MediaRoute2Info implements Parcelable { 
     *

     * @hide

     */

    @FlaggedApi(FLAG_ENABLE_MEDIA_ROUTE_2_INFO_PROVIDER_PACKAGE_NAME)

    public boolean isVisibleTo(String packageName) {

    public boolean isVisibleTo(@NonNull String packageName) {

        return !mIsVisibilityRestricted

                || TextUtils.equals(getProviderPackageName(), packageName)

                || mAllowedPackages.contains(packageName);

media/java/android/media/MediaRouter2.java

+0 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.media; 
import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;

import static com.android.media.flags.Flags.FLAG_ENABLE_BUILT_IN_SPEAKER_ROUTE_SUITABILITY_STATUSES;

import static com.android.media.flags.Flags.FLAG_ENABLE_GET_TRANSFERABLE_ROUTES;

import static com.android.media.flags.Flags.FLAG_ENABLE_MEDIA_ROUTE_2_INFO_PROVIDER_PACKAGE_NAME;

import static com.android.media.flags.Flags.FLAG_ENABLE_PRIVILEGED_ROUTING_FOR_MEDIA_ROUTING_CONTROL;

import static com.android.media.flags.Flags.FLAG_ENABLE_RLP_CALLBACKS_IN_MEDIA_ROUTER2;

import static com.android.media.flags.Flags.FLAG_ENABLE_SCREEN_OFF_SCANNING;
@@ -1406,7 +1405,6 @@ public final class MediaRouter2 { 
        requestCreateController(controller, route, managerRequestId);

    }



    @FlaggedApi(FLAG_ENABLE_MEDIA_ROUTE_2_INFO_PROVIDER_PACKAGE_NAME)

    private List<MediaRoute2Info> getSortedRoutes(

            List<MediaRoute2Info> routes, List<String> packageOrder) {

        if (packageOrder.isEmpty()) {
@@ -1427,7 +1425,6 @@ public final class MediaRouter2 { 
    }



    @GuardedBy("mLock")

    @FlaggedApi(FLAG_ENABLE_MEDIA_ROUTE_2_INFO_PROVIDER_PACKAGE_NAME)

    private List<MediaRoute2Info> filterRoutesWithCompositePreferenceLocked(

            List<MediaRoute2Info> routes) {
@@ -3654,7 +3651,6 @@ public final class MediaRouter2 { 
            }

        }



        @FlaggedApi(FLAG_ENABLE_MEDIA_ROUTE_2_INFO_PROVIDER_PACKAGE_NAME)

        @Override

        public List<MediaRoute2Info> filterRoutesWithIndividualPreference(

                List<MediaRoute2Info> routes, RouteDiscoveryPreference discoveryPreference) {

media/java/android/media/MediaRouter2Manager.java

+0 −4
Original line number Diff line number Diff line
@@ -20,11 +20,9 @@ import static android.media.MediaRouter2.SCANNING_STATE_NOT_SCANNING; 
import static android.media.MediaRouter2.SCANNING_STATE_WHILE_INTERACTIVE;



import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;

import static com.android.media.flags.Flags.FLAG_ENABLE_MEDIA_ROUTE_2_INFO_PROVIDER_PACKAGE_NAME;



import android.Manifest;

import android.annotation.CallbackExecutor;

import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;
@@ -287,7 +285,6 @@ public final class MediaRouter2Manager { 
                (route) -> sessionInfo.isSystemSession() ^ route.isSystemRoute());

    }



    @FlaggedApi(FLAG_ENABLE_MEDIA_ROUTE_2_INFO_PROVIDER_PACKAGE_NAME)

    private List<MediaRoute2Info> getSortedRoutes(RouteDiscoveryPreference preference) {

        if (!preference.shouldRemoveDuplicates()) {

            synchronized (mRoutesLock) {
@@ -311,7 +308,6 @@ public final class MediaRouter2Manager { 
        return routes;

    }



    @FlaggedApi(FLAG_ENABLE_MEDIA_ROUTE_2_INFO_PROVIDER_PACKAGE_NAME)

    private List<MediaRoute2Info> getFilteredRoutes(

            @NonNull RoutingSessionInfo sessionInfo,

            boolean includeSelectedRoutes,