From c041f5a3b835242fee920c16b5ba6b48e72de007 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 23 Aug 2016 10:24:56 -0600 Subject: [PATCH] DO NOT MERGE. Clarify FileObserver docs for null value. Change-Id: I7dc0b0d26220d6eb82f956a9860cfb6aeccfd12f Test: none Bug: 30511606 (cherry picked from commit 902316d5533632321a945651b1d044c4e23bf742) --- core/java/android/os/FileObserver.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/java/android/os/FileObserver.java b/core/java/android/os/FileObserver.java index 4e705e04b447f..dd85e1584f0ea 100644 --- a/core/java/android/os/FileObserver.java +++ b/core/java/android/os/FileObserver.java @@ -16,6 +16,7 @@ package android.os; +import android.annotation.Nullable; import android.util.Log; import java.lang.ref.WeakReference; @@ -204,7 +205,8 @@ public abstract class FileObserver { * * @param event The type of event which happened * @param path The path, relative to the main monitored file or directory, - * of the file or directory which triggered the event + * of the file or directory which triggered the event. This value can + * be {@code null} for certain events, such as {@link #MOVE_SELF}. */ - public abstract void onEvent(int event, String path); + public abstract void onEvent(int event, @Nullable String path); }