commit 1ad7c5753de76e1cfaf78289e4f2b05e12c77855
author Axesh  R. Ajmera <aajmera@codeaurora.org> Mon Jul 13 17:10:56 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:46 2015 +0200
tree c9c9a6cd9c1a9b730b629aba9d1644d0eef83853
parent 07b2fd9ac55a9f2096423320f5c0e7fdb9b562d8

Multiple fixes for permissions of site specific setting

- web refiner permission for site specific setting
- fix NPE when fetching origins
- fix clearing of storage data

Change-Id: I366b7292338ee417dda8b5fb6a9548dc9108ef5a

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 60f13d5..9de584d 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -155,6 +155,9 @@
                         for (String origin : origins) {
                             PermissionsServiceFactory.PermissionsService.OriginInfo
                                     info = value.getOriginInfo(origin);
+                            if (info == null) {
+                                continue;
+                            }
                             int perm = info.getPermission(
                                     PermissionsServiceFactory.PermissionType.WEBREFINER);
                             if (perm == PermissionsServiceFactory.Permission.ALLOW) {