summaryrefslogtreecommitdiffstats
path: root/core/java/android/text/TextUtils.java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-06-17 19:44:05 -0700
committerJeff Sharkey <jsharkey@android.com>2015-06-22 14:07:10 -0700
commit5cc0df214bbe2b169150c9060dc5288bb8aaf338 (patch)
tree52a13874fa635458d1914112cae838d75c11986f /core/java/android/text/TextUtils.java
parentb1891b3fc9d07ef766978f0a39c382b217a529e0 (diff)
downloadframeworks_base-5cc0df214bbe2b169150c9060dc5288bb8aaf338.zip
frameworks_base-5cc0df214bbe2b169150c9060dc5288bb8aaf338.tar.gz
frameworks_base-5cc0df214bbe2b169150c9060dc5288bb8aaf338.tar.bz2
Forget private partition keys.
When we forget a private partition, ask vold to also forget the key for that partition GUID. This means we need to track both the filesystem UUID and the partition GUID for a private volume. Bug: 21782268 Change-Id: Icda1cbb65539d61dacc663428daf3d1a2e4c313e
Diffstat (limited to 'core/java/android/text/TextUtils.java')
-rw-r--r--core/java/android/text/TextUtils.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index d51aa79..d8f7158 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -465,6 +465,11 @@ public class TextUtils {
return false;
}
+ /** {@hide} */
+ public static String nullIfEmpty(@Nullable String str) {
+ return isEmpty(str) ? null : str;
+ }
+
/**
* Returns the length that the specified CharSequence would have if
* spaces and control characters were trimmed from the start and end,