commit ac4eafc9cf6afeacb04596bd5fe0cdfc0b74cfe1
author Jeff Sharkey <jsharkey@google.com> Mon Mar 04 17:33:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 04 17:33:32 2019 +0000
tree 8bd3fde0bfce06be5ee6928ff222410fd4d15931
parent 2a980300bc8612d3f688cbb53d98284673b6e665
parent e40033eb24e859d7af3157cc4f3b1540386e4bfb

Merge "Mark @Nullable annotation to String parameter"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index d104808..e8eca21 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9363,7 +9363,7 @@
     method public static void logFileOperationFailure(int, int);
     method public static void logFilePick(int, long, int, boolean, int, int, int);
     method public static void logInvalidScopedAccessRequest(int);
-    method public static void logPickerLaunchedFrom(String);
+    method public static void logPickerLaunchedFrom(@Nullable String);
     method public static void logRootVisited(int, int);
     method public static void logSearchMode(int);
     method public static void logSearchType(int);

core/java/android/util/DocumentsStatsLog.java

diff --git a/core/java/android/util/DocumentsStatsLog.java b/core/java/android/util/DocumentsStatsLog.java
index f483944..a67bbde 100644
--- a/core/java/android/util/DocumentsStatsLog.java
+++ b/core/java/android/util/DocumentsStatsLog.java
@@ -16,6 +16,7 @@
 
 package android.util;
 
+import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.provider.DocumentsContract;
 import android.provider.DocumentsProvider;
@@ -126,7 +127,7 @@
      *
      * @param packageName
      */
-    public static void logPickerLaunchedFrom(String packageName) {
+    public static void logPickerLaunchedFrom(@Nullable String packageName) {
         StatsLog.write(StatsLog.DOCS_UI_PICKER_LAUNCHED_FROM_REPORTED, packageName);
     }