Snap for 4656203 from bc20993e4baf90d413374f4d2d74bcc76d758b63 to pi-release (1c1c8554) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/database/SQLiteDatabasePerfTest.java

+51 −1

Original line number	Diff line number	Diff line
		@@ -117,6 +117,52 @@ public class SQLiteDatabasePerfTest {
		}
		}

		@Test
		public void testCursorIterateForward() {
		// A larger dataset is needed to exceed default CursorWindow size
		int datasetSize = DEFAULT_DATASET_SIZE * 50;
		insertT1TestDataSet(datasetSize);

		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		try (Cursor cursor = mDatabase
		.rawQuery("SELECT _ID, COL_A, COL_B, COL_C FROM T1 ORDER BY _ID", null)) {
		int i = 0;
		while(cursor.moveToNext()) {
		assertEquals(i, cursor.getInt(0));
		assertEquals(i, cursor.getInt(1));
		assertEquals("T1Value" + i, cursor.getString(2));
		assertEquals(1.1 * i, cursor.getDouble(3), 0.0000001d);
		i++;
		}
		assertEquals(datasetSize, i);
		}
		}
		}

		@Test
		public void testCursorIterateBackwards() {
		// A larger dataset is needed to exceed default CursorWindow size
		int datasetSize = DEFAULT_DATASET_SIZE * 50;
		insertT1TestDataSet(datasetSize);

		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		try (Cursor cursor = mDatabase
		.rawQuery("SELECT _ID, COL_A, COL_B, COL_C FROM T1 ORDER BY _ID", null)) {
		int i = datasetSize - 1;
		while(cursor.moveToPosition(i)) {
		assertEquals(i, cursor.getInt(0));
		assertEquals(i, cursor.getInt(1));
		assertEquals("T1Value" + i, cursor.getString(2));
		assertEquals(1.1 * i, cursor.getDouble(3), 0.0000001d);
		i--;
		}
		assertEquals(-1, i);
		}
		}
		}

		@Test
		public void testInnerJoin() {
		mDatabase.setForeignKeyConstraintsEnabled(true);
		@@ -201,8 +247,12 @@ public class SQLiteDatabasePerfTest {
		}

		private void insertT1TestDataSet() {
		insertT1TestDataSet(DEFAULT_DATASET_SIZE);
		}

		private void insertT1TestDataSet(int size) {
		mDatabase.beginTransaction();
		for (int i = 0; i < DEFAULT_DATASET_SIZE; i++) {
		for (int i = 0; i < size; i++) {
		mDatabase.execSQL("INSERT INTO T1 VALUES (?, ?, ?, ?)",
		new Object[]{i, i, "T1Value" + i, i * 1.1});
		}

apct-tests/perftests/core/src/android/text/TextPerfUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ public class TextPerfUtils {
		}

		SpannableStringBuilder ssb = new SpannableStringBuilder(cs);
		for (int i = 0; i < ssb.length(); i += wordLen) {
		for (int i = 0; i < ssb.length(); i += wordLen + 1) {
		final int spanStart = i;
		final int spanEnd = (i + wordLen) > ssb.length() ? ssb.length() : i + wordLen;

api/current.txt

+5 −1

Original line number	Diff line number	Diff line
		@@ -5196,6 +5196,7 @@ package android.app {
		field public static final java.lang.String CATEGORY_ERROR = "err";
		field public static final java.lang.String CATEGORY_EVENT = "event";
		field public static final java.lang.String CATEGORY_MESSAGE = "msg";
		field public static final java.lang.String CATEGORY_NAVIGATION = "navigation";
		field public static final java.lang.String CATEGORY_PROGRESS = "progress";
		field public static final java.lang.String CATEGORY_PROMO = "promo";
		field public static final java.lang.String CATEGORY_RECOMMENDATION = "recommendation";
		@@ -7266,6 +7267,7 @@ package android.app.slice {
		public class SliceManager {
		method public android.app.slice.Slice bindSlice(android.net.Uri, java.util.List<android.app.slice.SliceSpec>);
		method public android.app.slice.Slice bindSlice(android.content.Intent, java.util.List<android.app.slice.SliceSpec>);
		method public java.util.List<android.net.Uri> getPinnedSlices();
		method public java.util.List<android.app.slice.SliceSpec> getPinnedSpecs(android.net.Uri);
		method public java.util.Collection<android.net.Uri> getSliceDescendants(android.net.Uri);
		method public android.net.Uri mapIntentToUri(android.content.Intent);
		@@ -7418,12 +7420,14 @@ package android.app.usage {
		method public int getEventType();
		method public java.lang.String getPackageName();
		method public java.lang.String getShortcutId();
		method public int getStandbyBucket();
		method public long getTimeStamp();
		field public static final int CONFIGURATION_CHANGE = 5; // 0x5
		field public static final int MOVE_TO_BACKGROUND = 2; // 0x2
		field public static final int MOVE_TO_FOREGROUND = 1; // 0x1
		field public static final int NONE = 0; // 0x0
		field public static final int SHORTCUT_INVOCATION = 8; // 0x8
		field public static final int STANDBY_BUCKET_CHANGED = 11; // 0xb
		field public static final int USER_INTERACTION = 7; // 0x7
		}

		@@ -28677,7 +28681,7 @@ package android.net.wifi {
		field public static final int IEEE8021X = 3; // 0x3
		field public static final int NONE = 0; // 0x0
		field public static final int WPA_EAP = 2; // 0x2
		field public static final deprecated int WPA_PSK = 1; // 0x1
		field public static final int WPA_PSK = 1; // 0x1
		field public static final java.lang.String[] strings;
		field public static final java.lang.String varName = "key_mgmt";
		}

api/system-current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -336,6 +336,9 @@ package android.app {
		}

		public class Notification implements android.os.Parcelable {
		field public static final java.lang.String CATEGORY_CAR_EMERGENCY = "car_emergency";
		field public static final java.lang.String CATEGORY_CAR_INFORMATION = "car_information";
		field public static final java.lang.String CATEGORY_CAR_WARNING = "car_warning";
		field public static final java.lang.String EXTRA_ALLOW_DURING_SETUP = "android.allowDuringSetup";
		field public static final java.lang.String EXTRA_SUBSTITUTE_APP_NAME = "android.substName";
		field public static final int FLAG_AUTOGROUP_SUMMARY = 1024; // 0x400
		@@ -719,10 +722,8 @@ package android.app.usage {

		public static final class UsageEvents.Event {
		method public java.lang.String getNotificationChannelId();
		method public int getStandbyBucket();
		field public static final int NOTIFICATION_INTERRUPTION = 12; // 0xc
		field public static final int NOTIFICATION_SEEN = 10; // 0xa
		field public static final int STANDBY_BUCKET_CHANGED = 11; // 0xb
		}

		public final class UsageStatsManager {

cmds/statsd/Android.mk

+2 −4

Original line number	Diff line number	Diff line
		@@ -82,10 +82,8 @@ statsd_common_static_libraries := \
		statsd_common_shared_libraries := \
		libbase \
		libbinder \
		libcutils \
		libincident \
		liblog \
		libselinux \
		libutils \
		libservices \
		libprotoutil \
		@@ -198,7 +196,7 @@ LOCAL_SRC_FILES := \
		tests/e2e/WakelockDuration_e2e_test.cpp \
		tests/e2e/MetricConditionLink_e2e_test.cpp \
		tests/e2e/Attribution_e2e_test.cpp \
		tests/e2e/GaugeMetric_e2e_test.cpp \
		tests/e2e/GaugeMetric_e2e_push_test.cpp \
		tests/e2e/DimensionInCondition_e2e_combination_AND_cond_test.cpp \
		tests/e2e/DimensionInCondition_e2e_combination_OR_cond_test.cpp \
		tests/e2e/DimensionInCondition_e2e_simple_cond_test.cpp