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

Commit f5b66200 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6353135 from 1e8e52c4 to mainline-release

Change-Id: Ibef43ec2d98ef9ebc090274d5e45baf5c9a38310
parents adec8b8f 1e8e52c4
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -514,7 +514,10 @@ public class MediaPlayerList {
        final MediaPlayerWrapper wrapper = mMediaPlayers.get(playerId);
        d("Removing media player " + wrapper.getPackageName());
        mMediaPlayerIds.remove(wrapper.getPackageName());
        if (!mBrowsablePlayers.containsKey(playerId)) {
            d(wrapper.getPackageName() + " doesn't have a browse service. Recycle player ID.");
            mMediaPlayers.remove(playerId);
        }
        wrapper.cleanup();
    }

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.os.HandlerThread;
import android.os.IBinder;
import android.os.Looper;
import android.os.ServiceManager;
import android.telephony.PhoneStateListener;
import android.telephony.SubscriptionManager;
@@ -62,6 +63,9 @@ public class HeadsetPhoneStateTest {

    @Before
    public void setUp() throws Exception {
        if (Looper.myLooper() == null) {
            Looper.prepare();
        }
        MockitoAnnotations.initMocks(this);
        TelephonyManager.disableServiceHandleCaching();
        // Mock SubscriptionManager.getDefaultSubscriptionId() to return a valid value