From 6a82990b5f36e3a7e3651ac70a42a6a0bb1e278d Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Fri, 6 Apr 2018 14:48:05 -0700 Subject: Make SQLiteDebug @TestApi Otherwise, Metalava based android_test_current.jar doesn't contain SQLiteDebug.class which caused build failure on: out/target/common/obj/APPS/CtsDatabaseTestCases_intermediates/classes-full-debug.jar Test: CtsDatabaseTestCases Bug: 77543575 Change-Id: Ied9948e962fb7a81e56be0360cb94b0c318ad14d Merged-In: Ied9948e962fb7a81e56be0360cb94b0c318ad14d (cherry-picked from 6fe565e441e16ed42c0e6357464f9484631421ab) Exempt-From-Owner-Approval: Cherry-picked a CL from git_master, and owner just agreed to use Exempt-From tag. --- api/test-current.txt | 25 ++++++++++++++++++++++ core/java/android/database/sqlite/SQLiteDebug.java | 1 + 2 files changed, 26 insertions(+) diff --git a/api/test-current.txt b/api/test-current.txt index 8073341ebad1..634293ab89e8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -294,6 +294,31 @@ package android.content.res { package android.database.sqlite { + public final class SQLiteDebug { + method public static void dump(android.util.Printer, java.lang.String[]); + method public static android.database.sqlite.SQLiteDebug.PagerStats getDatabaseInfo(); + field public static final boolean DEBUG_SQL_LOG; + field public static final boolean DEBUG_SQL_STATEMENTS; + field public static final boolean DEBUG_SQL_TIME; + } + + public static class SQLiteDebug.DbStats { + ctor public SQLiteDebug.DbStats(java.lang.String, long, long, int, int, int, int); + field public java.lang.String cache; + field public java.lang.String dbName; + field public long dbSize; + field public int lookaside; + field public long pageSize; + } + + public static class SQLiteDebug.PagerStats { + ctor public SQLiteDebug.PagerStats(); + field public java.util.ArrayList dbStats; + field public int largestMemAlloc; + field public int memoryUsed; + field public int pageCacheOverflow; + } + public final class SQLiteDirectCursorDriver implements android.database.sqlite.SQLiteCursorDriver { ctor public SQLiteDirectCursorDriver(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String, android.os.CancellationSignal); method public void cursorClosed(); diff --git a/core/java/android/database/sqlite/SQLiteDebug.java b/core/java/android/database/sqlite/SQLiteDebug.java index a921aa34eb92..d39252130d4b 100644 --- a/core/java/android/database/sqlite/SQLiteDebug.java +++ b/core/java/android/database/sqlite/SQLiteDebug.java @@ -29,6 +29,7 @@ import java.util.ArrayList; * * {@hide} */ +@TestApi public final class SQLiteDebug { private static native void nativeGetPagerStats(PagerStats stats); -- cgit v1.2.3-59-g8ed1b