Clean up and expose simple AndroidPackage APIs
The remaining simple APIs were exposed except:
- Anything that is based on known derived state that may be overlaid
in the PackageState or PackageUserState (isEnabled)
- The other non-target SDK versions, which are probably better tracked
in the PackageState, and are unlikely to be useful as API
- Anything not inherently immutable, the path for which is not finalized
- Complex APIs spanning multiple methods (resizeable)
- APIs that might be better served by other surfaces
(overlays, SDKs, shared libraries)
API-Coverage-Bug: 262593427
Bug: 235462722
Test: atest AndroidPackageTest
Change-Id: Id08cb58dcf9715ce8771ec203dc395ac4fe0a88e
diff --git a/services/api/current.txt b/services/api/current.txt
index b5798d5..090a449 100644
--- a/services/api/current.txt
+++ b/services/api/current.txt
@@ -72,16 +72,90 @@
package com.android.server.pm.pkg {
public interface AndroidPackage {
+ method @Nullable public String getAppComponentFactory();
+ method @Nullable public String getApplicationClassName();
+ method @Nullable public String getBackupAgentName();
+ method @DrawableRes public int getBannerRes();
+ method public int getBaseRevisionCode();
+ method public int getCategory();
+ method @Nullable public String getClassLoaderName();
+ method @Dimension(unit=android.annotation.Dimension.DP) public int getCompatibleWidthLimitDp();
+ method @XmlRes public int getDataExtractionRulesRes();
+ method @StringRes public int getDescriptionRes();
+ method @XmlRes public int getFullBackupContentRes();
+ method public int getGwpAsanMode();
+ method @DrawableRes public int getIconRes();
+ method @StringRes public int getLabelRes();
+ method @Dimension(unit=android.annotation.Dimension.DP) public int getLargestWidthLimitDp();
method @NonNull public java.util.List<java.lang.String> getLibraryNames();
+ method @XmlRes public int getLocaleConfigRes();
+ method @DrawableRes public int getLogoRes();
+ method public long getLongVersionCode();
+ method public float getMaxAspectRatio();
+ method public float getMinAspectRatio();
+ method public int getNativeHeapZeroInitialized();
+ method @XmlRes public int getNetworkSecurityConfigRes();
+ method @Nullable public String getRequiredAccountType();
+ method @Dimension(unit=android.annotation.Dimension.DP) public int getRequiresSmallestWidthDp();
+ method @Nullable public String getRestrictedAccountType();
+ method @DrawableRes public int getRoundIconRes();
method @Nullable public String getSdkLibraryName();
+ method @Nullable public String getSharedUserId();
+ method @StringRes public int getSharedUserLabelRes();
method @NonNull public java.util.List<com.android.server.pm.pkg.AndroidPackageSplit> getSplits();
method @Nullable public String getStaticSharedLibraryName();
method @NonNull public java.util.UUID getStorageUuid();
method public int getTargetSdkVersion();
+ method @StyleRes public int getThemeRes();
+ method public int getUiOptions();
+ method @Nullable public String getVersionName();
+ method @Nullable public String getZygotePreloadName();
+ method public boolean isAllowAudioPlaybackCapture();
+ method public boolean isAllowBackup();
+ method public boolean isAllowClearUserData();
+ method public boolean isAllowClearUserDataOnFailedRestore();
+ method public boolean isAllowNativeHeapPointerTagging();
+ method public boolean isAllowTaskReparenting();
+ method public boolean isAnyDensity();
+ method public boolean isAttributionsUserVisible();
+ method public boolean isBackupInForeground();
+ method public boolean isCantSaveState();
+ method public boolean isCoreApp();
+ method public boolean isCrossProfile();
method public boolean isDebuggable();
+ method public boolean isDefaultToDeviceProtectedStorage();
+ method public boolean isDirectBootAware();
+ method public boolean isExtractNativeLibs();
+ method public boolean isFactoryTest();
+ method public boolean isForceQueryable();
+ method public boolean isFullBackupOnly();
+ method public boolean isHardwareAccelerated();
+ method public boolean isHasCode();
+ method public boolean isHasFragileUserData();
method public boolean isIsolatedSplitLoading();
+ method public boolean isKillAfterRestore();
+ method public boolean isLargeHeap();
+ method public boolean isLeavingSharedUser();
+ method public boolean isMultiArch();
+ method public boolean isNativeLibraryRootRequiresIsa();
+ method public boolean isOnBackInvokedCallbackEnabled();
+ method public boolean isPersistent();
+ method public boolean isProfileable();
+ method public boolean isProfileableByShell();
+ method public boolean isRequestLegacyExternalStorage();
+ method public boolean isRequiredForAllUsers();
+ method public boolean isResetEnabledSettingsOnAppDataCleared();
+ method public boolean isRestoreAnyVersion();
method public boolean isSignedWithPlatformKey();
+ method public boolean isSupportsExtraLargeScreens();
+ method public boolean isSupportsLargeScreens();
+ method public boolean isSupportsNormalScreens();
+ method public boolean isSupportsRtl();
+ method public boolean isSupportsSmallScreens();
+ method public boolean isTestOnly();
+ method public boolean isUse32BitAbi();
method public boolean isUseEmbeddedDex();
+ method public boolean isUsesCleartextTraffic();
method public boolean isUsesNonSdkApi();
method public boolean isVmSafeMode();
}
diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index d873736..0a59c19 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -2045,7 +2045,8 @@
}
final SharedLibraryInfo libraryInfo = getSharedLibraryInfo(
- ps.getPkg().getStaticSharedLibraryName(), ps.getPkg().getStaticSharedLibVersion());
+ ps.getPkg().getStaticSharedLibraryName(),
+ ps.getPkg().getStaticSharedLibraryVersion());
if (libraryInfo == null) {
return false;
}
diff --git a/services/core/java/com/android/server/pm/DeletePackageHelper.java b/services/core/java/com/android/server/pm/DeletePackageHelper.java
index 9ea1807..3df46a2 100644
--- a/services/core/java/com/android/server/pm/DeletePackageHelper.java
+++ b/services/core/java/com/android/server/pm/DeletePackageHelper.java
@@ -186,7 +186,7 @@
SharedLibraryInfo libraryInfo = null;
if (pkg.getStaticSharedLibraryName() != null) {
libraryInfo = computer.getSharedLibraryInfo(pkg.getStaticSharedLibraryName(),
- pkg.getStaticSharedLibVersion());
+ pkg.getStaticSharedLibraryVersion());
} else if (pkg.getSdkLibraryName() != null) {
libraryInfo = computer.getSharedLibraryInfo(pkg.getSdkLibraryName(),
pkg.getSdkLibVersionMajor());
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index 7049f9a..16bf0fe 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -297,7 +297,7 @@
SharedUserSetting sharedUserSetting = mPm.mSettings.getSharedUserSettingLPr(pkgSetting);
if (sharedUserSetting != null) {
sharedUserSetting.addPackage(pkgSetting);
- if (parsedPackage.isLeavingSharedUid()
+ if (parsedPackage.isLeavingSharedUser()
&& SharedUidMigration.applyStrategy(BEST_EFFORT)
&& sharedUserSetting.isSingleUser()) {
// Attempt the transparent shared UID migration
@@ -1552,7 +1552,7 @@
}
// APK should not re-join shared UID
- if (oldPackage.isLeavingSharedUid() && !parsedPackage.isLeavingSharedUid()) {
+ if (oldPackage.isLeavingSharedUser() && !parsedPackage.isLeavingSharedUser()) {
throw new PrepareFailure(INSTALL_FAILED_UID_CHANGED,
"Package " + parsedPackage.getPackageName()
+ " attempting to rejoin " + newSharedUid);
@@ -3801,7 +3801,7 @@
if (installedPkgSetting == null || !installedPkgSetting.hasSharedUser()) {
// Directly ignore sharedUserSetting for new installs, or if the app has
// already left shared UID
- ignoreSharedUserId = parsedPackage.isLeavingSharedUid();
+ ignoreSharedUserId = parsedPackage.isLeavingSharedUser();
}
if (!ignoreSharedUserId && parsedPackage.getSharedUserId() != null) {
@@ -4324,10 +4324,10 @@
SharedLibraryInfo libInfo = versionedLib.valueAt(i);
final long libVersionCode = libInfo.getDeclaringPackage()
.getLongVersionCode();
- if (libInfo.getLongVersion() < pkg.getStaticSharedLibVersion()) {
+ if (libInfo.getLongVersion() < pkg.getStaticSharedLibraryVersion()) {
minVersionCode = Math.max(minVersionCode, libVersionCode + 1);
} else if (libInfo.getLongVersion()
- > pkg.getStaticSharedLibVersion()) {
+ > pkg.getStaticSharedLibraryVersion()) {
maxVersionCode = Math.min(maxVersionCode, libVersionCode - 1);
} else {
minVersionCode = maxVersionCode = libVersionCode;
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index a52ed8b..eec3649 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -2878,7 +2878,7 @@
static void renameStaticSharedLibraryPackage(ParsedPackage parsedPackage) {
// Derive the new package synthetic package name
parsedPackage.setPackageName(toStaticSharedLibraryPackageName(
- parsedPackage.getPackageName(), parsedPackage.getStaticSharedLibVersion()));
+ parsedPackage.getPackageName(), parsedPackage.getStaticSharedLibraryVersion()));
}
private static String toStaticSharedLibraryPackageName(
diff --git a/services/core/java/com/android/server/pm/PackageSetting.java b/services/core/java/com/android/server/pm/PackageSetting.java
index b18179e..433e7a1 100644
--- a/services/core/java/com/android/server/pm/PackageSetting.java
+++ b/services/core/java/com/android/server/pm/PackageSetting.java
@@ -1386,6 +1386,8 @@
return AndroidPackageUtils.getHiddenApiEnforcementPolicy(getAndroidPackage(), this);
}
+
+
// Code below generated by codegen v1.0.23.
//
// DO NOT MODIFY!
diff --git a/services/core/java/com/android/server/pm/RemovePackageHelper.java b/services/core/java/com/android/server/pm/RemovePackageHelper.java
index 9b6bfd9..eb99536 100644
--- a/services/core/java/com/android/server/pm/RemovePackageHelper.java
+++ b/services/core/java/com/android/server/pm/RemovePackageHelper.java
@@ -234,7 +234,7 @@
}
if (pkg.getStaticSharedLibraryName() != null) {
if (mSharedLibraries.removeSharedLibrary(pkg.getStaticSharedLibraryName(),
- pkg.getStaticSharedLibVersion())) {
+ pkg.getStaticSharedLibraryVersion())) {
if (DEBUG_REMOVE && chatty) {
if (r == null) {
r = new StringBuilder(256);
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 53be787..ff020eb 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -1455,7 +1455,7 @@
void checkAndConvertSharedUserSettingsLPw(SharedUserSetting sharedUser) {
if (!sharedUser.isSingleUser()) return;
final AndroidPackage pkg = sharedUser.getPackageSettings().valueAt(0).getPkg();
- if (pkg != null && pkg.isLeavingSharedUid()
+ if (pkg != null && pkg.isLeavingSharedUser()
&& SharedUidMigration.applyStrategy(BEST_EFFORT)) {
convertSharedUserSettingsLPw(sharedUser);
}
@@ -4857,7 +4857,7 @@
pw.print(prefix); pw.println(" static library:");
pw.print(prefix); pw.print(" ");
pw.print("name:"); pw.print(pkg.getStaticSharedLibraryName());
- pw.print(" version:"); pw.println(pkg.getStaticSharedLibVersion());
+ pw.print(" version:"); pw.println(pkg.getStaticSharedLibraryVersion());
}
if (pkg.getSdkLibraryName() != null) {
diff --git a/services/core/java/com/android/server/pm/SharedLibrariesImpl.java b/services/core/java/com/android/server/pm/SharedLibrariesImpl.java
index 8c2b212..d2ce23e 100644
--- a/services/core/java/com/android/server/pm/SharedLibrariesImpl.java
+++ b/services/core/java/com/android/server/pm/SharedLibrariesImpl.java
@@ -408,7 +408,7 @@
final int versionCount = versionedLib.size();
for (int i = 0; i < versionCount; i++) {
final long libVersion = versionedLib.keyAt(i);
- if (libVersion < pkg.getStaticSharedLibVersion()) {
+ if (libVersion < pkg.getStaticSharedLibraryVersion()) {
previousLibVersion = Math.max(previousLibVersion, libVersion);
}
}
@@ -468,7 +468,7 @@
}
} else if (pkg.getStaticSharedLibraryName() != null) {
SharedLibraryInfo definedLibrary = getSharedLibraryInfo(
- pkg.getStaticSharedLibraryName(), pkg.getStaticSharedLibVersion());
+ pkg.getStaticSharedLibraryName(), pkg.getStaticSharedLibraryVersion());
if (definedLibrary != null) {
action.accept(definedLibrary, libInfo);
}
diff --git a/services/core/java/com/android/server/pm/SharedUserSetting.java b/services/core/java/com/android/server/pm/SharedUserSetting.java
index a7a4c4e..a037ae8 100644
--- a/services/core/java/com/android/server/pm/SharedUserSetting.java
+++ b/services/core/java/com/android/server/pm/SharedUserSetting.java
@@ -253,7 +253,7 @@
}
if (mDisabledPackages.size() == 1) {
final AndroidPackage pkg = mDisabledPackages.valueAt(0).getPkg();
- return pkg != null && pkg.isLeavingSharedUid();
+ return pkg != null && pkg.isLeavingSharedUser();
}
return true;
}
diff --git a/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java b/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java
index 87805e0..ff993ea 100644
--- a/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java
+++ b/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java
@@ -131,7 +131,7 @@
info.splitRevisionCodes = pkg.getSplitRevisionCodes();
info.versionName = pkg.getVersionName();
info.sharedUserId = pkg.getSharedUserId();
- info.sharedUserLabel = pkg.getSharedUserLabel();
+ info.sharedUserLabel = pkg.getSharedUserLabelRes();
info.applicationInfo = applicationInfo;
info.installLocation = pkg.getInstallLocation();
if ((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
@@ -218,7 +218,7 @@
}
}
}
- if (pkg.areAttributionsUserVisible()) {
+ if (pkg.isAttributionsUserVisible()) {
info.applicationInfo.privateFlagsExt
|= ApplicationInfo.PRIVATE_FLAG_EXT_ATTRIBUTIONS_ARE_USER_VISIBLE;
} else {
@@ -869,7 +869,7 @@
public static int appInfoFlags(AndroidPackage pkg, @Nullable PackageStateInternal pkgSetting) {
// @formatter:off
int pkgWithoutStateFlags = flag(pkg.isExternalStorage(), ApplicationInfo.FLAG_EXTERNAL_STORAGE)
- | flag(pkg.isBaseHardwareAccelerated(), ApplicationInfo.FLAG_HARDWARE_ACCELERATED)
+ | flag(pkg.isHardwareAccelerated(), ApplicationInfo.FLAG_HARDWARE_ACCELERATED)
| flag(pkg.isAllowBackup(), ApplicationInfo.FLAG_ALLOW_BACKUP)
| flag(pkg.isKillAfterRestore(), ApplicationInfo.FLAG_KILL_AFTER_RESTORE)
| flag(pkg.isRestoreAnyVersion(), ApplicationInfo.FLAG_RESTORE_ANY_VERSION)
@@ -972,7 +972,7 @@
// @formatter:off
int pkgWithoutStateFlags = flag(pkg.isProfileable(), ApplicationInfo.PRIVATE_FLAG_EXT_PROFILEABLE)
| flag(pkg.hasRequestForegroundServiceExemption(), ApplicationInfo.PRIVATE_FLAG_EXT_REQUEST_FOREGROUND_SERVICE_EXEMPTION)
- | flag(pkg.areAttributionsUserVisible(), ApplicationInfo.PRIVATE_FLAG_EXT_ATTRIBUTIONS_ARE_USER_VISIBLE)
+ | flag(pkg.isAttributionsUserVisible(), ApplicationInfo.PRIVATE_FLAG_EXT_ATTRIBUTIONS_ARE_USER_VISIBLE)
| flag(pkg.isOnBackInvokedCallbackEnabled(), ApplicationInfo.PRIVATE_FLAG_EXT_ENABLE_ON_BACK_INVOKED_CALLBACK)
| flag(isAllowlistedForHiddenApis, ApplicationInfo.PRIVATE_FLAG_EXT_ALLOWLISTED_FOR_HIDDEN_APIS);
return appInfoPrivateFlagsExt(pkgWithoutStateFlags, pkgSetting);
diff --git a/services/core/java/com/android/server/pm/parsing/pkg/AndroidPackageUtils.java b/services/core/java/com/android/server/pm/parsing/pkg/AndroidPackageUtils.java
index 4fee84f..f3ee531 100644
--- a/services/core/java/com/android/server/pm/parsing/pkg/AndroidPackageUtils.java
+++ b/services/core/java/com/android/server/pm/parsing/pkg/AndroidPackageUtils.java
@@ -103,7 +103,7 @@
return new SharedLibraryInfo(null, pkg.getPackageName(),
AndroidPackageUtils.getAllCodePaths(pkg),
pkg.getStaticSharedLibraryName(),
- pkg.getStaticSharedLibVersion(),
+ pkg.getStaticSharedLibraryVersion(),
SharedLibraryInfo.TYPE_STATIC,
new VersionedPackage(pkg.getManifestPackageName(),
pkg.getLongVersionCode()),
diff --git a/services/core/java/com/android/server/pm/parsing/pkg/PackageImpl.java b/services/core/java/com/android/server/pm/parsing/pkg/PackageImpl.java
index ba36ab7..e361c93 100644
--- a/services/core/java/com/android/server/pm/parsing/pkg/PackageImpl.java
+++ b/services/core/java/com/android/server/pm/parsing/pkg/PackageImpl.java
@@ -717,7 +717,7 @@
}
@Override
- public boolean areAttributionsUserVisible() {
+ public boolean isAttributionsUserVisible() {
return getBoolean(Booleans.ATTRIBUTIONS_ARE_USER_VISIBLE);
}
@@ -869,7 +869,7 @@
}
@Override
- public int getBanner() {
+ public int getBannerRes() {
return banner;
}
@@ -897,7 +897,7 @@
@Nullable
@Override
- public String getClassName() {
+ public String getApplicationClassName() {
return className;
}
@@ -924,7 +924,7 @@
}
@Override
- public int getDataExtractionRules() {
+ public int getDataExtractionRulesRes() {
return dataExtractionRules;
}
@@ -940,7 +940,7 @@
}
@Override
- public int getFullBackupContent() {
+ public int getFullBackupContentRes() {
return fullBackupContent;
}
@@ -1006,7 +1006,7 @@
}
@Override
- public int getLogo() {
+ public int getLogoRes() {
return logo;
}
@@ -1277,7 +1277,7 @@
}
@Override
- public int getSharedUserLabel() {
+ public int getSharedUserLabelRes() {
return sharedUserLabel;
}
@@ -1330,7 +1330,7 @@
}
@Override
- public long getStaticSharedLibVersion() {
+ public long getStaticSharedLibraryVersion() {
return staticSharedLibVersion;
}
@@ -1356,7 +1356,7 @@
}
@Override
- public int getTheme() {
+ public int getThemeRes() {
return theme;
}
@@ -1519,8 +1519,8 @@
}
@Override
- public boolean isBaseHardwareAccelerated() {
- return getBoolean(Booleans.BASE_HARDWARE_ACCELERATED);
+ public boolean isHardwareAccelerated() {
+ return getBoolean(Booleans.HARDWARE_ACCELERATED);
}
@Override
@@ -1609,7 +1609,7 @@
}
@Override
- public boolean isLeavingSharedUid() {
+ public boolean isLeavingSharedUser() {
return getBoolean(Booleans.LEAVING_SHARED_UID);
}
@@ -1840,14 +1840,14 @@
}
@Override
- public PackageImpl setBanner(int value) {
+ public PackageImpl setBannerRes(int value) {
banner = value;
return this;
}
@Override
- public PackageImpl setBaseHardwareAccelerated(boolean value) {
- return setBoolean(Booleans.BASE_HARDWARE_ACCELERATED, value);
+ public PackageImpl setHardwareAccelerated(boolean value) {
+ return setBoolean(Booleans.HARDWARE_ACCELERATED, value);
}
@Override
@@ -1874,7 +1874,7 @@
}
@Override
- public PackageImpl setClassName(@Nullable String className) {
+ public PackageImpl setApplicationClassName(@Nullable String className) {
this.className = className == null ? null : className.trim();
return this;
}
@@ -1903,7 +1903,7 @@
}
@Override
- public PackageImpl setDataExtractionRules(int value) {
+ public PackageImpl setDataExtractionRulesRes(int value) {
dataExtractionRules = value;
return this;
}
@@ -1940,7 +1940,7 @@
}
@Override
- public PackageImpl setFullBackupContent(int value) {
+ public PackageImpl setFullBackupContentRes(int value) {
fullBackupContent = value;
return this;
}
@@ -2022,7 +2022,7 @@
}
@Override
- public PackageImpl setLeavingSharedUid(boolean value) {
+ public PackageImpl setLeavingSharedUser(boolean value) {
return setBoolean(Booleans.LEAVING_SHARED_UID, value);
}
@@ -2033,7 +2033,7 @@
}
@Override
- public PackageImpl setLogo(int value) {
+ public PackageImpl setLogoRes(int value) {
logo = value;
return this;
}
@@ -2292,7 +2292,7 @@
}
@Override
- public PackageImpl setSharedUserLabel(int value) {
+ public PackageImpl setSharedUserLabelRes(int value) {
sharedUserLabel = value;
return this;
}
@@ -2318,7 +2318,7 @@
}
@Override
- public PackageImpl setStaticSharedLibVersion(long value) {
+ public PackageImpl setStaticSharedLibraryVersion(long value) {
staticSharedLibVersion = value;
return this;
}
@@ -2397,7 +2397,7 @@
}
@Override
- public PackageImpl setTheme(int value) {
+ public PackageImpl setThemeRes(int value) {
theme = value;
return this;
}
@@ -3529,7 +3529,7 @@
private static class Booleans {
@LongDef({
EXTERNAL_STORAGE,
- BASE_HARDWARE_ACCELERATED,
+ HARDWARE_ACCELERATED,
ALLOW_BACKUP,
KILL_AFTER_RESTORE,
RESTORE_ANY_VERSION,
@@ -3593,7 +3593,7 @@
public @interface Flags {}
private static final long EXTERNAL_STORAGE = 1L;
- private static final long BASE_HARDWARE_ACCELERATED = 1L << 1;
+ private static final long HARDWARE_ACCELERATED = 1L << 1;
private static final long ALLOW_BACKUP = 1L << 2;
private static final long KILL_AFTER_RESTORE = 1L << 3;
private static final long RESTORE_ANY_VERSION = 1L << 4;
diff --git a/services/core/java/com/android/server/pm/pkg/AndroidPackage.java b/services/core/java/com/android/server/pm/pkg/AndroidPackage.java
index 075173d..49f85e9 100644
--- a/services/core/java/com/android/server/pm/pkg/AndroidPackage.java
+++ b/services/core/java/com/android/server/pm/pkg/AndroidPackage.java
@@ -16,9 +16,14 @@
package com.android.server.pm.pkg;
+import android.annotation.Dimension;
+import android.annotation.DrawableRes;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.StringRes;
+import android.annotation.StyleRes;
import android.annotation.SystemApi;
+import android.annotation.XmlRes;
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -86,6 +91,109 @@
public interface AndroidPackage {
/**
+ * @see ApplicationInfo#className
+ * @see R.styleable#AndroidManifestApplication_name
+ */
+ @Nullable
+ String getApplicationClassName();
+
+ /**
+ * @see ApplicationInfo#appComponentFactory
+ * @see R.styleable#AndroidManifestApplication_appComponentFactory
+ */
+ @Nullable
+ String getAppComponentFactory();
+
+ /**
+ * @see ApplicationInfo#backupAgentName
+ * @see R.styleable#AndroidManifestApplication_backupAgent
+ */
+ @Nullable
+ String getBackupAgentName();
+
+ /**
+ * @see ApplicationInfo#banner
+ * @see R.styleable#AndroidManifestApplication_banner
+ */
+ @DrawableRes
+ int getBannerRes();
+
+ /**
+ * @see PackageInfo#baseRevisionCode
+ * @see R.styleable#AndroidManifest_revisionCode
+ */
+ int getBaseRevisionCode();
+
+ /**
+ * @see ApplicationInfo#category
+ * @see R.styleable#AndroidManifestApplication_appCategory
+ */
+ int getCategory();
+
+ /**
+ * @see ApplicationInfo#classLoaderName
+ * @see R.styleable#AndroidManifestApplication_classLoader
+ */
+ @Nullable
+ String getClassLoaderName();
+
+ /**
+ * @see ApplicationInfo#compatibleWidthLimitDp
+ * @see R.styleable#AndroidManifestSupportsScreens_compatibleWidthLimitDp
+ */
+ @Dimension(unit = Dimension.DP)
+ int getCompatibleWidthLimitDp();
+
+ /**
+ * @see ApplicationInfo#dataExtractionRulesRes
+ * @see R.styleable#AndroidManifestApplication_dataExtractionRules
+ */
+ @XmlRes
+ int getDataExtractionRulesRes();
+
+ /**
+ * @see ApplicationInfo#descriptionRes
+ * @see R.styleable#AndroidManifestApplication_description
+ */
+ @StringRes // This is actually format="reference"
+ int getDescriptionRes();
+
+ /**
+ * @see ApplicationInfo#fullBackupContent
+ * @see R.styleable#AndroidManifestApplication_fullBackupContent
+ */
+ @XmlRes
+ int getFullBackupContentRes();
+
+ /**
+ * @see ApplicationInfo#getGwpAsanMode()
+ * @see R.styleable#AndroidManifestApplication_gwpAsanMode
+ */
+ @ApplicationInfo.GwpAsanMode
+ int getGwpAsanMode();
+
+ /**
+ * @see ApplicationInfo#iconRes
+ * @see R.styleable#AndroidManifestApplication_icon
+ */
+ @DrawableRes
+ int getIconRes();
+
+ /**
+ * @see ApplicationInfo#labelRes
+ * @see R.styleable#AndroidManifestApplication_label
+ */
+ @StringRes
+ int getLabelRes();
+
+ /**
+ * @see ApplicationInfo#largestWidthLimitDp
+ * @see R.styleable#AndroidManifestSupportsScreens_largestWidthLimitDp
+ */
+ @Dimension(unit = Dimension.DP)
+ int getLargestWidthLimitDp();
+
+ /**
* Library names this package is declared as, for use by other packages with "uses-library".
*
* @see R.styleable#AndroidManifestLibrary
@@ -94,12 +202,104 @@
List<String> getLibraryNames();
/**
+ * @see ApplicationInfo#logo
+ * @see R.styleable#AndroidManifestApplication_logo
+ */
+ @DrawableRes
+ int getLogoRes();
+
+ /**
+ * The resource ID used to provide the application's locales configuration.
+ *
+ * @see R.styleable#AndroidManifestApplication_localeConfig
+ */
+ @XmlRes
+ int getLocaleConfigRes();
+
+ /**
+ * @see PackageInfo#getLongVersionCode()
+ * @see R.styleable#AndroidManifest_versionCode
+ * @see R.styleable#AndroidManifest_versionCodeMajor
+ */
+ long getLongVersionCode();
+
+ /**
+ * @see ApplicationInfo#maxAspectRatio
+ * @see R.styleable#AndroidManifestApplication_maxAspectRatio
+ */
+ float getMaxAspectRatio();
+
+ /**
+ * @see ApplicationInfo#minAspectRatio
+ * @see R.styleable#AndroidManifestApplication_minAspectRatio
+ */
+ float getMinAspectRatio();
+
+ /**
+ * @see ApplicationInfo#getNativeHeapZeroInitialized()
+ * @see R.styleable#AndroidManifestApplication_nativeHeapZeroInitialized
+ */
+ @ApplicationInfo.NativeHeapZeroInitialized
+ int getNativeHeapZeroInitialized();
+
+ /**
+ * @see ApplicationInfo#networkSecurityConfigRes
+ * @see R.styleable#AndroidManifestApplication_networkSecurityConfig
+ */
+ @XmlRes
+ int getNetworkSecurityConfigRes();
+
+ /**
+ * @see PackageInfo#requiredAccountType
+ * @see R.styleable#AndroidManifestApplication_requiredAccountType
+ */
+ @Nullable
+ String getRequiredAccountType();
+
+ /**
+ * @see ApplicationInfo#requiresSmallestWidthDp
+ * @see R.styleable#AndroidManifestSupportsScreens_requiresSmallestWidthDp
+ */
+ @Dimension(unit = Dimension.DP)
+ int getRequiresSmallestWidthDp();
+
+ /**
+ * The restricted account authenticator type that is used by this application.
+ *
+ * @see PackageInfo#restrictedAccountType
+ * @see R.styleable#AndroidManifestApplication_restrictedAccountType
+ */
+ @Nullable
+ String getRestrictedAccountType();
+
+ /**
+ * @see ApplicationInfo#roundIconRes
+ * @see R.styleable#AndroidManifestApplication_roundIcon
+ */
+ @DrawableRes
+ int getRoundIconRes();
+
+ /**
* @see R.styleable#AndroidManifestSdkLibrary_name
*/
@Nullable
String getSdkLibraryName();
/**
+ * @see PackageInfo#sharedUserId
+ * @see R.styleable#AndroidManifest_sharedUserId
+ */
+ @Nullable
+ String getSharedUserId();
+
+ /**
+ * @see PackageInfo#sharedUserLabel
+ * @see R.styleable#AndroidManifest_sharedUserLabel
+ */
+ @StringRes
+ int getSharedUserLabelRes();
+
+ /**
* @return List of all splits for a package. Note that base.apk is considered a
* split and will be provided as index 0 of the list.
*/
@@ -113,6 +313,12 @@
String getStaticSharedLibraryName();
/**
+ * @see R.styleable#AndroidManifestStaticLibrary_version
+ * @hide
+ */
+ long getStaticSharedLibraryVersion();
+
+ /**
* @return The {@link UUID} for use with {@link StorageManager} APIs identifying where this
* package was installed.
*/
@@ -126,23 +332,319 @@
int getTargetSdkVersion();
/**
+ * @see ApplicationInfo#theme
+ * @see R.styleable#AndroidManifestApplication_theme
+ */
+ @StyleRes
+ int getThemeRes();
+
+ /**
+ * @see ApplicationInfo#uiOptions
+ * @see R.styleable#AndroidManifestApplication_uiOptions
+ */
+ int getUiOptions();
+
+ /**
+ * @see PackageInfo#versionName
+ */
+ @Nullable
+ String getVersionName();
+
+ /**
+ * @see ApplicationInfo#zygotePreloadName
+ * @see R.styleable#AndroidManifestApplication_zygotePreloadName
+ */
+ @Nullable
+ String getZygotePreloadName();
+
+ /**
+ * @see ApplicationInfo#PRIVATE_FLAG_ALLOW_AUDIO_PLAYBACK_CAPTURE
+ * @see R.styleable#AndroidManifestApplication_allowAudioPlaybackCapture
+ */
+ boolean isAllowAudioPlaybackCapture();
+
+ /**
+ * @see ApplicationInfo#FLAG_ALLOW_BACKUP
+ * @see R.styleable#AndroidManifestApplication_allowBackup
+ */
+ boolean isAllowBackup();
+
+ /**
+ * @see ApplicationInfo#FLAG_ALLOW_CLEAR_USER_DATA
+ * @see R.styleable#AndroidManifestApplication_allowClearUserData
+ */
+ boolean isAllowClearUserData();
+
+ /**
+ * @see ApplicationInfo#PRIVATE_FLAG_ALLOW_CLEAR_USER_DATA_ON_FAILED_RESTORE
+ * @see R.styleable#AndroidManifestApplication_allowClearUserDataOnFailedRestore
+ */
+ boolean isAllowClearUserDataOnFailedRestore();
+
+ /**
+ * @see ApplicationInfo#PRIVATE_FLAG_ALLOW_NATIVE_HEAP_POINTER_TAGGING
+ * @see R.styleable#AndroidManifestApplication_allowNativeHeapPointerTagging
+ */
+ boolean isAllowNativeHeapPointerTagging();
+
+ /**
+ * @see ApplicationInfo#FLAG_ALLOW_TASK_REPARENTING
+ * @see R.styleable#AndroidManifestApplication_allowTaskReparenting
+ */
+ boolean isAllowTaskReparenting();
+
+ /**
+ * If omitted from manifest, returns true if {@link #getTargetSdkVersion()} >= {@link
+ * android.os.Build.VERSION_CODES#DONUT}.
+ *
+ * @see R.styleable#AndroidManifestSupportsScreens_anyDensity
+ * @see ApplicationInfo#FLAG_SUPPORTS_SCREEN_DENSITIES
+ */
+ boolean isAnyDensity();
+
+ /**
+ * @see ApplicationInfo#areAttributionsUserVisible()
+ * @see R.styleable#AndroidManifestApplication_attributionsAreUserVisible
+ */
+ boolean isAttributionsUserVisible();
+
+ /**
+ * @see ApplicationInfo#PRIVATE_FLAG_BACKUP_IN_FOREGROUND
+ * @see R.styleable#AndroidManifestApplication_backupInForeground
+ */
+ boolean isBackupInForeground();
+
+ /**
+ * @see ApplicationInfo#FLAG_HARDWARE_ACCELERATED
+ * @see R.styleable#AndroidManifestApplication_hardwareAccelerated
+ */
+ boolean isHardwareAccelerated();
+
+ /**
+ * @see ApplicationInfo#PRIVATE_FLAG_CANT_SAVE_STATE
+ * @see R.styleable#AndroidManifestApplication_cantSaveState
+ */
+ boolean isCantSaveState();
+
+ /**
+ * @see PackageInfo#coreApp
+ */
+ boolean isCoreApp();
+
+ /**
+ * @see ApplicationInfo#crossProfile
+ * @see R.styleable#AndroidManifestApplication_crossProfile
+ */
+ boolean isCrossProfile();
+
+ /**
* @see ApplicationInfo#FLAG_DEBUGGABLE
* @see R.styleable#AndroidManifestApplication_debuggable
*/
boolean isDebuggable();
/**
+ * @see ApplicationInfo#PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE
+ * @see R.styleable#AndroidManifestApplication_defaultToDeviceProtectedStorage
+ */
+ boolean isDefaultToDeviceProtectedStorage();
+
+ /**
+ * @see ApplicationInfo#PRIVATE_FLAG_DIRECT_BOOT_AWARE
+ * @see R.styleable#AndroidManifestApplication_directBootAware
+ */
+ boolean isDirectBootAware();
+
+ /**
+ * @see ApplicationInfo#FLAG_EXTRACT_NATIVE_LIBS
+ * @see R.styleable#AndroidManifestApplication_extractNativeLibs
+ */
+ boolean isExtractNativeLibs();
+
+ /**
+ * @see ApplicationInfo#FLAG_FACTORY_TEST
+ */
+ boolean isFactoryTest();
+
+ /**
+ * @see R.styleable#AndroidManifestApplication_forceQueryable
+ */
+ boolean isForceQueryable();
+
+ /**
+ * @see ApplicationInfo#FLAG_FULL_BACKUP_ONLY
+ * @see R.styleable#AndroidManifestApplication_fullBackupOnly
+ */
+ boolean isFullBackupOnly();
+
+ /**
+ * @see ApplicationInfo#FLAG_HAS_CODE
+ * @see R.styleable#AndroidManifestApplication_hasCode
+ */
+ boolean isHasCode();
+
+ /**
+ * @see ApplicationInfo#PRIVATE_FLAG_HAS_FRAGILE_USER_DATA
+ * @see R.styleable#AndroidManifestApplication_hasFragileUserData
+ */
+ boolean isHasFragileUserData();
+
+ /**
* @see ApplicationInfo#PRIVATE_FLAG_ISOLATED_SPLIT_LOADING
* @see R.styleable#AndroidManifest_isolatedSplits
*/
boolean isIsolatedSplitLoading();
/**
+ * @see ApplicationInfo#FLAG_KILL_AFTER_RESTORE
+ * @see R.styleable#AndroidManifestApplication_killAfterRestore
+ */
+ boolean isKillAfterRestore();
+
+ /**
+ * @see ApplicationInfo#FLAG_LARGE_HEAP
+ * @see R.styleable#AndroidManifestApplication_largeHeap
+ */
+ boolean isLargeHeap();
+
+ /**
+ * Returns true if R.styleable#AndroidManifest_sharedUserMaxSdkVersion is set to a value
+ * smaller than the current SDK version, indicating the package wants to leave its declared
+ * {@link #getSharedUserId()}. This only occurs on new installs, pretending the app never
+ * declared one.
+ *
+ * @see R.styleable#AndroidManifest_sharedUserMaxSdkVersion
+ */
+ boolean isLeavingSharedUser();
+
+ /**
+ * @see ApplicationInfo#FLAG_MULTIARCH
+ * @see R.styleable#AndroidManifestApplication_multiArch
+ */
+ boolean isMultiArch();
+
+ /**
+ * @see ApplicationInfo#nativeLibraryRootRequiresIsa
+ */
+ boolean isNativeLibraryRootRequiresIsa();
+
+ /**
+ * @see R.styleable#AndroidManifestApplication_enableOnBackInvokedCallback
+ */
+ boolean isOnBackInvokedCallbackEnabled();
+
+ /**
+ * @see ApplicationInfo#FLAG_PERSISTENT
+ * @see R.styleable#AndroidManifestApplication_persistent
+ */
+ boolean isPersistent();
+
+ /**
+ * @see ApplicationInfo#PRIVATE_FLAG_EXT_PROFILEABLE
+ * @see R.styleable#AndroidManifestProfileable
+ */
+ boolean isProfileable();
+
+ /**
+ * @see ApplicationInfo#PRIVATE_FLAG_PROFILEABLE_BY_SHELL
+ * @see R.styleable#AndroidManifestProfileable_shell
+ */
+ boolean isProfileableByShell();
+
+ /**
+ * @see ApplicationInfo#PRIVATE_FLAG_REQUEST_LEGACY_EXTERNAL_STORAGE
+ * @see R.styleable#AndroidManifestApplication_requestLegacyExternalStorage
+ */
+ boolean isRequestLegacyExternalStorage();
+
+ /**
+ * @see PackageInfo#requiredForAllUsers
+ * @see R.styleable#AndroidManifestApplication_requiredForAllUsers
+ */
+ boolean isRequiredForAllUsers();
+
+ /**
+ * Whether the enabled settings of components in the application should be reset to the default,
+ * when the application's user data is cleared.
+ *
+ * @see R.styleable#AndroidManifestApplication_resetEnabledSettingsOnAppDataCleared
+ */
+ boolean isResetEnabledSettingsOnAppDataCleared();
+
+ /**
+ * @see ApplicationInfo#FLAG_RESTORE_ANY_VERSION
+ * @see R.styleable#AndroidManifestApplication_restoreAnyVersion
+ */
+ boolean isRestoreAnyVersion();
+
+ /**
* @see ApplicationInfo#PRIVATE_FLAG_SIGNED_WITH_PLATFORM_KEY
*/
boolean isSignedWithPlatformKey();
/**
+ * If omitted from manifest, returns true if {@link #getTargetSdkVersion()} >= {@link
+ * android.os.Build.VERSION_CODES#GINGERBREAD}.
+ *
+ * @see R.styleable#AndroidManifestSupportsScreens_xlargeScreens
+ * @see ApplicationInfo#FLAG_SUPPORTS_XLARGE_SCREENS
+ */
+ boolean isSupportsExtraLargeScreens();
+
+ /**
+ * If omitted from manifest, returns true if {@link #getTargetSdkVersion()} >= {@link
+ * android.os.Build.VERSION_CODES#DONUT}.
+ *
+ * @see R.styleable#AndroidManifestSupportsScreens_largeScreens
+ * @see ApplicationInfo#FLAG_SUPPORTS_LARGE_SCREENS
+ */
+ boolean isSupportsLargeScreens();
+
+ /**
+ * If omitted from manifest, returns true.
+ *
+ * @see R.styleable#AndroidManifestSupportsScreens_normalScreens
+ * @see ApplicationInfo#FLAG_SUPPORTS_NORMAL_SCREENS
+ */
+ boolean isSupportsNormalScreens();
+
+ /**
+ * @see ApplicationInfo#FLAG_SUPPORTS_RTL
+ * @see R.styleable#AndroidManifestApplication_supportsRtl
+ */
+ boolean isSupportsRtl();
+
+ /**
+ * If omitted from manifest, returns true if {@link #getTargetSdkVersion()} >= {@link
+ * android.os.Build.VERSION_CODES#DONUT}.
+ *
+ * @see R.styleable#AndroidManifestSupportsScreens_smallScreens
+ * @see ApplicationInfo#FLAG_SUPPORTS_SMALL_SCREENS
+ */
+ boolean isSupportsSmallScreens();
+
+ /**
+ * @see ApplicationInfo#FLAG_TEST_ONLY
+ * @see R.styleable#AndroidManifestApplication_testOnly
+ */
+ boolean isTestOnly();
+
+ /**
+ * The install time abi override to choose 32bit abi's when multiple abi's are present. This is
+ * only meaningful for multiarch applications. The use32bitAbi attribute is ignored if
+ * cpuAbiOverride is also set.
+ *
+ * @see R.attr#use32bitAbi
+ */
+ boolean isUse32BitAbi();
+
+ /**
+ * @see ApplicationInfo#FLAG_USES_CLEARTEXT_TRAFFIC
+ * @see R.styleable#AndroidManifestApplication_usesCleartextTraffic
+ */
+ boolean isUsesCleartextTraffic();
+
+ /**
* @see ApplicationInfo#PRIVATE_FLAG_USE_EMBEDDED_DEX
* @see R.styleable#AndroidManifestApplication_useEmbeddedDex
*/
@@ -163,14 +665,6 @@
// Methods below this comment are not yet exposed as API
/**
- * @see ApplicationInfo#areAttributionsUserVisible()
- * @see R.styleable#AndroidManifestApplication_attributionsAreUserVisible
- * @hide
- */
- @Nullable
- boolean areAttributionsUserVisible();
-
- /**
* Set of Activities parsed from the manifest.
* <p>
* This contains minimal system state and does not
@@ -207,14 +701,6 @@
List<ParsedApexSystemService> getApexSystemServices();
/**
- * @see ApplicationInfo#appComponentFactory
- * @see R.styleable#AndroidManifestApplication_appComponentFactory
- * @hide
- */
- @Nullable
- String getAppComponentFactory();
-
- /**
* @see R.styleable#AndroidManifestAttribution
* @hide
*/
@@ -232,21 +718,6 @@
int getAutoRevokePermissions();
/**
- * @see ApplicationInfo#backupAgentName
- * @see R.styleable#AndroidManifestApplication_backupAgent
- * @hide
- */
- @Nullable
- String getBackupAgentName();
-
- /**
- * @see ApplicationInfo#banner
- * @see R.styleable#AndroidManifestApplication_banner
- * @hide
- */
- int getBanner();
-
- /**
* @see ApplicationInfo#sourceDir
* @see ApplicationInfo#getBaseCodePath
*
@@ -259,43 +730,6 @@
String getBaseApkPath();
/**
- * @see PackageInfo#baseRevisionCode
- * @see R.styleable#AndroidManifest_revisionCode
- * @hide
- */
- int getBaseRevisionCode();
-
- /**
- * @see ApplicationInfo#category
- * @see R.styleable#AndroidManifestApplication_appCategory
- * @hide
- */
- int getCategory();
-
- /**
- * @see ApplicationInfo#classLoaderName
- * @see R.styleable#AndroidManifestApplication_classLoader
- * @hide
- */
- @Nullable
- String getClassLoaderName();
-
- /**
- * @see ApplicationInfo#className
- * @see R.styleable#AndroidManifestApplication_name
- * @hide
- */
- @Nullable
- String getClassName();
-
- /**
- * @see ApplicationInfo#compatibleWidthLimitDp
- * @see R.styleable#AndroidManifestSupportsScreens_compatibleWidthLimitDp
- * @hide
- */
- int getCompatibleWidthLimitDp();
-
- /**
* @see ApplicationInfo#compileSdkVersion
* @see R.styleable#AndroidManifest_compileSdkVersion
* @hide
@@ -320,20 +754,6 @@
List<ConfigurationInfo> getConfigPreferences();
/**
- * @see ApplicationInfo#dataExtractionRulesRes
- * @see R.styleable#AndroidManifestApplication_dataExtractionRules
- * @hide
- */
- int getDataExtractionRules();
-
- /**
- * @see ApplicationInfo#descriptionRes
- * @see R.styleable#AndroidManifestApplication_description
- * @hide
- */
- int getDescriptionRes();
-
- /**
* @see PackageInfo#featureGroups
* @see R.styleable#AndroidManifestUsesFeature
* @hide
@@ -343,28 +763,6 @@
List<FeatureGroupInfo> getFeatureGroups();
/**
- * @see ApplicationInfo#fullBackupContent
- * @see R.styleable#AndroidManifestApplication_fullBackupContent
- * @hide
- */
- int getFullBackupContent();
-
- /**
- * @see ApplicationInfo#getGwpAsanMode()
- * @see R.styleable#AndroidManifestApplication_gwpAsanMode
- * @hide
- */
- @ApplicationInfo.GwpAsanMode
- int getGwpAsanMode();
-
- /**
- * @see ApplicationInfo#iconRes
- * @see R.styleable#AndroidManifestApplication_icon
- * @hide
- */
- int getIconRes();
-
- /**
* Permissions requested but not in the manifest. These may have been split or migrated from
* previous versions/definitions.
* @hide
@@ -411,43 +809,6 @@
Set<String> getKnownActivityEmbeddingCerts();
/**
- * @see ApplicationInfo#labelRes
- * @see R.styleable#AndroidManifestApplication_label
- * @hide
- */
- int getLabelRes();
-
- /**
- * @see ApplicationInfo#largestWidthLimitDp
- * @see R.styleable#AndroidManifestSupportsScreens_largestWidthLimitDp
- * @hide
- */
- int getLargestWidthLimitDp();
-
- /**
- * The resource ID used to provide the application's locales configuration.
- *
- * @see R.styleable#AndroidManifestApplication_localeConfig
- * @hide
- */
- int getLocaleConfigRes();
-
- /**
- * @see ApplicationInfo#logo
- * @see R.styleable#AndroidManifestApplication_logo
- * @hide
- */
- int getLogo();
-
- /**
- * @see PackageInfo#getLongVersionCode()
- * @see R.styleable#AndroidManifest_versionCode
- * @see R.styleable#AndroidManifest_versionCodeMajor
- * @hide
- */
- long getLongVersionCode();
-
- /**
* @see ApplicationInfo#manageSpaceActivityName
* @see R.styleable#AndroidManifestApplication_manageSpaceActivity
* @hide
@@ -464,13 +825,6 @@
String getManifestPackageName();
/**
- * @see ApplicationInfo#maxAspectRatio
- * @see R.styleable#AndroidManifestApplication_maxAspectRatio
- * @hide
- */
- float getMaxAspectRatio();
-
- /**
* @see R.styleable#AndroidManifestUsesSdk_maxSdkVersion
* @hide
*/
@@ -501,13 +855,6 @@
Set<String> getMimeGroups();
/**
- * @see ApplicationInfo#minAspectRatio
- * @see R.styleable#AndroidManifestApplication_minAspectRatio
- * @hide
- */
- float getMinAspectRatio();
-
- /**
* @see R.styleable#AndroidManifestExtensionSdk
* @hide
*/
@@ -523,14 +870,6 @@
int getMinSdkVersion();
/**
- * @see ApplicationInfo#getNativeHeapZeroInitialized()
- * @see R.styleable#AndroidManifestApplication_nativeHeapZeroInitialized
- * @hide
- */
- @ApplicationInfo.NativeHeapZeroInitialized
- int getNativeHeapZeroInitialized();
-
- /**
* @see ApplicationInfo#nativeLibraryDir
* @hide
*/
@@ -545,13 +884,6 @@
String getNativeLibraryRootDir();
/**
- * @see ApplicationInfo#networkSecurityConfigRes
- * @see R.styleable#AndroidManifestApplication_networkSecurityConfig
- * @hide
- */
- int getNetworkSecurityConfigRes();
-
- /**
* If {@link R.styleable#AndroidManifestApplication_label} is a string literal, this is it.
* Otherwise, it's stored as {@link #getLabelRes()}.
*
@@ -787,21 +1119,6 @@
List<String> getRequestedPermissions();
/**
- * @see PackageInfo#requiredAccountType
- * @see R.styleable#AndroidManifestApplication_requiredAccountType
- * @hide
- */
- @Nullable
- String getRequiredAccountType();
-
- /**
- * @see ApplicationInfo#requiresSmallestWidthDp
- * @see R.styleable#AndroidManifestSupportsScreens_requiresSmallestWidthDp
- * @hide
- */
- int getRequiresSmallestWidthDp();
-
- /**
* Whether or not the app requested explicitly resizeable Activities. Null value means nothing
* was explicitly requested.
*
@@ -824,23 +1141,6 @@
byte[] getRestrictUpdateHash();
/**
- * The restricted account authenticator type that is used by this application.
- *
- * @see PackageInfo#restrictedAccountType
- * @see R.styleable#AndroidManifestApplication_restrictedAccountType
- * @hide
- */
- @Nullable
- String getRestrictedAccountType();
-
- /**
- * @see ApplicationInfo#roundIconRes
- * @see R.styleable#AndroidManifestApplication_roundIcon
- * @hide
- */
- int getRoundIconRes();
-
- /**
* @see R.styleable#AndroidManifestSdkLibrary_versionMajor
* @hide
*/
@@ -872,21 +1172,6 @@
List<ParsedService> getServices();
/**
- * @see PackageInfo#sharedUserId
- * @see R.styleable#AndroidManifest_sharedUserId
- * @hide
- */
- @Nullable
- String getSharedUserId();
-
- /**
- * @see PackageInfo#sharedUserLabel
- * @see R.styleable#AndroidManifest_sharedUserLabel
- * @hide
- */
- int getSharedUserLabel();
-
- /**
* The signature data of all APKs in this package, which must be exactly the same across the
* base and splits.
* @hide
@@ -949,12 +1234,6 @@
int[] getSplitRevisionCodes();
/**
- * @see R.styleable#AndroidManifestStaticLibrary_version
- * @hide
- */
- long getStaticSharedLibVersion();
-
- /**
* @see ApplicationInfo#targetSandboxVersion
* @see R.styleable#AndroidManifest_targetSandboxVersion
* @hide
@@ -970,20 +1249,6 @@
String getTaskAffinity();
/**
- * @see ApplicationInfo#theme
- * @see R.styleable#AndroidManifestApplication_theme
- * @hide
- */
- int getTheme();
-
- /**
- * @see ApplicationInfo#uiOptions
- * @see R.styleable#AndroidManifestApplication_uiOptions
- * @hide
- */
- int getUiOptions();
-
- /**
* This is an appId, the {@link ApplicationInfo#uid} if the user ID is
* {@link android.os.UserHandle#SYSTEM}.
*
@@ -1095,27 +1360,12 @@
long[] getUsesStaticLibrariesVersions();
/**
- * @see PackageInfo#versionName
- * @hide
- */
- @Nullable
- String getVersionName();
-
- /**
* @see ApplicationInfo#volumeUuid
* @hide
*/
@Nullable
String getVolumeUuid();
- /**
- * @see ApplicationInfo#zygotePreloadName
- * @see R.styleable#AndroidManifestApplication_zygotePreloadName
- * @hide
- */
- @Nullable
- String getZygotePreloadName();
-
/** @hide */
boolean hasPreserveLegacyExternalStorage();
@@ -1133,110 +1383,10 @@
*/
Boolean hasRequestRawExternalStorageAccess();
- /**
- * @see ApplicationInfo#PRIVATE_FLAG_ALLOW_AUDIO_PLAYBACK_CAPTURE
- * @see R.styleable#AndroidManifestApplication_allowAudioPlaybackCapture
- * @hide
- */
- boolean isAllowAudioPlaybackCapture();
-
- /**
- * @see ApplicationInfo#FLAG_ALLOW_BACKUP
- * @see R.styleable#AndroidManifestApplication_allowBackup
- * @hide
- */
- boolean isAllowBackup();
-
- /**
- * @see ApplicationInfo#FLAG_ALLOW_CLEAR_USER_DATA
- * @see R.styleable#AndroidManifestApplication_allowClearUserData
- * @hide
- */
- boolean isAllowClearUserData();
-
- /**
- * @see ApplicationInfo#PRIVATE_FLAG_ALLOW_CLEAR_USER_DATA_ON_FAILED_RESTORE
- * @see R.styleable#AndroidManifestApplication_allowClearUserDataOnFailedRestore
- * @hide
- */
- boolean isAllowClearUserDataOnFailedRestore();
-
- /**
- * @see ApplicationInfo#PRIVATE_FLAG_ALLOW_NATIVE_HEAP_POINTER_TAGGING
- * @see R.styleable#AndroidManifestApplication_allowNativeHeapPointerTagging
- * @hide
- */
- boolean isAllowNativeHeapPointerTagging();
-
- /**
- * @see ApplicationInfo#FLAG_ALLOW_TASK_REPARENTING
- * @see R.styleable#AndroidManifestApplication_allowTaskReparenting
- * @hide
- */
- boolean isAllowTaskReparenting();
-
- /**
- * If omitted from manifest, returns true if {@link #getTargetSdkVersion()} >= {@link
- * android.os.Build.VERSION_CODES#DONUT}.
- *
- * @see R.styleable#AndroidManifestSupportsScreens_anyDensity
- * @see ApplicationInfo#FLAG_SUPPORTS_SCREEN_DENSITIES
- * @hide
- */
- boolean isAnyDensity();
-
/** @hide */
boolean isApex();
/**
- * @see ApplicationInfo#PRIVATE_FLAG_BACKUP_IN_FOREGROUND
- * @see R.styleable#AndroidManifestApplication_backupInForeground
- * @hide
- */
- boolean isBackupInForeground();
-
- /**
- * @see ApplicationInfo#FLAG_HARDWARE_ACCELERATED
- * @see R.styleable#AndroidManifestApplication_hardwareAccelerated
- * @hide
- */
- boolean isBaseHardwareAccelerated();
-
- /**
- * @see ApplicationInfo#PRIVATE_FLAG_CANT_SAVE_STATE
- * @see R.styleable#AndroidManifestApplication_cantSaveState
- * @hide
- */
- boolean isCantSaveState();
-
- /**
- * @see PackageInfo#coreApp
- * @hide
- */
- boolean isCoreApp();
-
- /**
- * @see ApplicationInfo#crossProfile
- * @see R.styleable#AndroidManifestApplication_crossProfile
- * @hide
- */
- boolean isCrossProfile();
-
- /**
- * @see ApplicationInfo#PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE
- * @see R.styleable#AndroidManifestApplication_defaultToDeviceProtectedStorage
- * @hide
- */
- boolean isDefaultToDeviceProtectedStorage();
-
- /**
- * @see ApplicationInfo#PRIVATE_FLAG_DIRECT_BOOT_AWARE
- * @see R.styleable#AndroidManifestApplication_directBootAware
- * @hide
- */
- boolean isDirectBootAware();
-
- /**
* @see ApplicationInfo#enabled
* @see R.styleable#AndroidManifestApplication_enabled
* @hide
@@ -1250,32 +1400,6 @@
boolean isExternalStorage();
/**
- * @see ApplicationInfo#FLAG_EXTRACT_NATIVE_LIBS
- * @see R.styleable#AndroidManifestApplication_extractNativeLibs
- * @hide
- */
- boolean isExtractNativeLibs();
-
- /**
- * @see ApplicationInfo#FLAG_FACTORY_TEST
- * @hide
- */
- boolean isFactoryTest();
-
- /**
- * @see R.styleable#AndroidManifestApplication_forceQueryable
- * @hide
- */
- boolean isForceQueryable();
-
- /**
- * @see ApplicationInfo#FLAG_FULL_BACKUP_ONLY
- * @see R.styleable#AndroidManifestApplication_fullBackupOnly
- * @hide
- */
- boolean isFullBackupOnly();
-
- /**
* @see ApplicationInfo#FLAG_IS_GAME
* @see R.styleable#AndroidManifestApplication_isGame
* @hide
@@ -1284,13 +1408,6 @@
boolean isGame();
/**
- * @see ApplicationInfo#FLAG_HAS_CODE
- * @see R.styleable#AndroidManifestApplication_hasCode
- * @hide
- */
- boolean isHasCode();
-
- /**
* @see ApplicationInfo#PRIVATE_FLAG_HAS_DOMAIN_URLS
* @see R.styleable#AndroidManifestIntentFilter
* @hide
@@ -1298,55 +1415,6 @@
boolean isHasDomainUrls();
/**
- * @see ApplicationInfo#PRIVATE_FLAG_HAS_FRAGILE_USER_DATA
- * @see R.styleable#AndroidManifestApplication_hasFragileUserData
- * @hide
- */
- boolean isHasFragileUserData();
-
- /**
- * @see ApplicationInfo#FLAG_KILL_AFTER_RESTORE
- * @see R.styleable#AndroidManifestApplication_killAfterRestore
- * @hide
- */
- boolean isKillAfterRestore();
-
- /**
- * @see ApplicationInfo#FLAG_LARGE_HEAP
- * @see R.styleable#AndroidManifestApplication_largeHeap
- * @hide
- */
- boolean isLargeHeap();
-
- /**
- * Returns true if R.styleable#AndroidManifest_sharedUserMaxSdkVersion is set to a value
- * smaller than the current SDK version.
- *
- * @see R.styleable#AndroidManifest_sharedUserMaxSdkVersion
- * @hide
- */
- boolean isLeavingSharedUid();
-
- /**
- * @see ApplicationInfo#FLAG_MULTIARCH
- * @see R.styleable#AndroidManifestApplication_multiArch
- * @hide
- */
- boolean isMultiArch();
-
- /**
- * @see ApplicationInfo#nativeLibraryRootRequiresIsa
- * @hide
- */
- boolean isNativeLibraryRootRequiresIsa();
-
- /**
- * @see R.styleable#AndroidManifestApplication_enableOnBackInvokedCallback
- * @hide
- */
- boolean isOnBackInvokedCallbackEnabled();
-
- /**
* @see ApplicationInfo#PRIVATE_FLAG_IS_RESOURCE_OVERLAY
* @see ApplicationInfo#isResourceOverlay()
* @see R.styleable#AndroidManifestResourceOverlay
@@ -1371,50 +1439,6 @@
boolean isPartiallyDirectBootAware();
/**
- * @see ApplicationInfo#FLAG_PERSISTENT
- * @see R.styleable#AndroidManifestApplication_persistent
- * @hide
- */
- boolean isPersistent();
-
- /**
- * @see ApplicationInfo#PRIVATE_FLAG_EXT_PROFILEABLE
- * @see R.styleable#AndroidManifestProfileable
- * @hide
- */
- boolean isProfileable();
-
- /**
- * @see ApplicationInfo#PRIVATE_FLAG_PROFILEABLE_BY_SHELL
- * @see R.styleable#AndroidManifestProfileable_shell
- * @hide
- */
- boolean isProfileableByShell();
-
- /**
- * @see ApplicationInfo#PRIVATE_FLAG_REQUEST_LEGACY_EXTERNAL_STORAGE
- * @see R.styleable#AndroidManifestApplication_requestLegacyExternalStorage
- * @hide
- */
- boolean isRequestLegacyExternalStorage();
-
- /**
- * @see PackageInfo#requiredForAllUsers
- * @see R.styleable#AndroidManifestApplication_requiredForAllUsers
- * @hide
- */
- boolean isRequiredForAllUsers();
-
- /**
- * Whether the enabled settings of components in the application should be reset to the default,
- * when the application's user data is cleared.
- *
- * @see R.styleable#AndroidManifestApplication_resetEnabledSettingsOnAppDataCleared
- * @hide
- */
- boolean isResetEnabledSettingsOnAppDataCleared();
-
- /**
* If omitted from manifest, returns true if {@link #getTargetSdkVersion()} >= {@link
* android.os.Build.VERSION_CODES#DONUT}.
*
@@ -1432,13 +1456,6 @@
boolean isResizeableActivityViaSdkVersion();
/**
- * @see ApplicationInfo#FLAG_RESTORE_ANY_VERSION
- * @see R.styleable#AndroidManifestApplication_restoreAnyVersion
- * @hide
- */
- boolean isRestoreAnyVersion();
-
- /**
* True means that this package/app contains an SDK library.
* @see R.styleable#AndroidManifestSdkLibrary
* @hide
@@ -1459,76 +1476,6 @@
boolean isStub();
/**
- * If omitted from manifest, returns true if {@link #getTargetSdkVersion()} >= {@link
- * android.os.Build.VERSION_CODES#GINGERBREAD}.
- *
- * @see R.styleable#AndroidManifestSupportsScreens_xlargeScreens
- * @see ApplicationInfo#FLAG_SUPPORTS_XLARGE_SCREENS
- * @hide
- */
- boolean isSupportsExtraLargeScreens();
-
- /**
- * If omitted from manifest, returns true if {@link #getTargetSdkVersion()} >= {@link
- * android.os.Build.VERSION_CODES#DONUT}.
- *
- * @see R.styleable#AndroidManifestSupportsScreens_largeScreens
- * @see ApplicationInfo#FLAG_SUPPORTS_LARGE_SCREENS
- * @hide
- */
- boolean isSupportsLargeScreens();
-
- /**
- * If omitted from manifest, returns true.
- *
- * @see R.styleable#AndroidManifestSupportsScreens_normalScreens
- * @see ApplicationInfo#FLAG_SUPPORTS_NORMAL_SCREENS
- * @hide
- */
- boolean isSupportsNormalScreens();
-
- /**
- * @see ApplicationInfo#FLAG_SUPPORTS_RTL
- * @see R.styleable#AndroidManifestApplication_supportsRtl
- * @hide
- */
- boolean isSupportsRtl();
-
- /**
- * If omitted from manifest, returns true if {@link #getTargetSdkVersion()} >= {@link
- * android.os.Build.VERSION_CODES#DONUT}.
- *
- * @see R.styleable#AndroidManifestSupportsScreens_smallScreens
- * @see ApplicationInfo#FLAG_SUPPORTS_SMALL_SCREENS
- * @hide
- */
- boolean isSupportsSmallScreens();
-
- /**
- * @see ApplicationInfo#FLAG_TEST_ONLY
- * @see R.styleable#AndroidManifestApplication_testOnly
- * @hide
- */
- boolean isTestOnly();
-
- /**
- * The install time abi override to choose 32bit abi's when multiple abi's are present. This is
- * only meaningful for multiarch applications. The use32bitAbi attribute is ignored if
- * cpuAbiOverride is also set.
- *
- * @see R.attr#use32bitAbi
- * @hide
- */
- boolean isUse32BitAbi();
-
- /**
- * @see ApplicationInfo#FLAG_USES_CLEARTEXT_TRAFFIC
- * @see R.styleable#AndroidManifestApplication_usesCleartextTraffic
- * @hide
- */
- boolean isUsesCleartextTraffic();
-
- /**
* Set if the any of components are visible to instant applications.
*
* @see R.styleable#AndroidManifestActivity_visibleToInstantApps
diff --git a/services/core/java/com/android/server/pm/pkg/component/ParsedActivityUtils.java b/services/core/java/com/android/server/pm/pkg/component/ParsedActivityUtils.java
index ea791e1..3bd0e0d 100644
--- a/services/core/java/com/android/server/pm/pkg/component/ParsedActivityUtils.java
+++ b/services/core/java/com/android/server/pm/pkg/component/ParsedActivityUtils.java
@@ -144,7 +144,7 @@
| flag(ActivityInfo.FLAG_SYSTEM_USER_ONLY, R.styleable.AndroidManifestActivity_systemUserOnly, sa)));
if (!receiver) {
- activity.setFlags(activity.getFlags() | (flag(ActivityInfo.FLAG_HARDWARE_ACCELERATED, R.styleable.AndroidManifestActivity_hardwareAccelerated, pkg.isBaseHardwareAccelerated(), sa)
+ activity.setFlags(activity.getFlags() | (flag(ActivityInfo.FLAG_HARDWARE_ACCELERATED, R.styleable.AndroidManifestActivity_hardwareAccelerated, pkg.isHardwareAccelerated(), sa)
| flag(ActivityInfo.FLAG_ALLOW_EMBEDDED, R.styleable.AndroidManifestActivity_allowEmbedded, sa)
| flag(ActivityInfo.FLAG_ALWAYS_FOCUSABLE, R.styleable.AndroidManifestActivity_alwaysFocusable, sa)
| flag(ActivityInfo.FLAG_AUTO_REMOVE_FROM_RECENTS, R.styleable.AndroidManifestActivity_autoRemoveFromRecents, sa)
diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
index 16f5d16..12dfef4 100644
--- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
+++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
@@ -155,7 +155,7 @@
ParsingPackage setUiOptions(int uiOptions);
- ParsingPackage setBaseHardwareAccelerated(boolean baseHardwareAccelerated);
+ ParsingPackage setHardwareAccelerated(boolean hardwareAccelerated);
ParsingPackage setResizeableActivity(Boolean resizeable);
@@ -255,13 +255,13 @@
ParsingPackage setBackupAgentName(String backupAgentName);
- ParsingPackage setBanner(int banner);
+ ParsingPackage setBannerRes(int banner);
ParsingPackage setCategory(int category);
ParsingPackage setClassLoaderName(String classLoaderName);
- ParsingPackage setClassName(String className);
+ ParsingPackage setApplicationClassName(String className);
ParsingPackage setCompatibleWidthLimitDp(int compatibleWidthLimitDp);
@@ -281,9 +281,9 @@
ParsingPackage setCrossProfile(boolean crossProfile);
- ParsingPackage setFullBackupContent(int fullBackupContent);
+ ParsingPackage setFullBackupContentRes(int fullBackupContentRes);
- ParsingPackage setDataExtractionRules(int dataExtractionRules);
+ ParsingPackage setDataExtractionRulesRes(int dataExtractionRulesRes);
ParsingPackage setHasDomainUrls(boolean hasDomainUrls);
@@ -292,13 +292,13 @@
ParsingPackage setInstallLocation(int installLocation);
/** @see R#styleable.AndroidManifest_sharedUserMaxSdkVersion */
- ParsingPackage setLeavingSharedUid(boolean leavingSharedUid);
+ ParsingPackage setLeavingSharedUser(boolean leavingSharedUser);
ParsingPackage setLabelRes(int labelRes);
ParsingPackage setLargestWidthLimitDp(int largestWidthLimitDp);
- ParsingPackage setLogo(int logo);
+ ParsingPackage setLogoRes(int logo);
ParsingPackage setManageSpaceActivityName(String manageSpaceActivityName);
@@ -336,13 +336,13 @@
ParsingPackage setRoundIconRes(int roundIconRes);
- ParsingPackage setSharedUserLabel(int sharedUserLabel);
+ ParsingPackage setSharedUserLabelRes(int sharedUserLabelRes);
ParsingPackage setSigningDetails(@NonNull SigningDetails signingDetails);
ParsingPackage setSplitClassLoaderName(int splitIndex, String classLoaderName);
- ParsingPackage setStaticSharedLibVersion(long staticSharedLibVersion);
+ ParsingPackage setStaticSharedLibraryVersion(long staticSharedLibraryVersion);
ParsingPackage setSupportsLargeScreens(int supportsLargeScreens);
@@ -354,7 +354,7 @@
ParsingPackage setTargetSandboxVersion(int targetSandboxVersion);
- ParsingPackage setTheme(int theme);
+ ParsingPackage setThemeRes(int theme);
ParsingPackage setRequestForegroundServiceExemption(boolean requestForegroundServiceExemption);
@@ -512,7 +512,7 @@
boolean isAnyDensity();
- boolean isBaseHardwareAccelerated();
+ boolean isHardwareAccelerated();
boolean isCantSaveState();
diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
index c6e1793..2a2640d 100644
--- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
+++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
@@ -1044,9 +1044,9 @@
}
return input.success(pkg
- .setLeavingSharedUid(leaving)
+ .setLeavingSharedUser(leaving)
.setSharedUserId(str.intern())
- .setSharedUserLabel(resId(R.styleable.AndroidManifest_sharedUserLabel, sa)));
+ .setSharedUserLabelRes(resId(R.styleable.AndroidManifest_sharedUserLabel, sa)));
}
private static ParseResult<ParsingPackage> parseKeySets(ParseInput input,
@@ -1869,7 +1869,7 @@
return input.error("Empty class name in package " + packageName);
}
- pkg.setClassName(outInfoName);
+ pkg.setApplicationClassName(outInfoName);
}
TypedValue labelValue = sa.peekValue(R.styleable.AndroidManifestApplication_label);
@@ -1939,7 +1939,7 @@
fullBackupContent = v.data == 0 ? -1 : 0;
}
- pkg.setFullBackupContent(fullBackupContent);
+ pkg.setFullBackupContentRes(fullBackupContent);
}
if (DEBUG_BACKUP) {
Slog.v(TAG, "fullBackupContent=" + fullBackupContent + " for " + pkgName);
@@ -2247,7 +2247,7 @@
.setOnBackInvokedCallbackEnabled(bool(false, R.styleable.AndroidManifestApplication_enableOnBackInvokedCallback, sa))
// targetSdkVersion gated
.setAllowAudioPlaybackCapture(bool(targetSdk >= Build.VERSION_CODES.Q, R.styleable.AndroidManifestApplication_allowAudioPlaybackCapture, sa))
- .setBaseHardwareAccelerated(bool(targetSdk >= Build.VERSION_CODES.ICE_CREAM_SANDWICH, R.styleable.AndroidManifestApplication_hardwareAccelerated, sa))
+ .setHardwareAccelerated(bool(targetSdk >= Build.VERSION_CODES.ICE_CREAM_SANDWICH, R.styleable.AndroidManifestApplication_hardwareAccelerated, sa))
.setRequestLegacyExternalStorage(bool(targetSdk < Build.VERSION_CODES.Q, R.styleable.AndroidManifestApplication_requestLegacyExternalStorage, sa))
.setUsesCleartextTraffic(bool(targetSdk < Build.VERSION_CODES.P, R.styleable.AndroidManifestApplication_usesCleartextTraffic, sa))
// Ints Default 0
@@ -2258,14 +2258,14 @@
.setMaxAspectRatio(aFloat(R.styleable.AndroidManifestApplication_maxAspectRatio, sa))
.setMinAspectRatio(aFloat(R.styleable.AndroidManifestApplication_minAspectRatio, sa))
// Resource ID
- .setBanner(resId(R.styleable.AndroidManifestApplication_banner, sa))
+ .setBannerRes(resId(R.styleable.AndroidManifestApplication_banner, sa))
.setDescriptionRes(resId(R.styleable.AndroidManifestApplication_description, sa))
.setIconRes(resId(R.styleable.AndroidManifestApplication_icon, sa))
- .setLogo(resId(R.styleable.AndroidManifestApplication_logo, sa))
+ .setLogoRes(resId(R.styleable.AndroidManifestApplication_logo, sa))
.setNetworkSecurityConfigRes(resId(R.styleable.AndroidManifestApplication_networkSecurityConfig, sa))
.setRoundIconRes(resId(R.styleable.AndroidManifestApplication_roundIcon, sa))
- .setTheme(resId(R.styleable.AndroidManifestApplication_theme, sa))
- .setDataExtractionRules(
+ .setThemeRes(resId(R.styleable.AndroidManifestApplication_theme, sa))
+ .setDataExtractionRulesRes(
resId(R.styleable.AndroidManifestApplication_dataExtractionRules, sa))
.setLocaleConfigRes(resId(R.styleable.AndroidManifestApplication_localeConfig, sa))
// Strings
@@ -2399,7 +2399,7 @@
}
return input.success(pkg.setStaticSharedLibraryName(lname.intern())
- .setStaticSharedLibVersion(
+ .setStaticSharedLibraryVersion(
PackageInfo.composeLongVersionCode(versionMajor, version))
.setStaticSharedLibrary(true));
} finally {
@@ -2694,7 +2694,7 @@
// Build custom App Details activity info instead of parsing it from xml
return input.success(ParsedActivity.makeAppDetailsActivity(packageName,
pkg.getProcessName(), pkg.getUiOptions(), taskAffinity,
- pkg.isBaseHardwareAccelerated()));
+ pkg.isHardwareAccelerated()));
}
/**
diff --git a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageParserTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageParserTest.java
index c8e2676..c6b7736 100644
--- a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageParserTest.java
+++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageParserTest.java
@@ -753,7 +753,7 @@
.setPVersionCode(pkg.getLongVersionCode())
.setPkgFlags(PackageInfoUtils.appInfoFlags(pkg, null))
.setPrivateFlags(PackageInfoUtils.appInfoPrivateFlags(pkg, null))
- .setSharedUserId(pkg.getSharedUserLabel())
+ .setSharedUserId(pkg.getSharedUserLabelRes())
.build();
}
@@ -761,9 +761,9 @@
public static void assertPackagesEqual(AndroidPackage a, AndroidPackage b) {
assertEquals(a.getBaseRevisionCode(), b.getBaseRevisionCode());
- assertEquals(a.isBaseHardwareAccelerated(), b.isBaseHardwareAccelerated());
+ assertEquals(a.isHardwareAccelerated(), b.isHardwareAccelerated());
assertEquals(a.getLongVersionCode(), b.getLongVersionCode());
- assertEquals(a.getSharedUserLabel(), b.getSharedUserLabel());
+ assertEquals(a.getSharedUserLabelRes(), b.getSharedUserLabelRes());
assertEquals(a.getInstallLocation(), b.getInstallLocation());
assertEquals(a.isCoreApp(), b.isCoreApp());
assertEquals(a.isRequiredForAllUsers(), b.isRequiredForAllUsers());
@@ -1036,8 +1036,8 @@
permission.setParsedPermissionGroup(new ParsedPermissionGroupImpl());
((ParsedPackage) pkg.setBaseRevisionCode(100)
- .setBaseHardwareAccelerated(true)
- .setSharedUserLabel(100)
+ .setHardwareAccelerated(true)
+ .setSharedUserLabelRes(100)
.setInstallLocation(100)
.setRequiredForAllUsers(true)
.asSplit(
@@ -1062,7 +1062,7 @@
.setSdkLibVersionMajor(42)
.addUsesSdkLibrary("sdk23", 200, new String[]{"digest2"})
.setStaticSharedLibraryName("foo23")
- .setStaticSharedLibVersion(100)
+ .setStaticSharedLibraryVersion(100)
.addUsesStaticLibrary("foo23", 100, new String[]{"digest"})
.addLibraryName("foo10")
.addUsesLibrary("foo11")
diff --git a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/ScanTests.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/ScanTests.java
index b6f1b87..b5bd869 100644
--- a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/ScanTests.java
+++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/ScanTests.java
@@ -273,7 +273,7 @@
public void installStaticSharedLibrary() throws Exception {
final ParsedPackage pkg = ((ParsedPackage) createBasicPackage("static.lib.pkg")
.setStaticSharedLibraryName("static.lib")
- .setStaticSharedLibVersion(123L)
+ .setStaticSharedLibraryVersion(123L)
.hideAsParsed())
.setPackageName("static.lib.pkg.123")
.setVersionCodeMajor(1)
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt
index c439639..1619856 100644
--- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt
+++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt
@@ -147,27 +147,27 @@
)
override val baseParams = listOf(
+ AndroidPackage::getApplicationClassName,
AndroidPackage::getAppComponentFactory,
AndroidPackage::getAutoRevokePermissions,
AndroidPackage::getBackupAgentName,
- AndroidPackage::getBanner,
+ AndroidPackage::getBannerRes,
AndroidPackage::getBaseApkPath,
AndroidPackage::getBaseRevisionCode,
AndroidPackage::getCategory,
AndroidPackage::getClassLoaderName,
- AndroidPackage::getClassName,
AndroidPackage::getCompatibleWidthLimitDp,
AndroidPackage::getCompileSdkVersion,
AndroidPackage::getCompileSdkVersionCodeName,
- AndroidPackage::getDataExtractionRules,
+ AndroidPackage::getDataExtractionRulesRes,
AndroidPackage::getDescriptionRes,
- AndroidPackage::getFullBackupContent,
+ AndroidPackage::getFullBackupContentRes,
AndroidPackage::getGwpAsanMode,
AndroidPackage::getIconRes,
AndroidPackage::getInstallLocation,
AndroidPackage::getLabelRes,
AndroidPackage::getLargestWidthLimitDp,
- AndroidPackage::getLogo,
+ AndroidPackage::getLogoRes,
AndroidPackage::getLocaleConfigRes,
AndroidPackage::getManageSpaceActivityName,
AndroidPackage::getMaxSdkVersion,
@@ -195,15 +195,15 @@
PackageImpl::getSecondaryCpuAbi,
AndroidPackage::getSecondaryNativeLibraryDir,
AndroidPackage::getSharedUserId,
- AndroidPackage::getSharedUserLabel,
+ AndroidPackage::getSharedUserLabelRes,
AndroidPackage::getSdkLibraryName,
AndroidPackage::getSdkLibVersionMajor,
AndroidPackage::getStaticSharedLibraryName,
- AndroidPackage::getStaticSharedLibVersion,
+ AndroidPackage::getStaticSharedLibraryVersion,
AndroidPackage::getTargetSandboxVersion,
AndroidPackage::getTargetSdkVersion,
AndroidPackage::getTaskAffinity,
- AndroidPackage::getTheme,
+ AndroidPackage::getThemeRes,
AndroidPackage::getUiOptions,
AndroidPackage::getUid,
AndroidPackage::getVersionName,
@@ -215,7 +215,7 @@
AndroidPackage::isAllowNativeHeapPointerTagging,
AndroidPackage::isAllowTaskReparenting,
AndroidPackage::isBackupInForeground,
- AndroidPackage::isBaseHardwareAccelerated,
+ AndroidPackage::isHardwareAccelerated,
AndroidPackage::isCantSaveState,
AndroidPackage::isCoreApp,
AndroidPackage::isCrossProfile,
@@ -260,7 +260,7 @@
AndroidPackage::isUsesNonSdkApi,
AndroidPackage::isVisibleToInstantApps,
AndroidPackage::isVmSafeMode,
- AndroidPackage::isLeavingSharedUid,
+ AndroidPackage::isLeavingSharedUser,
AndroidPackage::isResetEnabledSettingsOnAppDataCleared,
AndroidPackage::getMaxAspectRatio,
AndroidPackage::getMinAspectRatio,
@@ -293,7 +293,7 @@
adder(AndroidPackage::getUsesOptionalLibraries, "testUsesOptionalLibrary"),
adder(AndroidPackage::getUsesOptionalNativeLibraries, "testUsesOptionalNativeLibrary"),
getSetByValue(
- AndroidPackage::areAttributionsUserVisible,
+ AndroidPackage::isAttributionsUserVisible,
PackageImpl::setAttributionsAreUserVisible,
true
),
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt b/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt
index 28c78b2..cffd027 100644
--- a/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt
@@ -391,7 +391,7 @@
libraries?.forEach { pkg.addLibraryName(it) }
staticLibrary?.let {
pkg.setStaticSharedLibraryName(it)
- pkg.setStaticSharedLibVersion(staticLibraryVersion)
+ pkg.setStaticSharedLibraryVersion(staticLibraryVersion)
pkg.setStaticSharedLibrary(true)
}
usesLibraries?.forEach { pkg.addUsesLibrary(it) }
@@ -435,7 +435,7 @@
libraries?.forEach { addLibraryName(it) }
staticLibrary?.let {
setStaticSharedLibraryName(it)
- setStaticSharedLibVersion(staticLibraryVersion)
+ setStaticSharedLibraryVersion(staticLibraryVersion)
setStaticSharedLibrary(true)
}
usesLibraries?.forEach { addUsesLibrary(it) }