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

Revert "[pm] Add --no-profile option into install command"

Browse Source 
Revert submission 23751368

Reason for revert: Should be handled in ArtService. More details in b/257532944#comment31

Reverted changes: /q/submissionid:23751368

Bug: 257532944
Change-Id: Icdc1d3f9e7b7c01d7bcc70a34d1070c73fb9ff43
This commit is contained in:
Ivan Chiang
2023-07-18 01:08:21 +00:00
parent 8a57771419
commit da3654875b
4 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1432,7 +1432,6 @@ public abstract class PackageManager {
INSTALL_ALLOW_DOWNGRADE,
INSTALL_STAGED,
INSTALL_REQUEST_UPDATE_OWNERSHIP,
INSTALL_DONT_EXTRACT_BASELINE_PROFILES,
})
@Retention(RetentionPolicy.SOURCE)
public @interface InstallFlags {}
@@ -1647,13 +1646,6 @@ public abstract class PackageManager {
*/
public static final int INSTALL_FROM_MANAGED_USER_OR_PROFILE = 1 << 26;
/**
* Flag parameter for {@link PackageInstaller.SessionParams} to indicate that do not extract
* the baseline profiles when parsing the apk
* @hide
*/
public static final int INSTALL_DONT_EXTRACT_BASELINE_PROFILES = 1 << 27;
/** @hide */
@IntDef(flag = true, value = {
DONT_KILL_APP,

6
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -1077,8 +1077,6 @@ final class InstallPackageHelper {
final boolean isApex = ((installFlags & PackageManager.INSTALL_APEX) != 0);
final boolean isRollback =
request.getInstallReason() == PackageManager.INSTALL_REASON_ROLLBACK;
final boolean extractProfile =
((installFlags & PackageManager.INSTALL_DONT_EXTRACT_BASELINE_PROFILES) == 0);
@PackageManagerService.ScanFlags int scanFlags = SCAN_NEW_INSTALL | SCAN_UPDATE_SIGNATURE;
if (request.isInstallMove()) {
// moving a complete application; perform an initial scan on the new install location
@@ -1114,9 +1112,7 @@ final class InstallPackageHelper {
@ParsingPackageUtils.ParseFlags final int parseFlags =
mPm.getDefParseFlags() | ParsingPackageUtils.PARSE_CHATTY
| ParsingPackageUtils.PARSE_ENFORCE_CODE
| (onExternal ? ParsingPackageUtils.PARSE_EXTERNAL_STORAGE : 0)
| (extractProfile
? ParsingPackageUtils.PARSE_EXTRACT_BASELINE_PROFILES_FROM_APK : 0);
| (onExternal ? ParsingPackageUtils.PARSE_EXTERNAL_STORAGE : 0);
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "parsePackage");
final ParsedPackage parsedPackage;

9
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -3456,10 +3456,6 @@ class PackageManagerShellCommand extends ShellCommand {
sessionParams.installFlags |=
PackageManager.INSTALL_BYPASS_LOW_TARGET_SDK_BLOCK;
break;
case "--no-profile":
sessionParams.installFlags |=
PackageManager.INSTALL_DONT_EXTRACT_BASELINE_PROFILES;
break;
default:
throw new IllegalArgumentException("Unknown option " + opt);
}
@@ -4348,7 +4344,7 @@ class PackageManagerShellCommand extends ShellCommand {
pw.println(" [--install-reason 0/1/2/3/4] [--originating-uri URI]");
pw.println(" [--referrer URI] [--abi ABI_NAME] [--force-sdk]");
pw.println(" [--preload] [--instant] [--full] [--dont-kill]");
pw.println(" [--enable-rollback] [--no-profile]");
pw.println(" [--enable-rollback]");
pw.println(" [--force-uuid internal|UUID] [--pkg PACKAGE] [-S BYTES]");
pw.println(" [--apex] [--force-non-staged] [--staged-ready-timeout TIMEOUT]");
pw.println(" [PATH [SPLIT...]|-]");
@@ -4381,7 +4377,6 @@ class PackageManagerShellCommand extends ShellCommand {
pw.println(" --apex: install an .apex file, not an .apk");
pw.println(" --force-non-staged: force the installation to run under a non-staged");
pw.println(" session, which may complete without requiring a reboot");
pw.println(" --no-profile: don't extract the profiles from the apk");
pw.println(" --staged-ready-timeout: By default, staged sessions wait "
+ DEFAULT_STAGED_READY_TIMEOUT_MS);
pw.println(" milliseconds for pre-reboot verification to complete when");
@@ -4403,7 +4398,7 @@ class PackageManagerShellCommand extends ShellCommand {
pw.println(" [--referrer URI] [--abi ABI_NAME] [--force-sdk]");
pw.println(" [--preload] [--instant] [--full] [--dont-kill]");
pw.println(" [--force-uuid internal|UUID] [--pkg PACKAGE] [--apex] [-S BYTES]");
pw.println(" [--multi-package] [--staged] [--no-profile] [--update-ownership]");
pw.println(" [--multi-package] [--staged] [--update-ownership]");
pw.println(" Like \"install\", but starts an install session. Use \"install-write\"");
pw.println(" to push data into the session, and \"install-commit\" to finish.");
pw.println("");

9
services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
View File

@@ -242,11 +242,6 @@ public class ParsingPackageUtils {
public static final int PARSE_IGNORE_OVERLAY_REQUIRED_SYSTEM_PROPERTY = 1 << 7;
public static final int PARSE_APK_IN_APEX = 1 << 9;
/**
* This flag is to determine whether to extract the baseline profiles from the apk or not.
*/
public static final int PARSE_EXTRACT_BASELINE_PROFILES_FROM_APK = 1 << 10;
public static final int PARSE_CHATTY = 1 << 31;
/** The total maximum number of activities, services, providers and activity-aliases */
@@ -258,16 +253,14 @@ public class ParsingPackageUtils {
private static final int MAX_PERMISSION_NAME_LENGTH = 512;
@IntDef(flag = true, prefix = { "PARSE_" }, value = {
PARSE_APK_IN_APEX,
PARSE_CHATTY,
PARSE_COLLECT_CERTIFICATES,
PARSE_ENFORCE_CODE,
PARSE_EXTERNAL_STORAGE,
PARSE_EXTRACT_BASELINE_PROFILES_FROM_APK,
PARSE_IGNORE_OVERLAY_REQUIRED_SYSTEM_PROPERTY,
PARSE_IGNORE_PROCESSES,
PARSE_IS_SYSTEM_DIR,
PARSE_MUST_BE_APK,
PARSE_IGNORE_OVERLAY_REQUIRED_SYSTEM_PROPERTY,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ParseFlags {}