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

Commit dbf61511 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypicker-L70100000956505250:N87500001297085156" into tm-qpr-dev 

* changes:
  Add mediaroutertest to frameworks/base/media/TEST_MAPPING
  Rethrow MediaRouter2Manager RemoteExceptions
  Guard MediaDeviceManager.Entry against successive stop calls
parents 295626d0 00770011

media/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "mediaroutertest"

    },

    {

      "name": "CtsCameraTestCases",

      "options" : [

media/java/android/media/MediaRouter2Manager.java

+12 −14
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public final class MediaRouter2Manager { 
            try {

                mMediaRouterService.startScan(client);

            } catch (RemoteException ex) {

                Log.e(TAG, "Unable to get sessions. Service probably died.", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

    }
@@ -196,7 +196,7 @@ public final class MediaRouter2Manager { 
            try {

                mMediaRouterService.stopScan(client);

            } catch (RemoteException ex) {

                Log.e(TAG, "Unable to get sessions. Service probably died.", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

    }
@@ -361,9 +361,8 @@ public final class MediaRouter2Manager { 
            return mMediaRouterService.getSystemSessionInfoForPackage(

                    getOrCreateClient(), packageName);

        } catch (RemoteException ex) {

            Log.e(TAG, "Unable to get current system session info", ex);

            throw ex.rethrowFromSystemServer();

        }

        return null;

    }



    /**
@@ -429,7 +428,7 @@ public final class MediaRouter2Manager { 
            try {

                return mMediaRouterService.getRemoteSessions(client);

            } catch (RemoteException ex) {

                Log.e(TAG, "Unable to get sessions. Service probably died.", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

        return Collections.emptyList();
@@ -521,7 +520,7 @@ public final class MediaRouter2Manager { 
                int requestId = mNextRequestId.getAndIncrement();

                mMediaRouterService.setRouteVolumeWithManager(client, requestId, route, volume);

            } catch (RemoteException ex) {

                Log.e(TAG, "Unable to set route volume.", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

    }
@@ -551,7 +550,7 @@ public final class MediaRouter2Manager { 
                mMediaRouterService.setSessionVolumeWithManager(

                        client, requestId, sessionInfo.getId(), volume);

            } catch (RemoteException ex) {

                Log.e(TAG, "Unable to set session volume.", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

    }
@@ -816,7 +815,7 @@ public final class MediaRouter2Manager { 
                mMediaRouterService.selectRouteWithManager(

                        client, requestId, sessionInfo.getId(), route);

            } catch (RemoteException ex) {

                Log.e(TAG, "selectRoute: Failed to send a request.", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

    }
@@ -858,7 +857,7 @@ public final class MediaRouter2Manager { 
                mMediaRouterService.deselectRouteWithManager(

                        client, requestId, sessionInfo.getId(), route);

            } catch (RemoteException ex) {

                Log.e(TAG, "deselectRoute: Failed to send a request.", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

    }
@@ -883,7 +882,7 @@ public final class MediaRouter2Manager { 
                mMediaRouterService.releaseSessionWithManager(

                        client, requestId, sessionInfo.getId());

            } catch (RemoteException ex) {

                Log.e(TAG, "releaseSession: Failed to send a request", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

    }
@@ -903,7 +902,7 @@ public final class MediaRouter2Manager { 
                mMediaRouterService.transferToRouteWithManager(

                        client, requestId, session.getId(), route);

            } catch (RemoteException ex) {

                Log.e(TAG, "transferToRoute: Failed to send a request.", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

    }
@@ -923,7 +922,7 @@ public final class MediaRouter2Manager { 
                mMediaRouterService.requestCreateSessionWithManager(

                        client, requestId, oldSession, route);

            } catch (RemoteException ex) {

                Log.e(TAG, "requestCreateSession: Failed to send a request", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

    }
@@ -979,10 +978,9 @@ public final class MediaRouter2Manager { 
                mClient = client;

                return client;

            } catch (RemoteException ex) {

                Log.e(TAG, "Unable to register media router manager.", ex);

                throw ex.rethrowFromSystemServer();

            }

        }

        return null;

    }



    /**

media/tests/MediaRouter/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ android_test { 
        "testng",

        "truth-prebuilt",

    ],



    test_suites: ["general-tests"],

    platform_apis: true,

    certificate: "platform",

}

packages/SystemUI/src/com/android/systemui/media/MediaDeviceManager.kt

+18 −14
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ class MediaDeviceManager @Inject constructor( 


        @AnyThread

        fun start() = bgExecutor.execute {

            if (!started) {

                localMediaManager.registerCallback(this)

                localMediaManager.startScan()

                muteAwaitConnectionManager?.startListening()
@@ -197,9 +198,11 @@ class MediaDeviceManager @Inject constructor( 
                started = true

                configurationController.addCallback(configListener)

            }

        }



        @AnyThread

        fun stop() = bgExecutor.execute {

            if (started) {

                started = false

                controller?.unregisterCallback(this)

                localMediaManager.stopScan()
@@ -207,6 +210,7 @@ class MediaDeviceManager @Inject constructor( 
                muteAwaitConnectionManager?.stopListening()

                configurationController.removeCallback(configListener)

            }

        }



        fun dump(pw: PrintWriter) {

            val routingSession = controller?.let {