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

Commit 17d601ea authored by Hai Zhang's avatar Hai Zhang
Browse files

Revert "Don't kill apps for OP_REQUEST_INSTALL_PACKAGES on targetSdk < 26." 

This reverts commit f4887240.

Reason for revert: b/150819885#comment36

Fixes: 150819885
Test: atest CtsNoPermissionTestCases25
Change-Id: I393b639a8b825b4de471bdd1502da07005292735
parent f4887240

services/core/java/com/android/server/StorageManagerService.java

+1 −19
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ import android.content.res.ObbInfo; 
import android.database.ContentObserver;

import android.net.Uri;

import android.os.Binder;

import android.os.Build;

import android.os.DropBoxManager;

import android.os.Environment;

import android.os.Handler;
@@ -4663,10 +4662,6 @@ class StorageManagerService extends IStorageManager.Stub 
        }



        public void onAppOpsChanged(int code, int uid, @Nullable String packageName, int mode) {

            if (packageName == null) {

                // This happens :(

                return;

            }

            final long token = Binder.clearCallingIdentity();

            try {

                if (mIsFuseEnabled) {
@@ -4674,20 +4669,7 @@ class StorageManagerService extends IStorageManager.Stub 
                    switch(code) {

                        case OP_REQUEST_INSTALL_PACKAGES:

                            // Always kill regardless of op change, to remount apps /storage

                            try {

                                ApplicationInfo ai = mIPackageManager.getApplicationInfo(

                                        packageName,

                                        0, UserHandle.getUserId(uid));

                                if (ai.targetSdkVersion >= Build.VERSION_CODES.O) {

                            killAppForOpChange(code, uid, packageName);

                                } else {

                                    // Apps targeting <26 didn't need this app op to install

                                    // packages - they only need the manifest permission, instead.

                                    // So, there's also no need to kill them.

                                }

                            } catch (RemoteException e) {

                                // Ignore, this is an in-process call

                            }

                            return;

                        case OP_MANAGE_EXTERNAL_STORAGE:

                            if (mode != MODE_ALLOWED) {