summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2017-09-08 00:43:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-08 00:43:44 +0000
commit28e49b7eedadf085608ac9a7fd26a23ffb9637c4 (patch)
tree39e3ed02d6c723cb52f54a3d4139fb8013101de3 /core/java/android
parent6f60d6fff33daee94c7adb260066a3549a71ffde (diff)
parentac6d9d317343b50810bcebe7aa554d60461e3907 (diff)
Merge "Allow using SQLiteGlobal for testing" into oc-mr1-dev am: 347eaf21fa
am: ac6d9d3173 Change-Id: I0819f276018c9c9d50fe51c834c6356dad02c87e
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/database/sqlite/SQLiteGlobal.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/database/sqlite/SQLiteGlobal.java b/core/java/android/database/sqlite/SQLiteGlobal.java
index 571656a22240..94d5555c4c24 100644
--- a/core/java/android/database/sqlite/SQLiteGlobal.java
+++ b/core/java/android/database/sqlite/SQLiteGlobal.java
@@ -16,6 +16,7 @@
package android.database.sqlite;
+import android.annotation.TestApi;
import android.content.res.Resources;
import android.os.StatFs;
import android.os.SystemProperties;
@@ -34,6 +35,7 @@ import android.os.SystemProperties;
*
* @hide
*/
+@TestApi
public final class SQLiteGlobal {
private static final String TAG = "SQLiteGlobal";