commit 76c4de9b321615a804bf3601fd9efdb57070d831
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 08 18:33:46 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 08 18:33:46 2020 +0000
tree f3d681c06419a46857b2741ef58afe317a3a6da1
parent f2c65caa4cce8d2a2ca92433c703805fcda6bdab
parent ad90366eef2f08a3899c13eb1557cc60c18077d9

Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429 am: ad90366eef

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286

Change-Id: I68fc9122aa6ae1f98f57ef41503aee9be46d2269

src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java

diff --git a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
index 46b4c86..f98d795 100644
--- a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
+++ b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
@@ -120,9 +120,13 @@
 
         // Workaround of unpinning slice in the same SerialExecutor of AsyncTask as SliceCallback's
         // observer.
-        ThreadUtils.postOnMainThread(() ->
-                AsyncTask.execute(() -> manager.unregisterSliceCallback(uri, callback))
-        );
+        ThreadUtils.postOnMainThread(() -> AsyncTask.execute(() -> {
+            try {
+                manager.unregisterSliceCallback(uri, callback);
+            } catch (SecurityException e) {
+                Log.d(TAG, "No permission currently: " + e);
+            }
+        }));
 
         return slice;
     }