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

Commit 2c131a7d authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Avoid relying on lambda identity equality 

This change is a partial revert of ag/11010681.

There's no guarantee that this::aMethod resolves to a stable reference.

Bug: b/349931610
Test: mp droid
Flag: EXEMPT bugfix
Change-Id: I81fa17da42ac1522613c93ae4f6d692af3af2dc9
parent 0c1aab59

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

+4 −3
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ final class MediaRoute2ProviderWatcher { 
    private final PackageManager mPackageManager;



    private final ArrayList<MediaRoute2ProviderServiceProxy> mProxies = new ArrayList<>();

    private final Runnable mScanPackagesRunnable = this::scanPackages;

    private boolean mRunning;



    MediaRoute2ProviderWatcher(Context context,
@@ -106,7 +107,7 @@ final class MediaRoute2ProviderWatcher { 
            mRunning = false;



            mContext.unregisterReceiver(mScanPackagesReceiver);

            mHandler.removeCallbacks(this::scanPackages);

            mHandler.removeCallbacks(mScanPackagesRunnable);



            // Stop all providers.

            for (int i = mProxies.size() - 1; i >= 0; i--) {
@@ -189,8 +190,8 @@ final class MediaRoute2ProviderWatcher { 
    }



    private void postScanPackagesIfNeeded() {

        if (!mHandler.hasCallbacks(this::scanPackages)) {

            mHandler.post(this::scanPackages);

        if (!mHandler.hasCallbacks(mScanPackagesRunnable)) {

            mHandler.post(mScanPackagesRunnable);

        }

    }