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

Commit 82b0dd81 authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert "Block application install from unknown sources through adb" 

 * Accidental merge, not ready yet.

This reverts commit 0a8e1431.
parent 67735c4e

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

+0 −8
Original line number Diff line number Diff line
@@ -575,14 +575,6 @@ public abstract class PackageManager { 
     */

    public static final int INSTALL_FAILED_VERSION_DOWNGRADE = -25;



    /**

     * Installation return code: this is passed to the {@link IPackageInstallObserver} by

     * {@link #installPackage(android.net.Uri, IPackageInstallObserver, int)} if

     * the package is from unknown sources but not trusted sources.

     * @hide

     */

    public static final int INSTALL_FAILED_UNKNOWN_SOURCES = -26;



    /**

     * Installation parse return code: this is passed to the {@link IPackageInstallObserver} by

     * {@link #installPackage(android.net.Uri, IPackageInstallObserver, int)}

services/java/com/android/server/pm/PackageManagerService.java

+0 −12
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ import android.os.SystemProperties; 
import android.os.UserHandle;

import android.os.Environment.UserEnvironment;

import android.os.UserManager;

import android.provider.Settings.Global;

import android.provider.Settings.Secure;

import android.security.KeyStore;

import android.security.SystemKeyStore;
@@ -6690,17 +6689,6 @@ public class PackageManagerService extends IPackageManager.Stub { 
            filteredFlags = flags & ~PackageManager.INSTALL_FROM_ADB;

        }



        // Check if unknown sources allowed

        if (android.app.AppOpsManager.isStrictEnable() &&

            ((filteredFlags & PackageManager.INSTALL_FROM_ADB) != 0) &&

            Global.getInt(mContext.getContentResolver(), Global.INSTALL_NON_MARKET_APPS, 0) <= 0) {

            try {

                observer.packageInstalled("", PackageManager.INSTALL_FAILED_UNKNOWN_SOURCES);

            } catch (RemoteException re) {

            }

            return;

        }



        verificationParams.setInstallerUid(uid);



        final Message msg = mHandler.obtainMessage(INIT_COPY);