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

Commit b6b1389d authored by Jin Seok Park's avatar Jin Seok Park Committed by Android (Google) Code Review
Browse files

Merge "Remove IntArray usage"

parents bb91011e 50544552

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

+4 −4
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ import android.os.Message; 
import android.os.UserHandle;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.IntArray;

import android.util.Log;



import com.android.internal.annotations.GuardedBy;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.Map;

import java.util.Set;
@@ -104,7 +104,7 @@ class AudioPlayerStateMonitor { 
    // TODO(b/35278867): Find and use unique identifier for apps because apps may share the UID.

    @GuardedBy("mLock")

    @SuppressWarnings("WeakerAccess") /* synthetic access */

    final IntArray mSortedAudioPlaybackClientUids = new IntArray();

    final List<Integer> mSortedAudioPlaybackClientUids = new ArrayList<>();



    static AudioPlayerStateMonitor getInstance(Context context) {

        synchronized (AudioPlayerStateMonitor.class) {
@@ -145,8 +145,8 @@ class AudioPlayerStateMonitor { 
     * audio/video) The UID whose audio is currently playing comes first, then the UID whose audio

     * playback becomes active at the last comes next.

     */

    public IntArray getSortedAudioPlaybackClientUids() {

        IntArray sortedAudioPlaybackClientUids = new IntArray();

    public List<Integer> getSortedAudioPlaybackClientUids() {

        List<Integer> sortedAudioPlaybackClientUids = new ArrayList();

        synchronized (mLock) {

            sortedAudioPlaybackClientUids.addAll(mSortedAudioPlaybackClientUids);

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.media.Session2Token; 
import android.media.session.MediaSession;

import android.os.Debug;

import android.os.UserHandle;

import android.util.IntArray;

import android.util.Log;

import android.util.SparseArray;
@@ -190,7 +189,8 @@ class MediaSessionStack { 
        if (DEBUG) {

            Log.d(TAG, "updateMediaButtonSessionIfNeeded, callers=" + Debug.getCallers(2));

        }

        IntArray audioPlaybackUids = mAudioPlayerStateMonitor.getSortedAudioPlaybackClientUids();

        List<Integer> audioPlaybackUids =

                mAudioPlayerStateMonitor.getSortedAudioPlaybackClientUids();

        for (int i = 0; i < audioPlaybackUids.size(); i++) {

            int audioPlaybackUid = audioPlaybackUids.get(i);

            MediaSessionRecordImpl mediaButtonSession = findMediaButtonSession(audioPlaybackUid);