Snap for 12821845 from 2298a41610ad32bb2bab32e7d4c2f751fa972e61 to 25Q2-release (943cbd5e) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -63,12 +63,14 @@ public class ZipFilePerfTest {

		@Test
		@Parameters(method = "getData")
		public void timeZipFileOpenClose(int numEntries) throws Exception {
		public void timeZipFileOpen(int numEntries) throws Exception {
		setUp(numEntries);
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		ZipFile zf = new ZipFile(mFile);
		state.pauseTiming();
		zf.close();
		state.resumeTiming();
		}
		}

api/api.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ func (a *CombinedApis) DepsMutator(ctx android.BottomUpMutatorContext) {

		func (a *CombinedApis) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		ctx.WalkDeps(func(child, parent android.Module) bool {
		if _, ok := child.(java.AndroidLibraryDependency); ok && child.Name() != "framework-res" {
		if _, ok := android.OtherModuleProvider(ctx, child, java.AndroidLibraryInfoProvider); ok && child.Name() != "framework-res" {
		// Stubs of BCP and SSCP libraries should not have any dependencies on apps
		// This check ensures that we do not run into circular dependencies when UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true
		ctx.ModuleErrorf(

core/api/current.txt

+35 −37

Original line number	Diff line number	Diff line
		@@ -9190,37 +9190,37 @@ package android.app.blob {
		package android.app.jank {

		@FlaggedApi("android.app.jank.detailed_app_jank_metrics_api") public final class AppJankStats {
		ctor public AppJankStats(int, @NonNull String, @Nullable String, @Nullable String, long, long, @NonNull android.app.jank.FrameOverrunHistogram);
		method @NonNull public android.app.jank.FrameOverrunHistogram getFrameOverrunHistogram();
		ctor public AppJankStats(int, @NonNull String, @Nullable String, @Nullable String, long, long, @NonNull android.app.jank.RelativeFrameTimeHistogram);
		method public long getJankyFrameCount();
		method @NonNull public android.app.jank.RelativeFrameTimeHistogram getRelativeFrameTimeHistogram();
		method public long getTotalFrameCount();
		method public int getUid();
		method @NonNull public String getWidgetCategory();
		method @NonNull public String getWidgetId();
		method @NonNull public String getWidgetState();
		field public static final String ANIMATING = "animating";
		field public static final String ANIMATION = "animation";
		field public static final String DRAGGING = "dragging";
		field public static final String FLINGING = "flinging";
		field public static final String KEYBOARD = "keyboard";
		field public static final String MEDIA = "media";
		field public static final String NAVIGATION = "navigation";
		field public static final String NONE = "none";
		field public static final String OTHER = "other";
		field public static final String PLAYBACK = "playback";
		field public static final String PREDICTIVE_BACK = "predictive_back";
		field public static final String SCROLL = "scroll";
		field public static final String SCROLLING = "scrolling";
		field public static final String SWIPING = "swiping";
		field public static final String TAPPING = "tapping";
		field public static final String WIDGET_CATEGORY_UNSPECIFIED = "widget_category_unspecified";
		field public static final String WIDGET_STATE_UNSPECIFIED = "widget_state_unspecified";
		field public static final String ZOOMING = "zooming";
		}

		@FlaggedApi("android.app.jank.detailed_app_jank_metrics_api") public class FrameOverrunHistogram {
		ctor public FrameOverrunHistogram();
		method public void addFrameOverrunMillis(int);
		field public static final String WIDGET_CATEGORY_ANIMATION = "animation";
		field public static final String WIDGET_CATEGORY_KEYBOARD = "keyboard";
		field public static final String WIDGET_CATEGORY_MEDIA = "media";
		field public static final String WIDGET_CATEGORY_NAVIGATION = "navigation";
		field public static final String WIDGET_CATEGORY_OTHER = "other";
		field public static final String WIDGET_CATEGORY_SCROLL = "scroll";
		field public static final String WIDGET_CATEGORY_UNSPECIFIED = "unspecified";
		field public static final String WIDGET_STATE_ANIMATING = "animating";
		field public static final String WIDGET_STATE_DRAGGING = "dragging";
		field public static final String WIDGET_STATE_FLINGING = "flinging";
		field public static final String WIDGET_STATE_NONE = "none";
		field public static final String WIDGET_STATE_PLAYBACK = "playback";
		field public static final String WIDGET_STATE_PREDICTIVE_BACK = "predictive_back";
		field public static final String WIDGET_STATE_SCROLLING = "scrolling";
		field public static final String WIDGET_STATE_SWIPING = "swiping";
		field public static final String WIDGET_STATE_TAPPING = "tapping";
		field public static final String WIDGET_STATE_UNSPECIFIED = "unspecified";
		field public static final String WIDGET_STATE_ZOOMING = "zooming";
		}

		@FlaggedApi("android.app.jank.detailed_app_jank_metrics_api") public class RelativeFrameTimeHistogram {
		ctor public RelativeFrameTimeHistogram();
		method public void addRelativeFrameTimeMillis(int);
		method @NonNull public int[] getBucketCounters();
		method @NonNull public int[] getBucketEndpointsMillis();
		}
		@@ -42521,7 +42521,7 @@ package android.service.settings.preferences {
		field @NonNull public static final android.os.Parcelable.Creator<android.service.settings.preferences.GetValueRequest> CREATOR;
		}

		public static final class GetValueRequest.Builder {
		@FlaggedApi("com.android.settingslib.flags.settings_catalyst") public static final class GetValueRequest.Builder {
		ctor public GetValueRequest.Builder(@NonNull String, @NonNull String);
		method @NonNull public android.service.settings.preferences.GetValueRequest build();
		}
		@@ -42542,7 +42542,7 @@ package android.service.settings.preferences {
		field public static final int RESULT_UNSUPPORTED = 1; // 0x1
		}

		public static final class GetValueResult.Builder {
		@FlaggedApi("com.android.settingslib.flags.settings_catalyst") public static final class GetValueResult.Builder {
		ctor public GetValueResult.Builder(int);
		method @NonNull public android.service.settings.preferences.GetValueResult build();
		method @NonNull public android.service.settings.preferences.GetValueResult.Builder setMetadata(@Nullable android.service.settings.preferences.SettingsPreferenceMetadata);
		@@ -42555,7 +42555,7 @@ package android.service.settings.preferences {
		field @NonNull public static final android.os.Parcelable.Creator<android.service.settings.preferences.MetadataRequest> CREATOR;
		}

		public static final class MetadataRequest.Builder {
		@FlaggedApi("com.android.settingslib.flags.settings_catalyst") public static final class MetadataRequest.Builder {
		ctor public MetadataRequest.Builder();
		method @NonNull public android.service.settings.preferences.MetadataRequest build();
		}
		@@ -42571,7 +42571,7 @@ package android.service.settings.preferences {
		field public static final int RESULT_UNSUPPORTED = 1; // 0x1
		}

		public static final class MetadataResult.Builder {
		@FlaggedApi("com.android.settingslib.flags.settings_catalyst") public static final class MetadataResult.Builder {
		ctor public MetadataResult.Builder(int);
		method @NonNull public android.service.settings.preferences.MetadataResult build();
		method @NonNull public android.service.settings.preferences.MetadataResult.Builder setMetadataList(@NonNull java.util.List<android.service.settings.preferences.SettingsPreferenceMetadata>);
		@@ -42586,7 +42586,7 @@ package android.service.settings.preferences {
		field @NonNull public static final android.os.Parcelable.Creator<android.service.settings.preferences.SetValueRequest> CREATOR;
		}

		public static final class SetValueRequest.Builder {
		@FlaggedApi("com.android.settingslib.flags.settings_catalyst") public static final class SetValueRequest.Builder {
		ctor public SetValueRequest.Builder(@NonNull String, @NonNull String, @NonNull android.service.settings.preferences.SettingsPreferenceValue);
		method @NonNull public android.service.settings.preferences.SetValueRequest build();
		}
		@@ -42608,14 +42608,13 @@ package android.service.settings.preferences {
		field public static final int RESULT_UNSUPPORTED = 1; // 0x1
		}

		public static final class SetValueResult.Builder {
		@FlaggedApi("com.android.settingslib.flags.settings_catalyst") public static final class SetValueResult.Builder {
		ctor public SetValueResult.Builder(int);
		method @NonNull public android.service.settings.preferences.SetValueResult build();
		}

		@FlaggedApi("com.android.settingslib.flags.settings_catalyst") public final class SettingsPreferenceMetadata implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public java.util.List<java.lang.String> getBreadcrumbs();
		method @NonNull public android.os.Bundle getExtras();
		method @NonNull public String getKey();
		method @Nullable public android.content.Intent getLaunchIntent();
		@@ -42631,17 +42630,16 @@ package android.service.settings.preferences {
		method public boolean isWritable();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.service.settings.preferences.SettingsPreferenceMetadata> CREATOR;
		field public static final int DEEPLINK_ONLY = 2; // 0x2
		field public static final int EXPECT_POST_CONFIRMATION = 1; // 0x1
		field public static final int EXPECT_PRE_CONFIRMATION = 2; // 0x2
		field public static final int NO_DIRECT_ACCESS = 3; // 0x3
		field public static final int NO_SENSITIVITY = 0; // 0x0
		}

		public static final class SettingsPreferenceMetadata.Builder {
		@FlaggedApi("com.android.settingslib.flags.settings_catalyst") public static final class SettingsPreferenceMetadata.Builder {
		ctor public SettingsPreferenceMetadata.Builder(@NonNull String, @NonNull String);
		method @NonNull public android.service.settings.preferences.SettingsPreferenceMetadata build();
		method @NonNull public android.service.settings.preferences.SettingsPreferenceMetadata.Builder setAvailable(boolean);
		method @NonNull public android.service.settings.preferences.SettingsPreferenceMetadata.Builder setBreadcrumbs(@NonNull java.util.List<java.lang.String>);
		method @NonNull public android.service.settings.preferences.SettingsPreferenceMetadata.Builder setEnabled(boolean);
		method @NonNull public android.service.settings.preferences.SettingsPreferenceMetadata.Builder setExtras(@NonNull android.os.Bundle);
		method @NonNull public android.service.settings.preferences.SettingsPreferenceMetadata.Builder setLaunchIntent(@Nullable android.content.Intent);
		@@ -42688,7 +42686,7 @@ package android.service.settings.preferences {
		field public static final int TYPE_STRING = 3; // 0x3
		}

		public static final class SettingsPreferenceValue.Builder {
		@FlaggedApi("com.android.settingslib.flags.settings_catalyst") public static final class SettingsPreferenceValue.Builder {
		ctor public SettingsPreferenceValue.Builder(int);
		method @NonNull public android.service.settings.preferences.SettingsPreferenceValue build();
		method @NonNull public android.service.settings.preferences.SettingsPreferenceValue.Builder setBooleanValue(boolean);
		@@ -53484,9 +53482,9 @@ package android.view {
		field public static final int CHANGE_FRAME_RATE_ALWAYS = 1; // 0x1
		field public static final int CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS = 0; // 0x0
		field @NonNull public static final android.os.Parcelable.Creator<android.view.Surface> CREATOR;
		field @FlaggedApi("com.android.graphics.surfaceflinger.flags.arr_setframerate_gte_enum") public static final int FRAME_RATE_COMPATIBILITY_AT_LEAST = 2; // 0x2
		field public static final int FRAME_RATE_COMPATIBILITY_DEFAULT = 0; // 0x0
		field public static final int FRAME_RATE_COMPATIBILITY_FIXED_SOURCE = 1; // 0x1
		field @FlaggedApi("com.android.graphics.surfaceflinger.flags.arr_setframerate_gte_enum") public static final int FRAME_RATE_COMPATIBILITY_GTE = 2; // 0x2
		field public static final int ROTATION_0 = 0; // 0x0
		field public static final int ROTATION_180 = 2; // 0x2
		field public static final int ROTATION_270 = 3; // 0x3

core/api/system-current.txt

+26 −26

Original line number	Diff line number	Diff line
		@@ -5079,8 +5079,8 @@ package android.hardware.contexthub {
		}

		@FlaggedApi("android.chre.flags.offload_api") public class HubEndpoint {
		method @Nullable public android.hardware.contexthub.IHubEndpointLifecycleCallback getLifecycleCallback();
		method @Nullable public android.hardware.contexthub.IHubEndpointMessageCallback getMessageCallback();
		method @Nullable public android.hardware.contexthub.HubEndpointLifecycleCallback getLifecycleCallback();
		method @Nullable public android.hardware.contexthub.HubEndpointMessageCallback getMessageCallback();
		method @NonNull public java.util.Collection<android.hardware.contexthub.HubServiceInfo> getServiceInfoCollection();
		method @Nullable public String getTag();
		method public int getVersion();
		@@ -5095,14 +5095,19 @@ package android.hardware.contexthub {
		public static final class HubEndpoint.Builder {
		ctor public HubEndpoint.Builder(@NonNull android.content.Context);
		method @NonNull public android.hardware.contexthub.HubEndpoint build();
		method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setLifecycleCallback(@NonNull android.hardware.contexthub.IHubEndpointLifecycleCallback);
		method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setLifecycleCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.IHubEndpointLifecycleCallback);
		method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setMessageCallback(@NonNull android.hardware.contexthub.IHubEndpointMessageCallback);
		method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setMessageCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.IHubEndpointMessageCallback);
		method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setLifecycleCallback(@NonNull android.hardware.contexthub.HubEndpointLifecycleCallback);
		method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setLifecycleCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.HubEndpointLifecycleCallback);
		method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setMessageCallback(@NonNull android.hardware.contexthub.HubEndpointMessageCallback);
		method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setMessageCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.HubEndpointMessageCallback);
		method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setServiceInfoCollection(@NonNull java.util.Collection<android.hardware.contexthub.HubServiceInfo>);
		method @NonNull public android.hardware.contexthub.HubEndpoint.Builder setTag(@NonNull String);
		}

		@FlaggedApi("android.chre.flags.offload_api") public interface HubEndpointDiscoveryCallback {
		method public void onEndpointsStarted(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>);
		method public void onEndpointsStopped(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>, int);
		}

		@FlaggedApi("android.chre.flags.offload_api") public final class HubEndpointInfo implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.hardware.contexthub.HubEndpointInfo.HubEndpointIdentifier getIdentifier();
		@@ -5126,6 +5131,16 @@ package android.hardware.contexthub {
		method public long getHub();
		}

		@FlaggedApi("android.chre.flags.offload_api") public interface HubEndpointLifecycleCallback {
		method public void onSessionClosed(@NonNull android.hardware.contexthub.HubEndpointSession, int);
		method @NonNull public android.hardware.contexthub.HubEndpointSessionResult onSessionOpenRequest(@NonNull android.hardware.contexthub.HubEndpointInfo, @Nullable String);
		method public void onSessionOpened(@NonNull android.hardware.contexthub.HubEndpointSession);
		}

		@FlaggedApi("android.chre.flags.offload_api") public interface HubEndpointMessageCallback {
		method public void onMessageReceived(@NonNull android.hardware.contexthub.HubEndpointSession, @NonNull android.hardware.contexthub.HubMessage);
		}

		@FlaggedApi("android.chre.flags.offload_api") public class HubEndpointSession implements java.lang.AutoCloseable {
		method @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void close();
		method @Nullable public String getServiceDescriptor();
		@@ -5174,21 +5189,6 @@ package android.hardware.contexthub {
		method @NonNull public android.hardware.contexthub.HubServiceInfo build();
		}

		@FlaggedApi("android.chre.flags.offload_api") public interface IHubEndpointDiscoveryCallback {
		method public void onEndpointsStarted(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>);
		method public void onEndpointsStopped(@NonNull java.util.List<android.hardware.contexthub.HubDiscoveryInfo>, int);
		}

		@FlaggedApi("android.chre.flags.offload_api") public interface IHubEndpointLifecycleCallback {
		method public void onSessionClosed(@NonNull android.hardware.contexthub.HubEndpointSession, int);
		method @NonNull public android.hardware.contexthub.HubEndpointSessionResult onSessionOpenRequest(@NonNull android.hardware.contexthub.HubEndpointInfo, @Nullable String);
		method public void onSessionOpened(@NonNull android.hardware.contexthub.HubEndpointSession);
		}

		@FlaggedApi("android.chre.flags.offload_api") public interface IHubEndpointMessageCallback {
		method public void onMessageReceived(@NonNull android.hardware.contexthub.HubEndpointSession, @NonNull android.hardware.contexthub.HubMessage);
		}

		}

		package android.hardware.devicestate {
		@@ -6192,16 +6192,16 @@ package android.hardware.location {
		method @Deprecated public int registerCallback(@NonNull android.hardware.location.ContextHubManager.Callback);
		method @Deprecated public int registerCallback(android.hardware.location.ContextHubManager.Callback, android.os.Handler);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpoint(@NonNull android.hardware.contexthub.HubEndpoint);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(long, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(long, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback, @NonNull java.util.concurrent.Executor);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull String, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull String, @NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback, @NonNull java.util.concurrent.Executor);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull android.hardware.contexthub.HubEndpointDiscoveryCallback, long);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.HubEndpointDiscoveryCallback, long);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull android.hardware.contexthub.HubEndpointDiscoveryCallback, @NonNull String);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void registerEndpointDiscoveryCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.contexthub.HubEndpointDiscoveryCallback, @NonNull String);
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public int sendMessage(int, int, @NonNull android.hardware.location.ContextHubMessage);
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public int unloadNanoApp(int);
		method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public android.hardware.location.ContextHubTransaction<java.lang.Void> unloadNanoApp(@NonNull android.hardware.location.ContextHubInfo, long);
		method @Deprecated public int unregisterCallback(@NonNull android.hardware.location.ContextHubManager.Callback);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void unregisterEndpoint(@NonNull android.hardware.contexthub.HubEndpoint);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void unregisterEndpointDiscoveryCallback(@NonNull android.hardware.contexthub.IHubEndpointDiscoveryCallback);
		method @FlaggedApi("android.chre.flags.offload_api") @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void unregisterEndpointDiscoveryCallback(@NonNull android.hardware.contexthub.HubEndpointDiscoveryCallback);
		field public static final int AUTHORIZATION_DENIED = 0; // 0x0
		field public static final int AUTHORIZATION_DENIED_GRACE_PERIOD = 1; // 0x1
		field public static final int AUTHORIZATION_GRANTED = 2; // 0x2

core/java/android/app/Activity.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -5834,8 +5834,12 @@ public class Activity extends ContextThemeWrapper
		final int size = permissions.length;
		int[] results = new int[size];
		for (int i = 0; i < size; i++) {
		if (permissions[i] == null) {
		results[i] = Context.PERMISSION_REQUEST_STATE_UNREQUESTABLE;
		} else {
		results[i] = deviceContext.getPermissionRequestState(permissions[i]);
		}
		}
		return results;
		}