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

Commit e3d5562e authored by Svet Ganov's avatar Svet Ganov Committed by android-build-merger
Browse files

Cleanup of the PackageInstaller API - PackageInstaller 

am: f9bf4f79

* commit 'f9bf4f79':
  Cleanup of the PackageInstaller API - PackageInstaller

Change-Id: I3dcb983f8f29f11b440d610fe843919b22a16f63
parents 45f1ec1a f9bf4f79

Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ LOCAL_PRIVILEGED_MODULE := true 


LOCAL_PROGUARD_FLAG_FILES := proguard.flags



# Comment for now unitl all private API dependencies are removed

# LOCAL_SDK_VERSION := system_current



include frameworks/base/packages/SettingsLib/common.mk



include $(BUILD_PACKAGE)

AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -127,6 +127,13 @@ 
                 android:permission="com.google.android.permission.INSTALL_WEARABLE_PACKAGES"

                 android:exported="true"/>



        <service android:name=".permission.service.RuntimePermissionPresenterServiceImpl"

                 android:permission="android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE">

            <intent-filter>

                <action android:name="android.permissionpresenterservice.RuntimePermissionPresenterService"/>

            </intent-filter>

        </service>



        <provider android:name=".wear.WearPackageIconProvider"

                  android:authorities="com.google.android.packageinstaller.wear.provider"

                  android:grantUriPermissions="true"

src/com/android/packageinstaller/InstallAppProgress.java

+1 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.content.pm.PackageInstaller; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ResolveInfo;

import android.content.pm.VerificationParams;

import android.graphics.drawable.LevelListDrawable;

import android.net.Uri;

import android.os.Bundle;
@@ -47,8 +46,7 @@ import android.widget.Button; 
import android.widget.ImageView;

import android.widget.ProgressBar;

import android.widget.TextView;



import libcore.io.IoUtils;

import com.android.packageinstaller.permission.utils.IoUtils;



import java.io.File;

import java.io.FileInputStream;

src/com/android/packageinstaller/PackageInstallerActivity.java

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

import android.content.DialogInterface.OnCancelListener;

import android.content.Intent;

import android.content.SharedPreferences;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageInstaller;
@@ -51,7 +50,7 @@ import android.widget.Button; 
import android.widget.ImageView;

import android.widget.TabHost;

import android.widget.TextView;

import com.android.packageinstaller.util.Utils;

import com.android.packageinstaller.permission.utils.Utils;



import java.io.File;

import java.io.FileOutputStream;

src/com/android/packageinstaller/PackageUtil.java

+1 −14
Original line number Diff line number Diff line
@@ -46,26 +46,13 @@ public class PackageUtil { 
    //intent attribute strings related to uninstall

    public static final String INTENT_ATTR_PACKAGE_NAME=PREFIX+"PackageName";



    /**

     * Utility method to get application information for a given {@link File}

     */

    public static ApplicationInfo getApplicationInfo(File sourcePath) {

        final PackageParser parser = new PackageParser();

        try {

            PackageParser.Package pkg = parser.parseMonolithicPackage(sourcePath, 0);

            return pkg.applicationInfo;

        } catch (PackageParserException e) {

            return null;

        }

    }



    /**

     * Utility method to get package information for a given {@link File}

     */

    public static PackageParser.Package getPackageInfo(File sourceFile) {

        final PackageParser parser = new PackageParser();

        try {

            return parser.parseMonolithicPackage(sourceFile, 0);

            return parser.parsePackage(sourceFile, 0);

        } catch (PackageParserException e) {

            return null;

        }