Snap for 13348984 from 19fe5761eca45adcdc1de8cd28c5aae3003f3c4a to 25Q3-release (30689d29) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+10 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ aconfig_declarations_group {
		"configinfra_framework_flags_java_exported_lib",
		"conscrypt_exported_aconfig_flags_lib",
		"device_policy_aconfig_flags_lib",
		"devicelock-exported-aconfig-flags-lib",
		"display_flags_lib",
		"dropbox_flags_lib",
		"framework-jobscheduler-job.flags-aconfig-java",
		@@ -124,6 +125,7 @@ aconfig_declarations_group {
		"libcore_readonly_aconfig_flags_lib",
		"libgui_flags_java_lib",
		"power_flags_lib",
		"networksecurity_exported_aconfig_flags_lib",
		"sdk_sandbox_exported_flags_lib",
		"surfaceflinger_flags_java_lib",
		"telecom_flags_core_java_lib",
		@@ -217,6 +219,14 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Conscrypt - Networksecurity
		java_aconfig_library {
		name: "networksecurity_exported_aconfig_flags_lib",
		aconfig_declarations: "networksecurity-aconfig-flags",
		mode: "exported",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Telecom
		java_aconfig_library {
		name: "telecom_flags_core_java_lib",

apct-tests/perftests/core/src/android/graphics/perftests/BitmapPerfTest.java

+22 −7

Original line number	Diff line number	Diff line
		@@ -36,13 +36,7 @@ public class BitmapPerfTest {
		@Test
		public void testParcelBitmap() {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

		// Make a large enough bitmap to be a good benchmark.
		Bitmap bitmap = Bitmap.createBitmap(1000, 1000, Bitmap.Config.ARGB_8888);
		Canvas canvas = new Canvas(bitmap);
		// Paint the canvas purple.
		// Purple is a good color for a benchmark. Purple benchmarks are the best.
		canvas.drawColor(Color.parseColor("purple"));
		final Bitmap bitmap = makeBitmap();

		while (state.keepRunning()) {
		Parcel parcel = Parcel.obtain();
		@@ -52,4 +46,25 @@ public class BitmapPerfTest {

		bitmap.recycle();
		}

		@Test
		public void testBitmapAsShared() {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		final Bitmap bitmap = makeBitmap();

		while (state.keepRunning()) {
		Bitmap unused = bitmap.asShared();
		}

		bitmap.recycle();
		}

		private Bitmap makeBitmap() {
		Bitmap bitmap = Bitmap.createBitmap(1000, 1000, Bitmap.Config.ARGB_8888);
		Canvas canvas = new Canvas(bitmap);
		// Paint the canvas purple.
		// Purple is a good color for a benchmark. Purple benchmarks are the best.
		canvas.drawColor(Color.parseColor("purple"));
		return bitmap;
		}
		}

apex/jobscheduler/service/aconfig/alarm.aconfig

+0 −7

Original line number	Diff line number	Diff line
		package: "com.android.server.alarm"
		container: "system"

		flag {
		name: "start_user_before_scheduled_alarms"
		namespace: "multiuser"
		description: "Persist list of users with alarms scheduled and wakeup stopped users before alarms are due"
		bug: "314907186"
		}

		flag {
		name: "acquire_wakelock_before_send"
		namespace: "backstage_power"

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -1784,8 +1784,8 @@ public class AlarmManagerService extends SystemService {
		mMetricsHelper = new MetricsHelper(getContext(), mLock);
		mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);

		mStartUserBeforeScheduledAlarms = Flags.startUserBeforeScheduledAlarms()
		&& UserManager.supportsMultipleUsers() && Resources.getSystem().getBoolean(
		mStartUserBeforeScheduledAlarms = UserManager.supportsMultipleUsers()
		&& Resources.getSystem().getBoolean(
		com.android.internal.R.bool.config_allowAlarmsOnStoppedUsers);
		if (mStartUserBeforeScheduledAlarms) {
		mUserWakeupStore = new UserWakeupStore();
		@@ -2992,9 +2992,6 @@ public class AlarmManagerService extends SystemService {

		pw.println("Feature Flags:");
		pw.increaseIndent();
		pw.print(Flags.FLAG_START_USER_BEFORE_SCHEDULED_ALARMS,
		Flags.startUserBeforeScheduledAlarms());
		pw.println();
		pw.print(Flags.FLAG_ACQUIRE_WAKELOCK_BEFORE_SEND, Flags.acquireWakelockBeforeSend());
		pw.println();
		pw.decreaseIndent();

core/api/current.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -15140,14 +15140,14 @@ package android.database.sqlite {
		public final class SQLiteDatabase extends android.database.sqlite.SQLiteClosable {
		method public void beginTransaction();
		method public void beginTransactionNonExclusive();
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public void beginTransactionReadOnly();
		method public void beginTransactionReadOnly();
		method public void beginTransactionWithListener(@Nullable android.database.sqlite.SQLiteTransactionListener);
		method public void beginTransactionWithListenerNonExclusive(@Nullable android.database.sqlite.SQLiteTransactionListener);
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public void beginTransactionWithListenerReadOnly(@Nullable android.database.sqlite.SQLiteTransactionListener);
		method public void beginTransactionWithListenerReadOnly(@Nullable android.database.sqlite.SQLiteTransactionListener);
		method public android.database.sqlite.SQLiteStatement compileStatement(String) throws android.database.SQLException;
		method @NonNull public static android.database.sqlite.SQLiteDatabase create(@Nullable android.database.sqlite.SQLiteDatabase.CursorFactory);
		method @NonNull public static android.database.sqlite.SQLiteDatabase createInMemory(@NonNull android.database.sqlite.SQLiteDatabase.OpenParams);
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") @NonNull public android.database.sqlite.SQLiteRawStatement createRawStatement(@NonNull String);
		method @NonNull public android.database.sqlite.SQLiteRawStatement createRawStatement(@NonNull String);
		method public int delete(@NonNull String, @Nullable String, @Nullable String[]);
		method public static boolean deleteDatabase(@NonNull java.io.File);
		method public void disableWriteAheadLogging();
		@@ -15158,13 +15158,13 @@ package android.database.sqlite {
		method public void execSQL(@NonNull String, @NonNull Object[]) throws android.database.SQLException;
		method public static String findEditTable(String);
		method public java.util.List<android.util.Pair<java.lang.String,java.lang.String>> getAttachedDbs();
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public long getLastChangedRowCount();
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public long getLastInsertRowId();
		method public long getLastChangedRowCount();
		method public long getLastInsertRowId();
		method public long getMaximumSize();
		method public long getPageSize();
		method public String getPath();
		method @Deprecated public java.util.Map<java.lang.String,java.lang.String> getSyncedTables();
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public long getTotalChangedRowCount();
		method public long getTotalChangedRowCount();
		method public int getVersion();
		method public boolean inTransaction();
		method public long insert(@NonNull String, @Nullable String, @Nullable android.content.ContentValues);
		@@ -15386,7 +15386,7 @@ package android.database.sqlite {
		method public int update(@NonNull android.database.sqlite.SQLiteDatabase, @NonNull android.content.ContentValues, @Nullable String, @Nullable String[]);
		}

		@FlaggedApi("android.database.sqlite.sqlite_apis_35") public final class SQLiteRawStatement implements java.io.Closeable {
		public final class SQLiteRawStatement implements java.io.Closeable {
		method public void bindBlob(int, @NonNull byte[]);
		method public void bindBlob(int, @NonNull byte[], int, int);
		method public void bindDouble(int, double);