diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-03-23 01:43:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-23 01:43:37 +0000 |
| commit | 37f180b4a52e4c1d0b6a7b400b6579b7ff25f307 (patch) | |
| tree | abf32d7942502752597a71d8208c89624b692673 | |
| parent | b685faa2cee2f8d74c82547fa7585027cbcfba5f (diff) | |
| parent | 9fa39bd255f2bc248941ae5924a0a70cc25de19e (diff) | |
| download | frameworks_base-37f180b4a52e4c1d0b6a7b400b6579b7ff25f307.zip frameworks_base-37f180b4a52e4c1d0b6a7b400b6579b7ff25f307.tar.gz frameworks_base-37f180b4a52e4c1d0b6a7b400b6579b7ff25f307.tar.bz2 | |
Merge "App ops: don't crash when provide read access is off." into jb-mr2-dev
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 4968268..cf627d7 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -609,7 +609,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { // selection statement with a dummy one that will always be false. // This way we will get a cursor back that has the correct structure // but contains no rows. - if (selection == null) { + if (selection == null || selection.isEmpty()) { selection = "'A' = 'B'"; } else { selection = "'A' = 'B' AND (" + selection + ")"; |