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

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

Merge "Prevent autobinding ProviderWatcher abuses" into main

parents 531c9d5a f8441fc6

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

+3 −1
Original line number Diff line number Diff line
@@ -200,8 +200,10 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider 
                Slog.d(TAG, this + ": Starting");

            }

            mRunning = true;

            if (!Flags.enablePreventionOfKeepAliveRouteProviders()) {

                updateBinding();

            }

        }

        if (rebindIfDisconnected && mActiveConnection == null && shouldBind()) {

            unbind();

            bind();

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

+3 −1
Original line number Diff line number Diff line
@@ -150,7 +150,9 @@ final class MediaRoute2ProviderWatcher { 
                    mCallback.onAddProviderService(proxy);

                } else if (sourceIndex >= targetIndex) {

                    MediaRoute2ProviderServiceProxy proxy = mProxies.get(sourceIndex);

                    proxy.start(/* rebindIfDisconnected= */ true); // restart the proxy if needed

                    proxy.start(

                            /* rebindIfDisconnected= */

                                    !Flags.enablePreventionOfKeepAliveRouteProviders());

                    Collections.swap(mProxies, sourceIndex, targetIndex++);

                }

            }