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

Fix PackageManager did not recognize OTA when only upgrade product

Browse Source 
- Introduce the PackagePartitions.FINGERPRINT to represent the
  fingerprint of the build and all system partitions. Using it to
  determine whether the system update has occurred.

- Update PackageManager relating modules to replace Build.FINGERPRINT
  with the PackagePartitions.FINGERPRINT.

Bug: 135224411
Test: atest PackagePartitionsTest
Change-Id: I4c6244cd71cd0954b4d551f62b81b6ce3e2c4b17
This commit is contained in:
Rhed Jao
2021-11-15 20:07:29 +08:00
parent 8181f28f1b
commit d150569b03
9 changed files with 148 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
core/java/android/content/pm/PackagePartitions.java
View File

@@ -19,8 +19,11 @@ package android.content.pm;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.os.Build;
import android.os.Build.Partition;
import android.os.Environment;
import android.os.FileUtils;
import android.os.SystemProperties;
import com.android.internal.annotations.VisibleForTesting;
@@ -64,19 +67,33 @@ public class PackagePartitions {
*/
private static final ArrayList<SystemPartition> SYSTEM_PARTITIONS =
new ArrayList<>(Arrays.asList(
new SystemPartition(Environment.getRootDirectory(), PARTITION_SYSTEM,
new SystemPartition(Environment.getRootDirectory(),
PARTITION_SYSTEM, Partition.PARTITION_NAME_SYSTEM,
true /* containsPrivApp */, false /* containsOverlay */),
new SystemPartition(Environment.getVendorDirectory(), PARTITION_VENDOR,
new SystemPartition(Environment.getVendorDirectory(),
PARTITION_VENDOR, Partition.PARTITION_NAME_VENDOR,
true /* containsPrivApp */, true /* containsOverlay */),
new SystemPartition(Environment.getOdmDirectory(), PARTITION_ODM,
new SystemPartition(Environment.getOdmDirectory(),
PARTITION_ODM, Partition.PARTITION_NAME_ODM,
true /* containsPrivApp */, true /* containsOverlay */),
new SystemPartition(Environment.getOemDirectory(), PARTITION_OEM,
new SystemPartition(Environment.getOemDirectory(),
PARTITION_OEM, Partition.PARTITION_NAME_OEM,
false /* containsPrivApp */, true /* containsOverlay */),
new SystemPartition(Environment.getProductDirectory(), PARTITION_PRODUCT,
new SystemPartition(Environment.getProductDirectory(),
PARTITION_PRODUCT, Partition.PARTITION_NAME_PRODUCT,
true /* containsPrivApp */, true /* containsOverlay */),
new SystemPartition(Environment.getSystemExtDirectory(), PARTITION_SYSTEM_EXT,
new SystemPartition(Environment.getSystemExtDirectory(),
PARTITION_SYSTEM_EXT, Partition.PARTITION_NAME_SYSTEM_EXT,
true /* containsPrivApp */, true /* containsOverlay */)));
/**
* A string to represent the fingerprint of this build and all package partitions. Using it to
* determine whether the system update has occurred. Different from {@link Build#FINGERPRINT},
* this string is digested from the fingerprints of the build and all package partitions to
* help detect the partition update.
*/
public static final String FINGERPRINT = getFingerprint();
/**
* Returns a list in which the elements are products of the specified function applied to the
* list of {@link #SYSTEM_PARTITIONS} in increasing specificity order.
@@ -101,12 +118,32 @@ public class PackagePartitions {
}
}
/**
* Returns a fingerprint string for this build and all package partitions. The string is
* digested from the fingerprints of the build and all package partitions.
*
* @return A string to represent the fingerprint of this build and all package partitions.
*/
@NonNull
private static String getFingerprint() {
final String[] digestProperties = new String[SYSTEM_PARTITIONS.size() + 1];
for (int i = 0; i < SYSTEM_PARTITIONS.size(); i++) {
final String partitionName = SYSTEM_PARTITIONS.get(i).getName();
digestProperties[i] = "ro." + partitionName + ".build.fingerprint";
}
digestProperties[SYSTEM_PARTITIONS.size()] = "ro.build.fingerprint"; // build fingerprint
return SystemProperties.digestOf(digestProperties);
}
/** Represents a partition that contains application packages. */
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
public static class SystemPartition {
@PartitionType
public final int type;
@NonNull
private final String mName;
@NonNull
private final DeferredCanonicalFile mFolder;
@@ -122,9 +159,10 @@ public class PackagePartitions {
@NonNull
private final File mNonConicalFolder;
private SystemPartition(@NonNull File folder, @PartitionType int type,
private SystemPartition(@NonNull File folder, @PartitionType int type, String name,
boolean containsPrivApp, boolean containsOverlay) {
this.type = type;
this.mName = name;
this.mFolder = new DeferredCanonicalFile(folder);
this.mAppFolder = new DeferredCanonicalFile(folder, "app");
this.mPrivAppFolder = containsPrivApp ? new DeferredCanonicalFile(folder, "priv-app")
@@ -136,6 +174,7 @@ public class PackagePartitions {
public SystemPartition(@NonNull SystemPartition original) {
this.type = original.type;
this.mName = original.mName;
this.mFolder = new DeferredCanonicalFile(original.mFolder.getFile());
this.mAppFolder = original.mAppFolder;
this.mPrivAppFolder = original.mPrivAppFolder;
@@ -148,10 +187,19 @@ public class PackagePartitions {
* different root folder.
*/
public SystemPartition(@NonNull File rootFolder, @NonNull SystemPartition partition) {
this(rootFolder, partition.type, partition.mPrivAppFolder != null,
this(rootFolder, partition.type, partition.mName, partition.mPrivAppFolder != null,
partition.mOverlayFolder != null);
}
/**
* Returns the name identifying the partition.
* @see Partition
*/
@NonNull
public String getName() {
return mName;
}
/** Returns the canonical folder of the partition. */
@NonNull
public File getFolder() {