Commit 5a177cf2 authored by Ovidio Henriquez's avatar Ovidio Henriquez Committed by Commit Bot

Fix SingleCategoryPreference crash for chosen objs

This change fixes a crash that occurs when trying to view the USB
preferences when a device has been granted permission to a site. The
crash is caused because addChosenObjects() does not check if |mSearch|
is null first before checking if the String is empty.

Bug: 923593
Change-Id: I772e4357361653e7b5e0ce41691e7832d525a68a
Reviewed-on: https://chromium-review.googlesource.com/c/1427740Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Ovidio de Jesús Ruiz-Henríquez <odejesush@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626185}
parent b361d98c
...@@ -706,7 +706,8 @@ public class SingleCategoryPreferences extends PreferenceFragment ...@@ -706,7 +706,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
// that have permission to access each. // that have permission to access each.
for (Website site : sites) { for (Website site : sites) {
for (ChosenObjectInfo info : site.getChosenObjectInfo()) { for (ChosenObjectInfo info : site.getChosenObjectInfo()) {
if (mSearch.isEmpty() || info.getName().toLowerCase().contains(mSearch)) { if (mSearch == null || mSearch.isEmpty()
|| info.getName().toLowerCase().contains(mSearch)) {
Pair<ArrayList<ChosenObjectInfo>, ArrayList<Website>> entry = Pair<ArrayList<ChosenObjectInfo>, ArrayList<Website>> entry =
objects.get(info.getObject()); objects.get(info.getObject());
if (entry == null) { if (entry == null) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment