Snap for 11834877 from f16e8ea2862decfaae13aaf51b9537f23844e847 to 24Q3-release (33ae46f4) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/libcore/ImtConflictPerfTestGen.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,8 +61,8 @@ print("package android.libcore;")
		imports = """
		import android.perftests.utils.BenchmarkState;
		import android.perftests.utils.PerfStatusReporter;
		import android.test.suitebuilder.annotation.LargeTest;

		import androidx.test.filters.LargeTest;
		import androidx.test.runner.AndroidJUnit4;

		import org.junit.Before;

apct-tests/perftests/core/src/android/libcore/varhandles/generate_java.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,8 +160,8 @@ package android.libcore.varhandles;

		import android.perftests.utils.BenchmarkState;
		import android.perftests.utils.PerfStatusReporter;
		import android.test.suitebuilder.annotation.LargeTest;

		import androidx.test.filters.LargeTest;
		import androidx.test.runner.AndroidJUnit4;

		import org.junit.After;

cmds/bootanimation/BootAnimation.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -707,11 +707,11 @@ void BootAnimation::resizeSurface(int newWidth, int newHeight) {
		eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
		eglDestroySurface(mDisplay, mSurface);

		mFlingerSurfaceControl->updateDefaultBufferSize(newWidth, newHeight);
		const auto limitedSize = limitSurfaceSize(newWidth, newHeight);
		mWidth = limitedSize.width;
		mHeight = limitedSize.height;

		mFlingerSurfaceControl->updateDefaultBufferSize(mWidth, mHeight);
		EGLConfig config = getEglConfig(mDisplay);
		EGLSurface surface = eglCreateWindowSurface(mDisplay, config, mFlingerSurface.get(), nullptr);
		if (eglMakeCurrent(mDisplay, surface, surface, mContext) == EGL_FALSE) {

core/api/system-current.txt

+3 −6

Original line number	Diff line number	Diff line
		@@ -1143,16 +1143,13 @@ package android.app {
		field public static final int NAV_BAR_MODE_KIDS = 1; // 0x1
		}

		public static final class StatusBarManager.DisableInfo implements android.os.Parcelable {
		public static final class StatusBarManager.DisableInfo {
		method public boolean areAllComponentsEnabled();
		method public int describeContents();
		method public boolean isNavigateToHomeDisabled();
		method public boolean isNotificationPeekingDisabled();
		method public boolean isRecentsDisabled();
		method public boolean isSearchDisabled();
		method public boolean isStatusBarExpansionDisabled();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.StatusBarManager.DisableInfo> CREATOR;
		}

		public final class SystemServiceRegistry {
		@@ -10342,7 +10339,7 @@ package android.net.wifi.sharedconnectivity.app {
		method public int getDeviceType();
		method @NonNull public android.os.Bundle getExtras();
		method @NonNull public String getModelName();
		method @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status") public boolean isBatteryCharging();
		method @FlaggedApi("android.net.wifi.flags.network_provider_battery_charging_status") public boolean isBatteryCharging();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.sharedconnectivity.app.NetworkProviderInfo> CREATOR;
		field public static final int DEVICE_TYPE_AUTO = 5; // 0x5
		@@ -10356,7 +10353,7 @@ package android.net.wifi.sharedconnectivity.app {
		public static final class NetworkProviderInfo.Builder {
		ctor public NetworkProviderInfo.Builder(@NonNull String, @NonNull String);
		method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo build();
		method @FlaggedApi("com.android.wifi.flags.network_provider_battery_charging_status") @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryCharging(boolean);
		method @FlaggedApi("android.net.wifi.flags.network_provider_battery_charging_status") @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryCharging(boolean);
		method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryPercentage(@IntRange(from=0, to=100) int);
		method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setConnectionStrength(@IntRange(from=0, to=4) int);
		method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setDeviceName(@NonNull String);

core/api/system-lint-baseline.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -1939,10 +1939,6 @@ UnflaggedApi: android.app.ActivityManager#getExternalHistoricalProcessStartReaso
		New API must be flagged with @FlaggedApi: method android.app.ActivityManager.getExternalHistoricalProcessStartReasons(String,int)
		UnflaggedApi: android.app.AppOpsManager#OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO:
		New API must be flagged with @FlaggedApi: field android.app.AppOpsManager.OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO
		UnflaggedApi: android.app.StatusBarManager.DisableInfo#CREATOR:
		New API must be flagged with @FlaggedApi: field android.app.StatusBarManager.DisableInfo.CREATOR
		UnflaggedApi: android.app.StatusBarManager.DisableInfo#isBackDisabled():
		New API must be flagged with @FlaggedApi: method android.app.StatusBarManager.DisableInfo.isBackDisabled()
		UnflaggedApi: android.companion.virtual.VirtualDeviceManager.VirtualDevice#getPersistentDeviceId():
		New API must be flagged with @FlaggedApi: method android.companion.virtual.VirtualDeviceManager.VirtualDevice.getPersistentDeviceId()
		UnflaggedApi: android.content.Context#THREAD_NETWORK_SERVICE: