Snap for 11146061 from 05a9407c5b9ee9bd7a8231bb5bb8d42378fc655f to 24Q1-release (42a2168c) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+28 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ aconfig_srcjars = [
		":android.os.flags-aconfig-java{.generated_srcjars}",
		":android.os.vibrator.flags-aconfig-java{.generated_srcjars}",
		":android.security.flags-aconfig-java{.generated_srcjars}",
		":android.service.chooser.flags-aconfig-java{.generated_srcjars}",
		":android.service.notification.flags-aconfig-java{.generated_srcjars}",
		":android.view.flags-aconfig-java{.generated_srcjars}",
		":android.view.accessibility.flags-aconfig-java{.generated_srcjars}",
		@@ -54,6 +55,7 @@ aconfig_srcjars = [
		":android.app.flags-aconfig-java{.generated_srcjars}",
		":android.credentials.flags-aconfig-java{.generated_srcjars}",
		":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",
		":com.android.server.flags.pinner-aconfig-java{.generated_srcjars}",
		":android.service.voice.flags-aconfig-java{.generated_srcjars}",
		":android.media.tv.flags-aconfig-java{.generated_srcjars}",
		":android.service.autofill.flags-aconfig-java{.generated_srcjars}",
		@@ -583,6 +585,19 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Pinner Service
		aconfig_declarations {
		name: "com.android.server.flags.pinner-aconfig",
		package: "com.android.server.flags",
		srcs: ["services/core/java/com/android/server/flags/pinner.aconfig"],
		}

		java_aconfig_library {
		name: "com.android.server.flags.pinner-aconfig-java",
		aconfig_declarations: "com.android.server.flags.pinner-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Voice
		aconfig_declarations {
		name: "android.service.voice.flags-aconfig",
		@@ -683,6 +698,19 @@ cc_aconfig_library {
		aconfig_declarations: "device_policy_aconfig_flags",
		}

		// Chooser / "Sharesheet"
		aconfig_declarations {
		name: "android.service.chooser.flags-aconfig",
		package: "android.service.chooser",
		srcs: ["core/java/android/service/chooser/flags.aconfig"],
		}

		java_aconfig_library {
		name: "android.service.chooser.flags-aconfig-java",
		aconfig_declarations: "android.service.chooser.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// JobScheduler
		aconfig_declarations {
		name: "framework-jobscheduler-job.flags-aconfig",

api/javadoc-lint-baseline

+0 −14

Original line number	Diff line number	Diff line
		// b/303477132
		android/app/appsearch/AppSearchSchema.java:402: lint: Unresolved link/see tag "#getIndexableNestedProperties()" in android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder [101]
		android/app/appsearch/AppSearchSession.java:55: lint: Unresolved link/see tag "Features#LIST_FILTER_QUERY_LANGUAGE" in android.app.appsearch.AppSearchSession [101]
		android/app/appsearch/AppSearchSession.java:55: lint: Unresolved link/see tag "Features#NUMERIC_SEARCH" in android.app.appsearch.AppSearchSession [101]
		android/app/appsearch/AppSearchSession.java:55: lint: Unresolved link/see tag "Features#VERBATIM_SEARCH" in android.app.appsearch.AppSearchSession [101]
		android/app/appsearch/AppSearchSession.java:55: lint: Unresolved link/see tag "Features#isFeatureSupported" in android.app.appsearch.AppSearchSession [101]
		android/app/appsearch/JoinSpec.java:219: lint: Unresolved link/see tag "android.app.appsearch.SearchSpec.RankingStrategy#RANKING_STRATEGY_JOIN_AGGREGATE_SCORE SearchSpec.RankingStrategy#RANKING_STRATEGY_JOIN_AGGREGATE_SCORE" in android.app.appsearch.JoinSpec.Builder [101]
		android/app/appsearch/SearchSpec.java:230: lint: Unresolved link/see tag "Features#NUMERIC_SEARCH" in android.app.appsearch.SearchSpec [101]
		android/app/appsearch/SearchSpec.java:237: lint: Unresolved link/see tag "Features#VERBATIM_SEARCH" in android.app.appsearch.SearchSpec [101]
		android/app/appsearch/SearchSpec.java:244: lint: Unresolved link/see tag "Features#LIST_FILTER_QUERY_LANGUAGE" in android.app.appsearch.SearchSpec [101]
		android/app/appsearch/SearchSpec.java:913: lint: Unresolved link/see tag "Features#NUMERIC_SEARCH" in android.app.appsearch.SearchSpec.Builder [101]
		android/app/appsearch/SearchSpec.java:925: lint: Unresolved link/see tag "Features#VERBATIM_SEARCH" in android.app.appsearch.SearchSpec.Builder [101]
		android/app/appsearch/SearchSpec.java:929: lint: Unresolved link/see tag "Features#LIST_FILTER_QUERY_LANGUAGE" in android.app.appsearch.SearchSpec.Builder [101]

		// b/303582215
		android/hardware/camera2/CameraCharacteristics.java:2169: lint: Unresolved link/see tag "android.hardware.camera2.CameraDevice#stream-use-case-capability-additional-guaranteed-configurations guideline" in android.hardware.camera2.CameraCharacteristics [101]
		android/hardware/camera2/CameraCharacteristics.java:2344: lint: Unresolved link/see tag "android.hardware.camera2.CameraDevice#concurrent-stream-guaranteed-configurations guideline" in android.hardware.camera2.CameraCharacteristics [101]

core/api/test-current.txt

+24 −0

Original line number	Diff line number	Diff line
		@@ -780,6 +780,25 @@ package android.app.job {

		}

		package android.app.pinner {

		@FlaggedApi("android.app.pinner_service_client_api") public final class PinnedFileStat implements android.os.Parcelable {
		ctor @FlaggedApi("android.app.pinner_service_client_api") public PinnedFileStat(@NonNull String, long, @NonNull String);
		method @FlaggedApi("android.app.pinner_service_client_api") public int describeContents();
		method @FlaggedApi("android.app.pinner_service_client_api") public long getBytesPinned();
		method @FlaggedApi("android.app.pinner_service_client_api") @NonNull public String getFilename();
		method @FlaggedApi("android.app.pinner_service_client_api") @NonNull public String getGroupName();
		method @FlaggedApi("android.app.pinner_service_client_api") public void writeToParcel(@NonNull android.os.Parcel, int);
		field @FlaggedApi("android.app.pinner_service_client_api") @NonNull public static final android.os.Parcelable.Creator<android.app.pinner.PinnedFileStat> CREATOR;
		}

		@FlaggedApi("android.app.pinner_service_client_api") public class PinnerServiceClient {
		ctor @FlaggedApi("android.app.pinner_service_client_api") public PinnerServiceClient();
		method @FlaggedApi("android.app.pinner_service_client_api") @NonNull public java.util.List<android.app.pinner.PinnedFileStat> getPinnerStats();
		}

		}

		package android.app.prediction {

		public final class AppPredictor {
		@@ -4201,8 +4220,13 @@ package android.window {
		public static class WindowInfosListenerForTest.WindowInfo {
		field @NonNull public final android.graphics.Rect bounds;
		field public final int displayId;
		field public final boolean isDuplicateTouchToWallpaper;
		field public final boolean isFocusable;
		field public final boolean isPreventSplitting;
		field public final boolean isTouchable;
		field public final boolean isTrustedOverlay;
		field public final boolean isVisible;
		field public final boolean isWatchOutsideTouch;
		field @NonNull public final String name;
		field @NonNull public final android.graphics.Matrix transform;
		field @NonNull public final android.os.IBinder windowToken;

core/java/Android.bp

+9 −0

Original line number	Diff line number	Diff line
		@@ -546,6 +546,15 @@ filegroup {
		],
		}

		// PackageManager common
		filegroup {
		name: "framework-pm-common-shared-srcs",
		srcs: [
		"com/android/server/pm/pkg/AndroidPackage.java",
		"com/android/server/pm/pkg/AndroidPackageSplit.java",
		],
		}

		java_library {
		name: "protolog-lib",
		platform_apis: true,

core/java/android/app/IActivityTaskManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ interface IActivityTaskManager {
		* A splash screen view has copied.
		*/
		void onSplashScreenViewCopyFinished(int taskId,
		in SplashScreenView.SplashScreenViewParcelable material);
		in @nullable SplashScreenView.SplashScreenViewParcelable material);

		/**
		* When the Picture-in-picture state has changed.