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

Commit 17bae296 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SystemMediaRoute2Provider: Set callback after instantiation is done"... 

Merge "SystemMediaRoute2Provider: Set callback after instantiation is done" into rvc-dev am: 28932f9e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882912

Change-Id: Iee26476a29ea603d464fd7c9a86a6d099228eab1
parents 448ba813 28932f9e

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

+11 −1
Original line number Diff line number Diff line
@@ -985,6 +985,7 @@ class MediaRouter2ServiceImpl { 
        if (userRecord == null) {

            userRecord = new UserRecord(userId);

            mUserRecords.put(userId, userRecord);

            userRecord.init();

            if (userId == mCurrentUserId) {

                userRecord.mHandler.sendMessage(

                        obtainMessage(UserHandler::start, userRecord.mHandler));
@@ -1034,6 +1035,10 @@ class MediaRouter2ServiceImpl { 
            mHandler = new UserHandler(MediaRouter2ServiceImpl.this, this);

        }



        void init() {

            mHandler.init();

        }



        // TODO: This assumes that only one router exists in a package.

        //       Do this in Android S or later.

        RouterRecord findRouterRecordLocked(String packageName) {
@@ -1141,16 +1146,21 @@ class MediaRouter2ServiceImpl { 


        private boolean mRunning;



        // TODO: (In Android S+) Pull out SystemMediaRoute2Provider out of UserHandler.

        UserHandler(@NonNull MediaRouter2ServiceImpl service, @NonNull UserRecord userRecord) {

            super(Looper.getMainLooper(), null, true);

            mServiceRef = new WeakReference<>(service);

            mUserRecord = userRecord;

            mSystemProvider = new SystemMediaRoute2Provider(service.mContext, this);

            mSystemProvider = new SystemMediaRoute2Provider(service.mContext);

            mRouteProviders.add(mSystemProvider);

            mWatcher = new MediaRoute2ProviderWatcher(service.mContext, this,

                    this, mUserRecord.mUserId);

        }



        void init() {

            mSystemProvider.setCallback(this);

        }



        private void start() {

            if (!mRunning) {

                mRunning = true;

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

+12 −3
Original line number Diff line number Diff line
@@ -98,12 +98,10 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
        }

    };



    SystemMediaRoute2Provider(Context context, Callback callback) {

    SystemMediaRoute2Provider(Context context) {

        super(sComponentName);

        setCallback(callback);



        mIsSystemRouteProvider = true;



        mContext = context;

        mHandler = new Handler(Looper.getMainLooper());
@@ -142,6 +140,13 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
        updateVolume();

    }



    @Override

    public void setCallback(Callback callback) {

        super.setCallback(callback);

        notifyProviderState();

        notifySessionInfoUpdated();

    }



    @Override

    public void requestCreateSession(long requestId, String packageName, String routeId,

            Bundle sessionHints) {
@@ -354,6 +359,10 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
    }



    void notifySessionInfoUpdated() {

        if (mCallback == null) {

            return;

        }



        RoutingSessionInfo sessionInfo;

        synchronized (mLock) {

            sessionInfo = mSessionInfos.get(0);