Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99afc665 authored Feb 25, 2021 by Alex Buynytskyy Committed by Automerger Merge Worker Feb 25, 2021

Merge "API feedback: getVersion instead of isV2." into sc-dev am: 02492968

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676256

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iedc9f7ed0ccd583c462ddb740e38fefed11db9af

parents 069d96e7 02492968

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3601,7 +3601,7 @@ public abstract class PackageManager {
		* 1 - IncFs v1, core features, no PerUid support. Optional in R.
		* 2 - IncFs v2, PerUid support, fs-verity support. Required in S.
		*
		* @see IncrementalManager#isFeatureEnabled and IncrementalManager#isV2()
		* @see IncrementalManager#getVersion()
		* @hide
		*/
		@SystemApi

core/java/android/os/incremental/IncrementalManager.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -241,10 +241,12 @@ public final class IncrementalManager {
		}

		/**
		* Checks if device supports V2 calls (e.g. PerUid).
		* 0 - IncFs is disabled.
		* 1 - IncFs v1, core features, no PerUid support. Optional in R.
		* 2 - IncFs v2, PerUid support, fs-verity support. Required in S.
		*/
		public static boolean isV2Available() {
		return nativeIsV2Available();
		public static int getVersion() {
		return nativeIsEnabled() ? nativeIsV2Available() ? 2 : 1 : 0;
		}

		/**

core/java/com/android/server/SystemConfig.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1234,10 +1234,10 @@ public class SystemConfig {
		addFeature(PackageManager.FEATURE_RAM_NORMAL, 0);
		}

		if (IncrementalManager.isFeatureEnabled()) {
		final int incrementalVersion = IncrementalManager.getVersion();
		if (incrementalVersion > 0) {
		addFeature(PackageManager.FEATURE_INCREMENTAL_DELIVERY, 0);
		addFeature(PackageManager.FEATURE_INCREMENTAL_DELIVERY_VERSION,
		IncrementalManager.isV2Available() ? 2 : 1);
		addFeature(PackageManager.FEATURE_INCREMENTAL_DELIVERY_VERSION, incrementalVersion);
		}

		if (PackageManager.APP_ENUMERATION_ENABLED_BY_DEFAULT) {