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

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

Merge "Make UserHandler hold a UserHandle instead of a user id" into main

parents 118d5caf 3cafd329

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

+18 −14
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ class MediaRouter2ServiceImpl { 
                }

                return showOutputSwitcher(

                        proxyRouterRecord.mTargetPackageName,

                        UserHandle.of(proxyRouterRecord.mUserRecord.mUserId),

                        proxyRouterRecord.mUserRecord.mUserHandle,

                        sessionToken);

            }

        } finally {
@@ -1926,7 +1926,9 @@ class MediaRouter2ServiceImpl { 
                TAG,

                TextUtils.formatSimple(

                        "unregisterManager | %s, user: %d, died: %b",

                        managerRecord.getDebugString(), userRecord.mUserId, died));

                        managerRecord.getDebugString(),

                        userRecord.mUserHandle.getIdentifier(),

                        died));



        userRecord.mManagerRecords.remove(managerRecord);

        managerRecord.dispose();
@@ -2304,7 +2306,7 @@ class MediaRouter2ServiceImpl { 
        // and purge the user record and all of its associated state.  If the user is current

        // then leave it alone since we might be connected to a route or want to query

        // the same route information again soon.

        if (!isUserActiveLocked(userRecord.mUserId)

        if (!isUserActiveLocked(userRecord.mUserHandle.getIdentifier())

                && userRecord.mRouterRecords.isEmpty()

                && userRecord.mManagerRecords.isEmpty()) {

            if (DEBUG) {
@@ -2312,7 +2314,7 @@ class MediaRouter2ServiceImpl { 
            }

            userRecord.mHandler.sendMessage(

                    obtainMessage(UserHandler::stop, userRecord.mHandler));

            mUserRecords.remove(userRecord.mUserId);

            mUserRecords.remove(userRecord.mUserHandle.getIdentifier());

            // Note: User already stopped (by switchUser) so no need to send stop message here.

        }

    }
@@ -2355,7 +2357,7 @@ class MediaRouter2ServiceImpl { 
    }



    final class UserRecord {

        public final int mUserId;

        public final UserHandle mUserHandle;

        //TODO: make records private for thread-safety

        private final ArrayList<RouterRecord> mRouterRecords = new ArrayList<>();

        final ArrayList<ManagerRecord> mManagerRecords = new ArrayList<>();
@@ -2370,7 +2372,7 @@ class MediaRouter2ServiceImpl { 
        final UserHandler mHandler;



        UserRecord(int userId, @NonNull Looper looper) {

            mUserId = userId;

            mUserHandle = UserHandle.of(userId);

            mHandler = new UserHandler(/* userRecord= */ this, looper);

        }
@@ -2436,7 +2438,7 @@ class MediaRouter2ServiceImpl { 


            String indent = prefix + "  ";



            pw.println(indent + "mUserId=" + mUserId);

            pw.println(indent + "user id=" + mUserHandle.getIdentifier());



            pw.println(indent + "Router Records:");

            if (!mRouterRecords.isEmpty()) {
@@ -2736,7 +2738,7 @@ class MediaRouter2ServiceImpl { 
            UserHandle transferInitiatorUserHandle = sessionInfo.getTransferInitiatorUserHandle();

            String transferInitiatorPackageName = sessionInfo.getTransferInitiatorPackageName();



            if (!Objects.equals(UserHandle.of(mUserRecord.mUserId), transferInitiatorUserHandle)

            if (!Objects.equals(mUserRecord.mUserHandle, transferInitiatorUserHandle)

                    || !Objects.equals(mPackageName, transferInitiatorPackageName)) {

                return new RoutingSessionInfo.Builder(sessionInfo)

                        .setTransferInitiator(null, null)
@@ -2803,7 +2805,7 @@ class MediaRouter2ServiceImpl { 
        private String getDebugString() {

            return TextUtils.formatSimple(

                    "Router %s (id=%d,pid=%d,userId=%d,uid=%d)",

                    mPackageName, mRouterId, mPid, mUserRecord.mUserId, mUid);

                    mPackageName, mRouterId, mPid, mUserRecord.mUserHandle.getIdentifier(), mUid);

        }



        /**
@@ -3013,7 +3015,7 @@ class MediaRouter2ServiceImpl { 
                    mOwnerPackageName,

                    mManagerId,

                    mOwnerPid,

                    mUserRecord.mUserId,

                    mUserRecord.mUserHandle.getIdentifier(),

                    mOwnerUid,

                    mTargetPackageName);

        }
@@ -3080,11 +3082,13 @@ class MediaRouter2ServiceImpl { 
            mSystemProvider =

                    Flags.enableMirroringInMediaRouter2()

                            ? SystemMediaRoute2Provider2.create(

                                    mContext, UserHandle.of(userRecord.mUserId), looper)

                                    mContext, userRecord.mUserHandle, looper)

                            : SystemMediaRoute2Provider.create(

                                    mContext, UserHandle.of(userRecord.mUserId), looper);

                                    mContext, userRecord.mUserHandle, looper);

            mRouteProviders.add(getSystemProvider());

            mWatcher = new MediaRoute2ProviderWatcher(mContext, this, this, mUserRecord.mUserId);

            mWatcher =

                    new MediaRoute2ProviderWatcher(

                            mContext, this, this, mUserRecord.mUserHandle.getIdentifier());

        }



        void init() {
@@ -3461,7 +3465,7 @@ class MediaRouter2ServiceImpl { 
                    route.getOriginalId(),

                    sessionHints,

                    transferReason,

                    UserHandle.of(routerRecord.mUserRecord.mUserId),

                    routerRecord.mUserRecord.mUserHandle,

                    routerRecord.mPackageName);

        }