From 757fa1b684c0e14c122a3dc3a308bef66d5bfb63 Mon Sep 17 00:00:00 2001
From: Steve McKay <smckay@google.com>
Date: Mon, 18 Apr 2016 17:35:41 -0700
Subject: [PATCH] Handle null uris in content changed events.

Bug: 28244958
Change-Id: Id3a7adb0ab4a751cfcf6ed3fee4cc6337ce512bb
---
 packages/DocumentsUI/src/com/android/documentsui/RootsCache.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
index 594e02f0a01d..1e828572a5a5 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
@@ -110,6 +110,10 @@ public class RootsCache {
 
         @Override
         public void onChange(boolean selfChange, Uri uri) {
+            if (uri == null) {
+                Log.w(TAG, "Received onChange event for null uri. Skipping.");
+                return;
+            }
             if (DEBUG) Log.d(TAG, "Updating roots due to change at " + uri);
             updateAuthorityAsync(uri.getAuthority());
         }
-- 
2.11.0