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

Commit 005e2bb7 authored by Jaewan Kim's avatar Jaewan Kim
Browse files

MediaSession2: Clean up TODOs under frameworks/base/services 

This CL includes following changes
  - Remove outdated TODOs
  - Added buganizer issue if the remaining work takes more than 5m

Test: Run MediaComponents tests
Change-Id: I0bda68dba58a71824107b58527f71cc1f8d1f949
parent 7a0cefa5

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

+15 −23
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ public class MediaSessionService extends SystemService implements Monitor { 
    private IRemoteVolumeController mRvc;



    // MediaSession2 support

    // TODO(jaewan): Support multi-user and managed profile.

    // TODO(jaewan): Make it priority list for handling volume/media key.

    // TODO(jaewan): Support multi-user and managed profile. (b/73597722)

    // TODO(jaewan): Make it priority list for handling volume/media key. (b/73760382)

    private final Map<SessionToken2, MediaController2> mSessionRecords = new ArrayMap<>();



    private final List<SessionTokensListenerRecord> mSessionTokensListeners = new ArrayList<>();
@@ -184,7 +184,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
        updateUser();



        registerPackageBroadcastReceivers();

        // TODO(jaewan): Query per users

        // TODO(jaewan): Query per users (b/73597722)

        buildMediaSessionService2List();

    }
@@ -443,6 +443,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
        // TODO(jaewan): Only consider changed packages when building session service list

        //               when we make this multi-user aware. At that time,

        //               use PackageMonitor.getChangingUserId() to know which user has changed.

        //               (b/73597722)

        IntentFilter filter = new IntentFilter();

        filter.addDataScheme("package");

        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
@@ -465,7 +466,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
                }

                // Check if the package is replacing (i.e. reinstalling)

                final boolean isReplacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);

                // TODO(jaewan): Add multi-user support with this.

                // TODO(jaewan): Add multi-user support with this. (b/73597722)

                // final int uid = intent.getIntExtra(Intent.EXTRA_UID, 0);



                if (DEBUG) {
@@ -506,8 +507,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
        if (DEBUG) {

            Log.d(TAG, "buildMediaSessionService2List");

        }

        // TODO(jaewan): Also query for managed profile users.

        // TODO(jaewan): Similar codes are also at the updatable. Can't we share codes?

        // TODO(jaewan): Also query for managed profile users. (b/73597722)

        PackageManager manager = getContext().getPackageManager();

        List<ResolveInfo> services = new ArrayList<>();

        // If multiple actions are declared for a service, browser gets higher priority.
@@ -539,7 +539,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
                ServiceInfo serviceInfo = services.get(i).serviceInfo;

                int uid;

                try {

                    // TODO(jaewan): Do this per user.

                    // TODO(jaewan): Do this per user. (b/73597722)

                    uid = manager.getPackageUid(serviceInfo.packageName,

                            PackageManager.GET_META_DATA);

                } catch (NameNotFoundException e) {
@@ -1490,16 +1490,6 @@ public class MediaSessionService extends SystemService implements Monitor { 
                    mUserRecords.valueAt(i).dumpLocked(pw, "");

                }

                mAudioPlayerStateMonitor.dump(getContext(), pw, "");



                // TODO(jaewan): Remove this debug command before ship.

                if (args != null && args.length > 0 && "--purge".equals(args[0])) {

                    mSessionRecords.clear();

                }

                pw.println();

                pw.println("Session2: size=" + mSessionRecords.size());

                for (SessionToken2 token : mSessionRecords.keySet()) {

                    pw.println("  " + token);

                }

            }

        }
@@ -1567,7 +1557,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
            destroySession2Internal(token);

        }



        // TODO(jaewan): Protect this API with permission

        // TODO(jaewan): Protect this API with permission (b/73226436)

        @Override

        public List<Bundle> getSessionTokens(boolean activeSessionOnly,

                boolean sessionServiceOnly) throws RemoteException {
@@ -1587,8 +1577,8 @@ public class MediaSessionService extends SystemService implements Monitor { 
            return tokens;

        }



        // TODO(jaewan): Protect this API with permission

        // TODO(jaewan): "userId != calling user" needs extra protection

        // TODO(jaewan): Protect this API with permission (b/73226436)

        // TODO(jaewan): "userId != calling user" needs extra protection (b/73226436)

        @Override

        public void addSessionTokensListener(ISessionTokensListener listener, int userId,

                String packageName) {
@@ -1603,7 +1593,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
            }

        }



        // TODO(jaewan): Protect this API with permission

        // TODO(jaewan): Protect this API with permission (b/73226436)

        @Override

        public void removeSessionTokensListener(ISessionTokensListener listener) {

            synchronized (mLock) {
@@ -2039,7 +2029,8 @@ public class MediaSessionService extends SystemService implements Monitor { 


        public SessionTokensListenerRecord(ISessionTokensListener listener, int userId) {

            mListener = listener;

            mUserId = userId; // TODO should userId be mapped through mFullUserIds?

            // TODO should userId be mapped through mFullUserIds? (b/73597722)

            mUserId = userId;

        }



        @Override
@@ -2060,6 +2051,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
            for (SessionToken2 token : mSessionRecords.keySet()) {

                // TODO(jaewan): Remove the check for UserHandle.USER_ALL (shouldn't happen).

                //               This happens when called form buildMediaSessionService2List(...).

                //               (b/73760382)

                if (UserHandle.getUserId(token.getUid()) == userId

                        || UserHandle.USER_ALL == userId) {

                    tokens.add(token.toBundle());
@@ -2067,7 +2059,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
            }



            for (SessionTokensListenerRecord record : mSessionTokensListeners) {

                // TODO should userId be mapped through mFullUserIds?

                // TODO(jaewan): Should userId be mapped through mFullUserIds? (b/73760382)

                if (record.mUserId == userId || record.mUserId == UserHandle.USER_ALL) {

                    try {

                        record.mListener.onSessionTokensChanged(tokens);