diff options
author | Jason Monk <jmonk@google.com> | 2015-03-18 15:14:02 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-18 15:14:02 +0000 |
commit | 5774e865d23435ef798d959f68264975626c491f (patch) | |
tree | 2a286fa22172cbe61a318d0ffd9f97cdb7e139dd /src/com/android | |
parent | 6e311dfaebc0d85c39c46f8da7905d00602ef906 (diff) | |
parent | 337996a485bb8d3f3c59d7bec0f666387b76a359 (diff) | |
download | packages_apps_Settings-5774e865d23435ef798d959f68264975626c491f.tar.gz packages_apps_Settings-5774e865d23435ef798d959f68264975626c491f.tar.bz2 packages_apps_Settings-5774e865d23435ef798d959f68264975626c491f.zip |
Merge "Fix crash in app info"
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/settings/applications/AppLaunchSettings.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index 24a6fe04f..c31d8ad00 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -42,7 +42,6 @@ import com.android.settings.Utils; import com.android.settings.applications.ApplicationsState.AppEntry; import java.util.ArrayList; -import java.util.Collections; import java.util.List; public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListener { @@ -168,9 +167,9 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe private static boolean hasPreferredActivities(PackageManager pm, String packageName) { // Get list of preferred activities - List<ComponentName> prefActList = Collections.emptyList(); + List<ComponentName> prefActList = new ArrayList<>(); // Intent list cannot be null. so pass empty list - List<IntentFilter> intentList = Collections.emptyList(); + List<IntentFilter> intentList = new ArrayList<>(); pm.getPreferredActivities(intentList, prefActList, packageName); if (localLOGV) { Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list"); |