Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 173ea091 authored by Vasu Nori's avatar Vasu Nori Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'" into gingerbread

parents b5631f59 9540a8d3

core/java/android/app/ActivityThread.java

+6 −5
Original line number Diff line number Diff line
@@ -363,7 +363,8 @@ public final class ActivityThread { 
        private static final String HEAP_COLUMN = "%17s %8s %8s %8s %8s";

        private static final String ONE_COUNT_COLUMN = "%17s %8d";

        private static final String TWO_COUNT_COLUMNS = "%17s %8d %17s %8d";

        private static final String DB_INFO_FORMAT = "  %8d %8d %10d  %s";

        private static final String TWO_COUNT_COLUMNS_DB = "%20s %8d %20s %8d";

        private static final String DB_INFO_FORMAT = "  %8d %8d %14d  %s";



        // Formatting for checkin service - update version if row format changes

        private static final int ACTIVITY_THREAD_CHECKIN_VERSION = 1;
@@ -806,15 +807,15 @@ public final class ActivityThread { 
            // SQLite mem info

            pw.println(" ");

            pw.println(" SQL");

            printRow(pw, TWO_COUNT_COLUMNS, "heap:", sqliteAllocated, "memoryUsed:",

            printRow(pw, TWO_COUNT_COLUMNS_DB, "heap:", sqliteAllocated, "MEMORY_USED:",

                    stats.memoryUsed / 1024);

            printRow(pw, TWO_COUNT_COLUMNS, "pageCacheOverflo:", stats.pageCacheOverflo / 1024,

                    "largestMemAlloc:", stats.largestMemAlloc / 1024);

            printRow(pw, TWO_COUNT_COLUMNS_DB, "PAGECACHE_OVERFLOW:",

                    stats.pageCacheOverflo / 1024, "MALLOC_SIZE:", stats.largestMemAlloc / 1024);

            pw.println(" ");

            int N = stats.dbStats.size();

            if (N > 0) {

                pw.println(" DATABASES");

                printRow(pw, "  %8s %8s %10s  %s", "Pagesize", "Dbsize", "Lookaside", "Dbname");

                printRow(pw, "  %8s %8s %14s  %s", "pgsz", "dbsz", "Lookaside(b)", "Dbname");

                for (int i = 0; i < N; i++) {

                    DbStats dbStats = stats.dbStats.get(i);

                    printRow(pw, DB_INFO_FORMAT, dbStats.pageSize, dbStats.dbSize,

core/java/android/database/sqlite/SQLiteDebug.java

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public final class SQLiteDebug { 


        public DbStats(String dbName, long pageCount, long pageSize, int lookaside) {

            this.dbName = dbName;

            this.pageSize = pageSize;

            this.pageSize = pageSize / 1024;

            dbSize = (pageCount * pageSize) / 1024;

            this.lookaside = lookaside;

        }