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

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

Merge "Stop preventing scans when the screen is off" into main

parents 22cbb06a e3f7af39

media/java/android/media/flags/media_better_together.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -20,3 +20,10 @@ flag { 
     description: "Use Audio Policies implementation for device and Bluetooth route controllers."

     bug: "280576228"

}



flag {

    namespace: "media_solutions"

     name: "disable_screen_off_broadcast_receiver"

     description: "Disables the broadcast receiver that prevents scanning when the screen is off."

     bug: "304234628"

}

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

+9 −5
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.util.SparseArray; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.media.flags.Flags;

import com.android.server.LocalServices;

import com.android.server.pm.UserManagerInternal;
@@ -161,11 +162,13 @@ class MediaRouter2ServiceImpl { 
        mPowerManager = mContext.getSystemService(PowerManager.class);

        mUserManagerInternal = LocalServices.getService(UserManagerInternal.class);



        if (!Flags.disableScreenOffBroadcastReceiver()) {

            IntentFilter screenOnOffIntentFilter = new IntentFilter();

            screenOnOffIntentFilter.addAction(ACTION_SCREEN_ON);

            screenOnOffIntentFilter.addAction(ACTION_SCREEN_OFF);



            mContext.registerReceiver(mScreenOnOffReceiver, screenOnOffIntentFilter);

        }



        mContext.getPackageManager().addOnPermissionsChangeListener(this::onPermissionsChanged);



        MediaFeatureFlagManager.getInstance()
@@ -2779,7 +2782,8 @@ class MediaRouter2ServiceImpl { 
            List<ManagerRecord> managerRecords = getManagerRecords();



            boolean isManagerScanning = false;

            if (service.mPowerManager.isInteractive()) {

            if (Flags.disableScreenOffBroadcastReceiver()

                    || service.mPowerManager.isInteractive()) {

                isManagerScanning = managerRecords.stream().anyMatch(manager ->

                        manager.mIsScanning && service.mActivityManager

                                .getPackageImportance(manager.mOwnerPackageName)