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

Commit 2f4c9843 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove one legacy install path"

parents c1b14f8a b13f1533

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/content/pm/IPackageDataObserver.aidl \

	core/java/android/content/pm/IPackageDeleteObserver.aidl \

	core/java/android/content/pm/IPackageDeleteObserver2.aidl \

	core/java/android/content/pm/IPackageInstallObserver.aidl \

	core/java/android/content/pm/IPackageInstallObserver2.aidl \

	core/java/android/content/pm/IPackageInstaller.aidl \

	core/java/android/content/pm/IPackageInstallerCallback.aidl \

core/java/android/app/ApplicationPackageManager.java

+3 −17
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.content.pm.FeatureInfo; 
import android.content.pm.IOnPermissionsChangeListener;

import android.content.pm.IPackageDataObserver;

import android.content.pm.IPackageDeleteObserver;

import android.content.pm.IPackageInstallObserver;

import android.content.pm.IPackageManager;

import android.content.pm.IPackageMoveObserver;

import android.content.pm.IPackageStatsObserver;
@@ -1681,21 +1680,8 @@ public class ApplicationPackageManager extends PackageManager { 
    }



    @Override

    public void installPackage(Uri packageURI, IPackageInstallObserver observer, int flags,

                               String installerPackageName) {

        installCommon(packageURI, new LegacyPackageInstallObserver(observer), flags,

                installerPackageName, mContext.getUserId());

    }



    @Override

    public void installPackage(Uri packageURI, PackageInstallObserver observer,

            int flags, String installerPackageName) {

        installCommon(packageURI, observer, flags, installerPackageName, mContext.getUserId());

    }



    private void installCommon(Uri packageURI,

            PackageInstallObserver observer, int flags, String installerPackageName,

            int userId) {

    public void installPackage(Uri packageURI,

            PackageInstallObserver observer, int flags, String installerPackageName) {

        if (!"file".equals(packageURI.getScheme())) {

            throw new UnsupportedOperationException("Only file:// URIs are supported");

        }
@@ -1703,7 +1689,7 @@ public class ApplicationPackageManager extends PackageManager { 
        final String originPath = packageURI.getPath();

        try {

            mPM.installPackageAsUser(originPath, observer.getBinder(), flags, installerPackageName,

                    userId);

                    mContext.getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/content/pm/IPackageInstallObserver.aidl

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/*

**

** Copyright 2007, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/



package android.content.pm;



/**

 * API for installation callbacks from the Package Manager.

 * @hide

 */

oneway interface IPackageInstallObserver {

    void packageInstalled(in String packageName, int returnCode);

}

core/java/android/content/pm/PackageManager.java

+110 −159

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/backup/testutils/PackageManagerStub.java

+0 −7
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ import android.content.pm.ChangedPackages; 
import android.content.pm.FeatureInfo;

import android.content.pm.IPackageDataObserver;

import android.content.pm.IPackageDeleteObserver;

import android.content.pm.IPackageInstallObserver;

import android.content.pm.IPackageStatsObserver;

import android.content.pm.InstantAppInfo;

import android.content.pm.InstrumentationInfo;
@@ -622,12 +621,6 @@ public class PackageManagerStub extends PackageManager { 
        return null;

    }



    @Override

    public void installPackage(Uri packageURI, IPackageInstallObserver observer, int flags,

            String installerPackageName) {



    }



    @Override

    public void installPackage(Uri packageURI, PackageInstallObserver observer, int flags,

            String installerPackageName) {