Merge "Lists returned from OS aren't mutable."

core/java/android/content/pm/ParceledListSlice.java

@@ -17,12 +17,15 @@
 package android.content.pm;
 
 import android.os.Binder;
+import android.os.Build;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.RemoteException;
 import android.util.Log;
 
+import dalvik.system.VMRuntime;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -127,7 +130,11 @@ public class ParceledListSlice<T extends Parcelable> implements Parcelable {
     }
 
     public List<T> getList() {
-        return mList;
+        if (VMRuntime.getRuntime().getTargetSdkVersion() > Build.VERSION_CODES.N_MR1) {
+            return Collections.unmodifiableList(mList);
+        } else {
+            return mList;
+        }
     }
 
     @Override

packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java

@@ -104,8 +104,8 @@ public class RecentsTaskLoadPlan {
         int currentUserId = UserHandle.USER_CURRENT;
         updateCurrentQuietProfilesCache(currentUserId);
         SystemServicesProxy ssp = Recents.getSystemServices();
-        mRawTasks = ssp.getRecentTasks(ActivityManager.getMaxRecentTasksStatic(),
-                currentUserId, includeFrontMostExcludedTask, mCurrentQuietProfiles);
+        mRawTasks = new ArrayList<>(ssp.getRecentTasks(ActivityManager.getMaxRecentTasksStatic(),
+                currentUserId, includeFrontMostExcludedTask, mCurrentQuietProfiles));
 
         // Since the raw tasks are given in most-recent to least-recent order, we need to reverse it
         Collections.reverse(mRawTasks);