commit 5a3ef42422ea542fce1d8d1d5b0fbf61d4a570a6
author Terry Heo <terryheo@google.com> Fri Jul 17 16:03:28 2015 +0900
committer Terry (Woncheol) Heo <terryheo@google.com> Mon Jul 20 01:29:44 2015 +0000
tree d2361d46432d106934bc7224de4264e239261e6f
parent 9349093cd984523a9d4bab397cd092b33c04f27e

TIF: Use copied track list for onTracksChanged() callback

In notifyTracksChanged(), the calling onTracksChanged() could be delayed.
To prevent race condition on tracks, we should use the copy of tracks.

Bug: 22436933
Change-Id: I0c595df9d06d5f7bda4a9f8c21a661f7aa7db71f

media/java/android/media/tv/TvInputService.java

diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index 35037bb..86e8560 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -385,13 +385,14 @@
             trackIdSet.clear();
 
             // TODO: Validate the track list.
+            final List<TvTrackInfo> tracksCopy = new ArrayList<>(tracks);
             executeOrPostRunnable(new Runnable() {
                 @Override
                 public void run() {
                     try {
                         if (DEBUG) Log.d(TAG, "notifyTracksChanged");
                         if (mSessionCallback != null) {
-                            mSessionCallback.onTracksChanged(tracks);
+                            mSessionCallback.onTracksChanged(tracksCopy);
                         }
                     } catch (RemoteException e) {
                         Log.w(TAG, "error in notifyTracksChanged", e);