summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ben Kwa <kenobi@google.com> 2016-02-01 23:40:16 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-02-01 23:40:16 +0000
commitf10b1c21a8670afca66f1f04a779dc9699cf6b5c (patch)
treeccb7fc97369f98c1e800cf19b5233dac70a7b3c2
parent2fbd43ea27a35afc90d194755bc4269d1daca1d8 (diff)
parenta3cdbdda9bb14ab517c8674b272641d68108bae0 (diff)
Merge "Fix a crash in Metrics code."
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/Metrics.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Metrics.java b/packages/DocumentsUI/src/com/android/documentsui/Metrics.java
index bae334b3759f..62d1c5a2de79 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/Metrics.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/Metrics.java
@@ -354,7 +354,7 @@ public final class Metrics {
* a single ROOT_OTHER bucket.
*/
private static @Root int sanitizeRoot(Uri uri) {
- if (LauncherActivity.isLaunchUri(uri)) {
+ if (uri == null || LauncherActivity.isLaunchUri(uri)) {
return ROOT_NONE;
}