From 46e7560bca117bc850ce7af8e85cfbf5f95372e3 Mon Sep 17 00:00:00 2001
From: Takamasa Kuramitsu <takamasa.kuramitsu@sony.com>
Date: Fri, 6 Apr 2018 13:47:34 +0900
Subject: Exclude non-permission entries from getAllPermissions()

ScopedAccessLocalPreferences#getAllPermissions() could return null
entries if there's rootViewMode entry in the preference file -
com.android.documentsui_preferences.xml.

This CL excludes the non-permission entries from the result of
getAllPermissions().

Test: Manual
Bug: 77658075
Change-Id: Ife059da4956f76bd1af28b8dff9630470c3ba353
(cherry picked from commit a30ab91bd2f8a2ec121deb62b5ac18d810371a6c)
---
 src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java b/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
index 2efcf1e83..5da0e494d 100644
--- a/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
+++ b/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
@@ -173,7 +173,10 @@ public class ScopedAccessLocalPreferences {
                 Log.w(TAG, "error gettting value for key '" + key + "': " + value);
                 continue;
             }
-            permissions.add(getPermission(key, status));
+            final Permission permission = getPermission(key, status);
+            if (permission != null) {
+                permissions.add(permission);
+            }
         }
 
         return permissions;
-- 
cgit v1.2.3-59-g8ed1b