From 4fe2517732bc39ed736b2451fc3399c010ff9380 Mon Sep 17 00:00:00 2001
From: Ian Pedowitz <ijpedowitz@google.com>
Date: Mon, 21 Nov 2016 15:09:54 +0000
Subject: [PATCH] Revert "Lists returned from OS aren't mutable."

This reverts commit 97449fa389dbc1ab872d63fde001bae7a659991b.

Bug: 33034458
Bug: 33032977
Bug: 27856974
Change-Id: If913e587ce4a48b9ed1c7c0a811bc39ce4e31d3c
---
 core/java/android/content/pm/ParceledListSlice.java      | 9 +--------
 .../systemui/recents/model/RecentsTaskLoadPlan.java      | 4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/core/java/android/content/pm/ParceledListSlice.java b/core/java/android/content/pm/ParceledListSlice.java
index 29ea5a07ee9b9..945858e6d3c65 100644
--- a/core/java/android/content/pm/ParceledListSlice.java
+++ b/core/java/android/content/pm/ParceledListSlice.java
@@ -17,15 +17,12 @@
 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;
@@ -130,11 +127,7 @@ public class ParceledListSlice<T extends Parcelable> implements Parcelable {
     }
 
     public List<T> getList() {
-        if (VMRuntime.getRuntime().getTargetSdkVersion() > Build.VERSION_CODES.N_MR1) {
-            return Collections.unmodifiableList(mList);
-        } else {
-            return mList;
-        }
+        return mList;
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java
index 5bfc17fcaaf96..9b48e4d02623c 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java
+++ b/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 = new ArrayList<>(ssp.getRecentTasks(ActivityManager.getMaxRecentTasksStatic(),
-                currentUserId, includeFrontMostExcludedTask, mCurrentQuietProfiles));
+        mRawTasks = 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);