Snap for 10929702 from f2a089d330eb9f227f9ebec6371e33cbdcbd5437 to 24Q1-release (e3448569) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -243,6 +243,11 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		cc_aconfig_library {
		name: "aconfig_view_flags_c_lib",
		aconfig_declarations: "android.view.flags-aconfig",
		}

		// View.accessibility
		aconfig_declarations {
		name: "android.view.accessibility.flags-aconfig",

core/api/current.txt

+10 −3

Original line number	Diff line number	Diff line
		@@ -10992,6 +10992,7 @@ package android.content {
		field public static final String ACTION_PACKAGE_REMOVED = "android.intent.action.PACKAGE_REMOVED";
		field public static final String ACTION_PACKAGE_REPLACED = "android.intent.action.PACKAGE_REPLACED";
		field public static final String ACTION_PACKAGE_RESTARTED = "android.intent.action.PACKAGE_RESTARTED";
		field @FlaggedApi("android.content.pm.stay_stopped") public static final String ACTION_PACKAGE_UNSTOPPED = "android.intent.action.PACKAGE_UNSTOPPED";
		field public static final String ACTION_PACKAGE_VERIFIED = "android.intent.action.PACKAGE_VERIFIED";
		field public static final String ACTION_PASTE = "android.intent.action.PASTE";
		field public static final String ACTION_PICK = "android.intent.action.PICK";
		@@ -12673,6 +12674,7 @@ package android.content.pm {
		method public boolean isDeviceUpgrading();
		method public abstract boolean isInstantApp();
		method public abstract boolean isInstantApp(@NonNull String);
		method @FlaggedApi("android.content.pm.stay_stopped") public boolean isPackageStopped(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
		method public boolean isPackageSuspended(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
		method public boolean isPackageSuspended();
		method @CheckResult public abstract boolean isPermissionRevokedByPolicy(@NonNull String, @NonNull String);
		@@ -17666,6 +17668,7 @@ package android.graphics.text {
		field public static final int LINE_BREAK_STYLE_LOOSE = 1; // 0x1
		field public static final int LINE_BREAK_STYLE_NONE = 0; // 0x0
		field public static final int LINE_BREAK_STYLE_NORMAL = 2; // 0x2
		field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int LINE_BREAK_STYLE_NO_BREAK = 4; // 0x4
		field public static final int LINE_BREAK_STYLE_STRICT = 3; // 0x3
		field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int LINE_BREAK_STYLE_UNSPECIFIED = -1; // 0xffffffff
		field public static final int LINE_BREAK_WORD_STYLE_NONE = 0; // 0x0
		@@ -46672,10 +46675,10 @@ package android.text {
		method @NonNull public android.text.DynamicLayout.Builder setHyphenationFrequency(int);
		method @NonNull public android.text.DynamicLayout.Builder setIncludePad(boolean);
		method @NonNull public android.text.DynamicLayout.Builder setJustificationMode(int);
		method @NonNull public android.text.DynamicLayout.Builder setLineBreakConfig(@NonNull android.graphics.text.LineBreakConfig);
		method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.text.DynamicLayout.Builder setLineBreakConfig(@NonNull android.graphics.text.LineBreakConfig);
		method @NonNull public android.text.DynamicLayout.Builder setLineSpacing(float, @FloatRange(from=0.0) float);
		method @NonNull public android.text.DynamicLayout.Builder setTextDirection(@NonNull android.text.TextDirectionHeuristic);
		method @NonNull public android.text.DynamicLayout.Builder setUseBoundsForWidth(boolean);
		method @FlaggedApi("com.android.text.flags.use_bounds_for_width") @NonNull public android.text.DynamicLayout.Builder setUseBoundsForWidth(boolean);
		method @NonNull public android.text.DynamicLayout.Builder setUseLineSpacingFromFallbacks(boolean);
		}

		@@ -47199,7 +47202,7 @@ package android.text {
		method @NonNull public android.text.StaticLayout.Builder setMaxLines(@IntRange(from=0) int);
		method public android.text.StaticLayout.Builder setText(CharSequence);
		method @NonNull public android.text.StaticLayout.Builder setTextDirection(@NonNull android.text.TextDirectionHeuristic);
		method @NonNull public android.text.StaticLayout.Builder setUseBoundsForWidth(boolean);
		method @FlaggedApi("com.android.text.flags.use_bounds_for_width") @NonNull public android.text.StaticLayout.Builder setUseBoundsForWidth(boolean);
		method @NonNull public android.text.StaticLayout.Builder setUseLineSpacingFromFallbacks(boolean);
		}

		@@ -47912,6 +47915,10 @@ package android.text.style {
		method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.graphics.text.LineBreakConfig getLineBreakConfig();
		}

		@FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final class LineBreakConfigSpan.NoBreakSpan extends android.text.style.LineBreakConfigSpan {
		ctor @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public LineBreakConfigSpan.NoBreakSpan();
		}

		@FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final class LineBreakConfigSpan.NoHyphenationSpan extends android.text.style.LineBreakConfigSpan {
		ctor @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public LineBreakConfigSpan.NoHyphenationSpan();
		}

core/api/test-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -3283,12 +3283,12 @@ package android.text {
		}

		public class MeasuredParagraph {
		method @NonNull public static android.text.MeasuredParagraph buildForStaticLayoutTest(@NonNull android.text.TextPaint, @Nullable android.graphics.text.LineBreakConfig, @NonNull CharSequence, @IntRange(from=0) int, @IntRange(from=0) int, @NonNull android.text.TextDirectionHeuristic, int, boolean, @Nullable android.text.MeasuredParagraph.StyleRunCallback);
		method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public static android.text.MeasuredParagraph buildForStaticLayoutTest(@NonNull android.text.TextPaint, @Nullable android.graphics.text.LineBreakConfig, @NonNull CharSequence, @IntRange(from=0) int, @IntRange(from=0) int, @NonNull android.text.TextDirectionHeuristic, int, boolean, @Nullable android.text.MeasuredParagraph.StyleRunCallback);
		}

		public static interface MeasuredParagraph.StyleRunCallback {
		method public void onAppendReplacementRun(@NonNull android.graphics.Paint, @IntRange(from=0) int, @FloatRange(from=0) @Px float);
		method public void onAppendStyleRun(@NonNull android.graphics.Paint, @Nullable android.graphics.text.LineBreakConfig, @IntRange(from=0) int, boolean);
		@FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static interface MeasuredParagraph.StyleRunCallback {
		method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public void onAppendReplacementRun(@NonNull android.graphics.Paint, @IntRange(from=0) int, @FloatRange(from=0) @Px float);
		method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public void onAppendStyleRun(@NonNull android.graphics.Paint, @Nullable android.graphics.text.LineBreakConfig, @IntRange(from=0) int, boolean);
		}

		public static final class Selection.MemoryTextWatcher implements android.text.TextWatcher {

core/java/Android.bp

+10 −0

Original line number	Diff line number	Diff line
		@@ -431,6 +431,16 @@ aidl_interface {
		},
		}

		aidl_interface {
		name: "android.companion.virtual.virtualdevice_aidl",
		unstable: true,
		host_supported: true,
		srcs: [
		"android/companion/virtualnative/IVirtualDeviceManagerNative.aidl",
		],
		local_include_dir: ".",
		}

		filegroup {
		name: "frameworks-base-java-overview",
		srcs: ["overview.html"],

core/java/android/app/AppOpsManager.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -1478,7 +1478,8 @@ public class AppOpsManager {
		AppProtoEnums.APP_OP_RECORD_AUDIO_SANDBOXED;

		/**
		* Allows the assistant app to receive the PCC-validated hotword and be voice-triggered.
		* Allows the assistant app to be voice-triggered by detected hotwords from a trusted detection
		* service.
		*
		* @hide
		*/
		@@ -2252,7 +2253,8 @@ public class AppOpsManager {
		public static final String OPSTR_USE_FULL_SCREEN_INTENT = "android:use_full_screen_intent";

		/**
		* Allows the assistant app to receive the PCC-validated hotword and be voice-triggered.
		* Allows the assistant app to be voice-triggered by detected hotwords from a trusted detection
		* service.
		*
		* @hide
		*/
		@@ -2379,7 +2381,8 @@ public class AppOpsManager {
		OP_RUN_USER_INITIATED_JOBS,
		OP_FOREGROUND_SERVICE_SPECIAL_USE,
		OP_CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD,
		OP_USE_FULL_SCREEN_INTENT
		OP_USE_FULL_SCREEN_INTENT,
		OP_RECEIVE_SANDBOX_TRIGGER_AUDIO
		};

		static final AppOpInfo[] sAppOpInfos = new AppOpInfo[]{
		@@ -2810,7 +2813,8 @@ public class AppOpsManager {
		new AppOpInfo.Builder(OP_RECEIVE_SANDBOX_TRIGGER_AUDIO,
		OPSTR_RECEIVE_SANDBOX_TRIGGER_AUDIO,
		"RECEIVE_SANDBOX_TRIGGER_AUDIO")
		.setDefaultMode(AppOpsManager.MODE_ALLOWED).build(),
		.setPermission(Manifest.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO)
		.setDefaultMode(AppOpsManager.MODE_DEFAULT).build(),
		new AppOpInfo.Builder(OP_RECEIVE_TRUSTED_PROCESS_TRAINING_DATA,
		OPSTR_RECEIVE_TRUSTED_PROCESS_TRAINING_DATA,
		"RECEIVE_TRUSTED_PROCESS_TRAINING_DATA").build()