Merge "Handle null uris in content changed events." into nyc-dev

am: 00c9815

* commit '00c9815d942265719de92a19e243c1c970929210':
  Handle null uris in content changed events.

Change-Id: I2945895f58795dce9a439e58844b1406dec7abf1
This commit is contained in:
Steve McKay
2016-04-19 17:16:20 +00:00
committed by android-build-merger

View File

@@ -110,6 +110,10 @@ public class RootsCache {
@Override @Override
public void onChange(boolean selfChange, Uri uri) { 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); if (DEBUG) Log.d(TAG, "Updating roots due to change at " + uri);
updateAuthorityAsync(uri.getAuthority()); updateAuthorityAsync(uri.getAuthority());
} }