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

Commit fe1ab19d authored by Iván Budnik's avatar Iván Budnik
Browse files

Rename mSessionInfo to mSessionInfos 

The new name reflects the field contains multiple RoutingSessionInfo
objects.

Test: Presubmit: This is a non-functional refactor.
Bug: 205124386
Change-Id: Ic156f51aa1c72ab418ba0e47d5d7e2a68aea61fe
parent 383a0536

media/java/android/media/MediaRoute2ProviderService.java

+9 −9
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public abstract class MediaRoute2ProviderService extends Service { 
    private final Deque<Long> mRequestIds = new ArrayDeque<>(MAX_REQUEST_IDS_SIZE);



    @GuardedBy("mSessionLock")

    private final ArrayMap<String, RoutingSessionInfo> mSessionInfo = new ArrayMap<>();

    private final ArrayMap<String, RoutingSessionInfo> mSessionInfos = new ArrayMap<>();



    public MediaRoute2ProviderService() {

        mHandler = new Handler(Looper.getMainLooper());
@@ -208,7 +208,7 @@ public abstract class MediaRoute2ProviderService extends Service { 
            throw new IllegalArgumentException("sessionId must not be empty");

        }

        synchronized (mSessionLock) {

            return mSessionInfo.get(sessionId);

            return mSessionInfos.get(sessionId);

        }

    }
@@ -218,7 +218,7 @@ public abstract class MediaRoute2ProviderService extends Service { 
    @NonNull

    public final List<RoutingSessionInfo> getAllSessionInfo() {

        synchronized (mSessionLock) {

            return new ArrayList<>(mSessionInfo.values());

            return new ArrayList<>(mSessionInfos.values());

        }

    }
@@ -252,11 +252,11 @@ public abstract class MediaRoute2ProviderService extends Service { 


        String sessionId = sessionInfo.getId();

        synchronized (mSessionLock) {

            if (mSessionInfo.containsKey(sessionId)) {

            if (mSessionInfos.containsKey(sessionId)) {

                Log.w(TAG, "notifySessionCreated: Ignoring duplicate session id.");

                return;

            }

            mSessionInfo.put(sessionInfo.getId(), sessionInfo);

            mSessionInfos.put(sessionInfo.getId(), sessionInfo);



            if (mRemoteCallback == null) {

                return;
@@ -282,8 +282,8 @@ public abstract class MediaRoute2ProviderService extends Service { 


        String sessionId = sessionInfo.getId();

        synchronized (mSessionLock) {

            if (mSessionInfo.containsKey(sessionId)) {

                mSessionInfo.put(sessionId, sessionInfo);

            if (mSessionInfos.containsKey(sessionId)) {

                mSessionInfos.put(sessionId, sessionInfo);

            } else {

                Log.w(TAG, "notifySessionUpdated: Ignoring unknown session info.");

                return;
@@ -308,7 +308,7 @@ public abstract class MediaRoute2ProviderService extends Service { 


        RoutingSessionInfo sessionInfo;

        synchronized (mSessionLock) {

            sessionInfo = mSessionInfo.remove(sessionId);

            sessionInfo = mSessionInfos.remove(sessionId);



            if (sessionInfo == null) {

                Log.w(TAG, "notifySessionReleased: Ignoring unknown session info.");
@@ -514,7 +514,7 @@ public abstract class MediaRoute2ProviderService extends Service { 


        List<RoutingSessionInfo> sessions;

        synchronized (mSessionLock) {

            sessions = new ArrayList<>(mSessionInfo.values());

            sessions = new ArrayList<>(mSessionInfos.values());

        }



        try {