Snap for 11597038 from 647cddb91355d2382d5925de805a0af80e232907 to 24Q3-release (d3f6567b) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+13 −0

Original line number	Diff line number	Diff line
		@@ -335,6 +335,11 @@ java_aconfig_library {
		aconfig_declarations: "android.os.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		mode: "exported",
		min_sdk_version: "30",
		apex_available: [
		"//apex_available:platform",
		"com.android.mediaprovider",
		],
		}

		cc_aconfig_library {
		@@ -716,6 +721,7 @@ aconfig_declarations {
		name: "android.credentials.flags-aconfig",
		package: "android.credentials.flags",
		srcs: ["core/java/android/credentials/flags.aconfig"],
		exportable: true,
		}

		java_aconfig_library {
		@@ -724,6 +730,13 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		java_aconfig_library {
		name: "android.credentials.flags-aconfig-java-export",
		aconfig_declarations: "android.credentials.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		mode: "exported",
		}

		// Content Protection
		aconfig_declarations {
		name: "android.view.contentprotection.flags-aconfig",

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,6 @@ java_defaults {
		// TODO(b/120066492): remove gps_debug and protolog.conf.json when the build
		// system propagates "required" properly.
		"gps_debug.conf",
		"protolog.conf.json.gz",
		"core.protolog.pb",
		"framework-res",
		// any install dependencies should go into framework-minus-apex-install-dependencies

core/java/android/app/SystemServiceRegistry.java

+20 −2

Original line number	Diff line number	Diff line
		@@ -450,6 +450,11 @@ public final class SystemServiceRegistry {
		new CachedServiceFetcher<VcnManager>() {
		@Override
		public VcnManager createService(ContextImpl ctx) throws ServiceNotFoundException {
		if (!ctx.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) {
		return null;
		}

		IBinder b = ServiceManager.getService(Context.VCN_MANAGEMENT_SERVICE);
		IVcnManagementService service = IVcnManagementService.Stub.asInterface(b);
		return new VcnManager(ctx, service);
		@@ -1736,6 +1741,13 @@ public final class SystemServiceRegistry {
		return fetcher;
		}

		private static boolean hasSystemFeatureOpportunistic(@NonNull ContextImpl ctx,
		@NonNull String featureName) {
		PackageManager manager = ctx.getPackageManager();
		if (manager == null) return true;
		return manager.hasSystemFeature(featureName);
		}

		/**
		* Gets a system service from a given context.
		* @hide
		@@ -1758,12 +1770,18 @@ public final class SystemServiceRegistry {
		case Context.VIRTUALIZATION_SERVICE:
		case Context.VIRTUAL_DEVICE_SERVICE:
		return null;
		case Context.VCN_MANAGEMENT_SERVICE:
		if (!hasSystemFeatureOpportunistic(ctx,
		PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) {
		return null;
		}
		break;
		case Context.SEARCH_SERVICE:
		// Wear device does not support SEARCH_SERVICE so we do not print WTF here
		PackageManager manager = ctx.getPackageManager();
		if (manager != null && manager.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
		if (hasSystemFeatureOpportunistic(ctx, PackageManager.FEATURE_WATCH)) {
		return null;
		}
		break;
		}
		Slog.wtf(TAG, "Manager wrapper not available: " + name);
		return null;

core/java/android/app/admin/flags/flags.aconfig

+10 −0

Original line number	Diff line number	Diff line
		# proto-file: build/make/tools/aconfig/aconfig_protos/protos/aconfig.proto
		# proto-message: flag_declarations

		package: "android.app.admin.flags"

		flag {
		@@ -180,3 +183,10 @@ flag {
		description: "Allow COPE admin to control screen brightness and timeout."
		bug: "323894620"
		}

		flag {
		name: "is_recursive_required_app_merging_enabled"
		namespace: "enterprise"
		description: "Guards a new flow for recursive required enterprise app list merging"
		bug: "319084618"
		}

core/java/android/companion/virtual/VirtualDeviceManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -972,6 +972,7 @@ public final class VirtualDeviceManager {
		*
		* @param config camera configuration.
		* @return newly created camera.
		* @throws UnsupportedOperationException if virtual camera isn't supported on this device.
		* @see VirtualDeviceParams#POLICY_TYPE_CAMERA
		*/
		@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)