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

Commit 51dbc241 authored by Sumedh Sen's avatar Sumedh Sen
Browse files

Change the imports in Pia V1 to use refactored utils 

Bug: 182205982
Test: Builds successfully
Change-Id: I4efdf76dbf92a8d7eb44bc315a1b6f7c6020a3e9
parent f476db90

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

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ import android.os.Bundle; 
import android.util.Log;

import android.view.View;

import android.widget.Button;



import androidx.annotation.Nullable;



import com.android.packageinstaller.common.EventResultPersister;

import com.android.packageinstaller.common.InstallEventReceiver;

import java.io.File;

import java.io.IOException;

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

+2 −10
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.Manifest; 
import android.app.Activity;

import android.app.DialogFragment;

import android.app.admin.DevicePolicyManager;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Intent;

import android.content.pm.ApplicationInfo;
@@ -39,7 +38,6 @@ import android.os.UserManager; 
import android.text.TextUtils;

import android.util.EventLog;

import android.util.Log;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import com.android.packageinstaller.v2.ui.InstallLaunch;
@@ -63,17 +61,10 @@ public class InstallStart extends Activity { 
    protected void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        mPackageManager = getPackageManager();



        if (usePiaV2()) {

            Log.i(TAG, "Using Pia V2");



            mPackageManager.setComponentEnabledSetting(new ComponentName(this,

                    com.android.packageinstaller.InstallEventReceiver.class),

                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);

            mPackageManager.setComponentEnabledSetting(new ComponentName(this,

                    com.android.packageinstaller.v2.model.InstallEventReceiver.class),

                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);



            Intent piaV2 = new Intent(getIntent());

            piaV2.putExtra(InstallLaunch.EXTRA_CALLING_PKG_NAME, getCallingPackage());

            piaV2.putExtra(InstallLaunch.EXTRA_CALLING_PKG_UID, getLaunchedFromUid());
@@ -83,6 +74,7 @@ public class InstallStart extends Activity { 
            finish();

            return;

        }

        mPackageManager = getPackageManager();

        mUserManager = getSystemService(UserManager.class);



        Intent intent = getIntent();

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

+2 −1
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.util.Log;

import android.widget.Toast;



import androidx.annotation.Nullable;

import com.android.packageinstaller.common.EventResultPersister;

import com.android.packageinstaller.common.UninstallEventReceiver;



/**

 * Start an uninstallation, show a dialog while uninstalling and return result to the caller.

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

+2 −11
Original line number Diff line number Diff line
@@ -47,15 +47,15 @@ import android.os.Process; 
import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;



import androidx.annotation.NonNull;

import androidx.annotation.StringRes;



import com.android.packageinstaller.handheld.ErrorDialogFragment;

import com.android.packageinstaller.handheld.UninstallAlertDialogFragment;

import com.android.packageinstaller.television.ErrorFragment;

import com.android.packageinstaller.television.UninstallAlertFragment;

import com.android.packageinstaller.television.UninstallAppProgress;

import com.android.packageinstaller.common.EventResultPersister;

import com.android.packageinstaller.common.UninstallEventReceiver;

import com.android.packageinstaller.v2.ui.UninstallLaunch;



import java.util.List;
@@ -94,15 +94,6 @@ public class UninstallerActivity extends Activity { 
        if (usePiaV2() && !isTv()) {

            Log.i(TAG, "Using Pia V2");



            PackageManager pm = getPackageManager();

            pm.setComponentEnabledSetting(

                new ComponentName(this, com.android.packageinstaller.UninstallEventReceiver.class),

                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);

            pm.setComponentEnabledSetting(

                new ComponentName(this,

                    com.android.packageinstaller.v2.model.UninstallEventReceiver.class),

                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);



            boolean returnResult = getIntent().getBooleanExtra(Intent.EXTRA_RETURN_RESULT, false);

            Intent piaV2 = new Intent(getIntent());

            piaV2.putExtra(UninstallLaunch.EXTRA_CALLING_PKG_UID, getLaunchedFromUid());

packages/PackageInstaller/src/com/android/packageinstaller/television/UninstallAppProgress.java

100755 → 100644
+2 −5
Original line number Diff line number Diff line
@@ -37,14 +37,11 @@ import android.util.Log; 
import android.util.TypedValue;

import android.view.KeyEvent;

import android.widget.Toast;



import androidx.annotation.Nullable;



import com.android.packageinstaller.EventResultPersister;

import com.android.packageinstaller.PackageUtil;

import com.android.packageinstaller.R;

import com.android.packageinstaller.UninstallEventReceiver;



import com.android.packageinstaller.common.EventResultPersister;

import com.android.packageinstaller.common.UninstallEventReceiver;

import java.lang.ref.WeakReference;

import java.util.List;