Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1a841ce authored by Song Chun Fan's avatar Song Chun Fan Committed by Android (Google) Code Review
Browse files

Merge "Revert "[PIA] add missing flag checks"" into main

parents c2d58bab c367000a

packages/PackageInstaller/src/com/android/packageinstaller/InstallStaging.java

+2 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.content.res.AssetFileDescriptor.UNKNOWN_LENGTH; 


import static com.android.packageinstaller.PackageInstallerActivity.EXTRA_STAGED_SESSION_ID;



import android.Manifest;

import android.app.Activity;

import android.app.AlertDialog;

import android.app.Dialog;
@@ -28,10 +27,10 @@ import android.app.DialogFragment; 
import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.pm.Flags;

import android.content.pm.PackageInstaller;

import android.content.pm.PackageManager;

import android.content.res.AssetFileDescriptor;

import android.Manifest;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Bundle;
@@ -201,7 +200,7 @@ public class InstallStaging extends Activity { 
        params.setPermissionState(Manifest.permission.USE_FULL_SCREEN_INTENT,

                PackageInstaller.SessionParams.PERMISSION_STATE_DENIED);



        if (pfd != null && Flags.readInstallInfo()) {

        if (pfd != null) {

            try {

                final PackageInstaller.InstallInfo result = installer.readInstallInfo(pfd,

                        debugPathName, 0);

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

+1 −5
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.content.Context; 
import android.content.DialogInterface;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.Flags;

import android.content.pm.InstallSourceInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageInstaller;
@@ -400,10 +399,7 @@ public class PackageInstallerActivity extends Activity { 
            final int sessionId = intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID,

                    -1 /* defaultValue */);

            final SessionInfo info = mInstaller.getSessionInfo(sessionId);

            String resolvedPath = null;

            if (info != null && Flags.getResolvedApkPath()) {

                resolvedPath = info.getResolvedBaseApkPath();

            }

            String resolvedPath = info != null ? info.getResolvedBaseApkPath() : null;

            if (info == null || !info.isSealed() || resolvedPath == null) {

                Log.w(TAG, "Session " + sessionId + " in funky state; ignoring");

                finish();

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/InstallRepository.kt

+2 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.ContentResolver 
import android.content.Context

import android.content.Intent

import android.content.pm.ApplicationInfo

import android.content.pm.Flags

import android.content.pm.PackageInfo

import android.content.pm.PackageInstaller

import android.content.pm.PackageInstaller.SessionInfo
@@ -363,7 +362,7 @@ class InstallRepository(private val context: Context) { 
        params.setPermissionState(

            Manifest.permission.USE_FULL_SCREEN_INTENT, SessionParams.PERMISSION_STATE_DENIED

        )

        if (pfd != null && Flags.readInstallInfo()) {

        if (pfd != null) {

            try {

                val installInfo = packageInstaller.readInstallInfo(pfd, debugPathName, 0)

                params.setAppPackageName(installInfo.packageName)
@@ -426,8 +425,7 @@ class InstallRepository(private val context: Context) { 


        if (PackageInstaller.ACTION_CONFIRM_INSTALL == intent.action) {

            val info = packageInstaller.getSessionInfo(sessionId)

            val resolvedPath =

                    if (Flags.getResolvedApkPath()) info?.resolvedBaseApkPath else null

            val resolvedPath = info?.resolvedBaseApkPath

            if (info == null || !info.isSealed || resolvedPath == null) {

                Log.w(LOG_TAG, "Session $sessionId in funky state; ignoring")

                return InstallAborted(ABORT_REASON_INTERNAL_ERROR)