Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alex Buynytskyy
2021-02-25 02:42:52 +00:00
committed by Android (Google) Code Review
parent 7ff46d7137 414d9ecc26
commit 02492968c6
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/pm/PackageManager.java
View File

@@ -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

8
core/java/android/os/incremental/IncrementalManager.java
View File

@@ -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;
}
/**

6
core/java/com/android/server/SystemConfig.java
View File

@@ -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) {