Snap for 11619294 from 04f59b8f73dd62468452d9152c66774d97dd185f to 24Q3-release (4fc70f90) · Commits · e / os / android_frameworks_base

core/java/android/app/SystemServiceRegistry.java

+34 −2

Original line number	Diff line number	Diff line
		@@ -66,6 +66,8 @@ import android.companion.ICompanionDeviceManager;
		import android.companion.virtual.IVirtualDeviceManager;
		import android.companion.virtual.VirtualDeviceManager;
		import android.compat.Compatibility;
		import android.compat.annotation.ChangeId;
		import android.compat.annotation.EnabledSince;
		import android.content.ClipboardManager;
		import android.content.ContentCaptureOptions;
		import android.content.Context;
		@@ -196,6 +198,7 @@ import android.os.ServiceManager;
		import android.os.ServiceManager.ServiceNotFoundException;
		import android.os.StatsFrameworkInitializer;
		import android.os.SystemConfigManager;
		import android.os.SystemProperties;
		import android.os.SystemUpdateManager;
		import android.os.SystemVibrator;
		import android.os.SystemVibratorManager;
		@@ -285,6 +288,18 @@ public final class SystemServiceRegistry {
		/** @hide */
		public static boolean sEnableServiceNotFoundWtf = false;

		/**
		* Starting with {@link VANILLA_ICE_CREAM}, Telephony feature flags
		* (e.g. {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}) are being checked before
		* returning managers that depend on them. If the feature is missing,
		* {@link Context#getSystemService} will return null.
		*
		* This change is specific to VcnManager.
		*/
		@ChangeId
		@EnabledSince(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM)
		static final long ENABLE_CHECKING_TELEPHONY_FEATURES_FOR_VCN = 330902016;

		// Service registry information.
		// This information is never changed once static initialization has completed.
		private static final Map<Class<?>, String> SYSTEM_SERVICE_NAMES =
		@@ -450,7 +465,8 @@ public final class SystemServiceRegistry {
		new CachedServiceFetcher<VcnManager>() {
		@Override
		public VcnManager createService(ContextImpl ctx) throws ServiceNotFoundException {
		if (!ctx.getPackageManager().hasSystemFeature(
		if (shouldCheckTelephonyFeatures()
		&& !ctx.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) {
		return null;
		}
		@@ -1748,6 +1764,22 @@ public final class SystemServiceRegistry {
		return manager.hasSystemFeature(featureName);
		}

		// Suppressing AndroidFrameworkCompatChange because we're querying vendor
		// partition SDK level, not application's target SDK version (which BTW we
		// also check through Compatibility framework a few lines below).
		@SuppressWarnings("AndroidFrameworkCompatChange")
		private static boolean shouldCheckTelephonyFeatures() {
		// Check SDK version of the vendor partition. Pre-V devices might have
		// incorrectly under-declared telephony features.
		final int vendorApiLevel = SystemProperties.getInt(
		"ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT);
		if (vendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) return false;

		// Check SDK version of the client app. Apps targeting pre-V SDK might
		// have not checked for existence of these features.
		return Compatibility.isChangeEnabled(ENABLE_CHECKING_TELEPHONY_FEATURES_FOR_VCN);
		}

		/**
		* Gets a system service from a given context.
		* @hide

core/java/android/content/pm/PackageManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,15 @@ public abstract class PackageManager {
		public static final String PROPERTY_LEGACY_UPDATE_OWNERSHIP_DENYLIST =
		"android.app.PROPERTY_LEGACY_UPDATE_OWNERSHIP_DENYLIST";

		/**
		* Application level {@link android.content.pm.PackageManager.Property PackageManager
		* .Property} for a app to inform the installer that a file containing the app's android
		* safety label data is bundled into the APK at the given path.
		* @hide
		*/
		public static final String PROPERTY_ANDROID_SAFETY_LABEL_PATH =
		"android.content.SAFETY_LABEL_PATH";

		/**
		* A property value set within the manifest.
		* <p>

core/java/android/os/flags.aconfig

+40 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,46 @@ flag {
		bug: "315894228"
		}

		flag {
		name: "adpf_use_fmq_channel_fixed"
		namespace: "game"
		description: "Guards use of the FMQ channel for ADPF with a readonly flag"
		is_fixed_read_only: true
		bug: "315894228"
		}

		flag {
		name: "adpf_fmq_eager_send"
		namespace: "game"
		description: "Guards the use of an eager-sending optimization in FMQ for low-latency messages"
		is_fixed_read_only: true
		bug: "315894228"
		}

		flag {
		name: "adpf_hwui_gpu"
		namespace: "game"
		description: "Guards use of the FMQ channel for ADPF"
		is_fixed_read_only: true
		bug: "330922490"
		}

		flag {
		name: "adpf_obtainview_boost"
		namespace: "game"
		description: "Guards use of a boost in response to HWUI obtainView"
		is_fixed_read_only: true
		bug: "328238660"
		}

		flag {
		name: "adpf_platform_power_efficiency"
		namespace: "game"
		description: "Guards use of the ADPF power efficiency API within the platform"
		is_fixed_read_only: true
		bug: "277285195"
		}

		flag {
		name: "battery_service_support_current_adb_command"
		namespace: "backstage_power"

core/java/com/android/internal/pm/parsing/pkg/PackageImpl.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -421,8 +421,6 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal,
		@NonNull
		private String[] mUsesStaticLibrariesSorted;

		private boolean mAppMetadataFileInApk = false;

		@NonNull
		public static PackageImpl forParsing(@NonNull String packageName, @NonNull String baseCodePath,
		@NonNull String codePath, @NonNull TypedArray manifestArray, boolean isCoreApp,
		@@ -1065,11 +1063,6 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal,
		return memtagMode;
		}

		@Override
		public boolean isAppMetadataFileInApk() {
		return mAppMetadataFileInApk;
		}

		@Nullable
		@Override
		public Bundle getMetaData() {
		@@ -2157,12 +2150,6 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal,
		return this;
		}

		@Override
		public PackageImpl setAppMetadataFileInApk(boolean fileInApk) {
		mAppMetadataFileInApk = fileInApk;
		return this;
		}

		@Override
		public PackageImpl setMetaData(@Nullable Bundle value) {
		metaData = value;
		@@ -3277,7 +3264,6 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal,
		dest.writeLong(this.mBooleans);
		dest.writeLong(this.mBooleans2);
		dest.writeBoolean(this.mAllowCrossUidActivitySwitchFromBelow);
		dest.writeBoolean(this.mAppMetadataFileInApk);
		}

		public PackageImpl(Parcel in) {
		@@ -3445,7 +3431,6 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal,
		this.mBooleans = in.readLong();
		this.mBooleans2 = in.readLong();
		this.mAllowCrossUidActivitySwitchFromBelow = in.readBoolean();
		this.mAppMetadataFileInApk = in.readBoolean();

		assignDerivedFields();
		assignDerivedFields2();

core/java/com/android/internal/pm/parsing/pkg/ParsedPackage.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -127,7 +127,4 @@ public interface ParsedPackage extends AndroidPackage {
		ParsedPackage setDirectBootAware(boolean directBootAware);

		ParsedPackage setPersistent(boolean persistent);

		/** Retrieves whether the apk contains a app metadata file. */
		boolean isAppMetadataFileInApk();
		}