Make PackageImpl SigningDetails non-null

In preparation for non-null by default PackageState APIs.

Test: presubmit

Change-Id: Ib53ad5f99e88d4eb67cedd1551e1f47a6d7a5482
This commit is contained in:
Winson Chiu
2022-07-22 18:54:07 +00:00
parent 00c545be97
commit 634a349332
4 changed files with 8 additions and 7 deletions

View File

@@ -22,7 +22,6 @@ import android.annotation.Nullable;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import com.android.server.pm.pkg.SELinuxUtil;
import android.content.pm.SigningDetails;
import android.content.res.TypedArray;
import android.os.Environment;
@@ -35,6 +34,7 @@ import com.android.internal.util.CollectionUtils;
import com.android.internal.util.DataClass;
import com.android.internal.util.Parcelling.BuiltIn.ForInternedString;
import com.android.server.pm.parsing.PackageInfoUtils;
import com.android.server.pm.pkg.SELinuxUtil;
import com.android.server.pm.pkg.component.ComponentMutateUtils;
import com.android.server.pm.pkg.component.ParsedActivity;
import com.android.server.pm.pkg.component.ParsedProvider;
@@ -255,7 +255,7 @@ public class PackageImpl extends ParsingPackageImpl implements ParsedPackage, An
}
@Override
public PackageImpl setSigningDetails(@Nullable SigningDetails value) {
public PackageImpl setSigningDetails(@NonNull SigningDetails value) {
super.setSigningDetails(value);
return this;
}

View File

@@ -334,7 +334,7 @@ public interface ParsingPackage extends ParsingPackageRead {
ParsingPackage setSharedUserLabel(int sharedUserLabel);
ParsingPackage setSigningDetails(SigningDetails signingDetails);
ParsingPackage setSigningDetails(@NonNull SigningDetails signingDetails);
ParsingPackage setSplitClassLoaderName(int splitIndex, String classLoaderName);

View File

@@ -317,8 +317,8 @@ public class ParsingPackageImpl implements ParsingPackage, ParsingPackageHidden,
@Nullable
@DataClass.ParcelWith(ForInternedString.class)
protected String volumeUuid;
@Nullable
private SigningDetails signingDetails;
@NonNull
private SigningDetails signingDetails = SigningDetails.UNKNOWN;
@NonNull
@DataClass.ParcelWith(ForInternedString.class)
@@ -1873,7 +1873,7 @@ public class ParsingPackageImpl implements ParsingPackage, ParsingPackageHidden,
return volumeUuid;
}
@Nullable
@NonNull
@Override
public SigningDetails getSigningDetails() {
return signingDetails;
@@ -2474,7 +2474,7 @@ public class ParsingPackageImpl implements ParsingPackage, ParsingPackageHidden,
}
@Override
public ParsingPackageImpl setSigningDetails(@Nullable SigningDetails value) {
public ParsingPackageImpl setSigningDetails(@NonNull SigningDetails value) {
signingDetails = value;
return this;
}

View File

@@ -188,6 +188,7 @@ public interface ParsingPackageRead extends PkgWithoutStateAppInfo, PkgWithoutSt
* The signature data of all APKs in this package, which must be exactly the same across the
* base and splits.
*/
@NonNull
SigningDetails getSigningDetails();
/**