summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Kennedy <skennedy@google.com>2015-02-19 23:19:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-19 23:19:07 +0000
commit004a46eb171bc86a3d40eb8fc6a4d9eed48027c7 (patch)
treef4e5850c2c8914faa9f4dca651ba91eb370384e2
parent83b40599bbda9f7f1f7d91f7cfdbb5c8a1872be0 (diff)
parent6cd132fef2a5d7af040707ca78560d13e0485539 (diff)
downloadframeworks_base-004a46eb171bc86a3d40eb8fc6a4d9eed48027c7.zip
frameworks_base-004a46eb171bc86a3d40eb8fc6a4d9eed48027c7.tar.gz
frameworks_base-004a46eb171bc86a3d40eb8fc6a4d9eed48027c7.tar.bz2
Merge "Annotate the parameter in TextUtils#isEmpty() as @Nullable"
-rw-r--r--core/java/android/text/TextUtils.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index 48bb5dd..1bb35f6 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -16,6 +16,7 @@
package android.text;
+import android.annotation.Nullable;
import android.content.res.Resources;
import android.os.Parcel;
import android.os.Parcelable;
@@ -457,7 +458,7 @@ public class TextUtils {
* @param str the string to be examined
* @return true if str is null or zero length
*/
- public static boolean isEmpty(CharSequence str) {
+ public static boolean isEmpty(@Nullable CharSequence str) {
if (str == null || str.length() == 0)
return true;
else