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

Commit 4ddd54a0 authored by Hai Zhang's avatar Hai Zhang
Browse files

Remove target SDK check for adding REVOKED_COMPAT in setUidMode(). 

Previously this could work regardless of target SDK version, so for
compatibility it should still work that way.

Bug: 146386279
Bug: 136503238
Test: presubmit
Change-Id: I57729f0d35679afaf3a43dfac5cd42f488d78baf
parent 512f632f

services/core/java/com/android/server/appop/AppOpsService.java

+0 −7
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ import android.hardware.camera2.CameraDevice.CAMERA_AUDIO_RESTRICTION; 
import android.net.Uri;

import android.os.AsyncTask;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;
@@ -1979,12 +1978,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
    }



    private void updatePermissionRevokedCompat(int uid, int switchCode, int mode) {

        PackageManagerInternal packageManagerInternal = LocalServices.getService(

                PackageManagerInternal.class);

        if (packageManagerInternal.getUidTargetSdkVersion(uid) >= Build.VERSION_CODES.M) {

            return;

        }



        PackageManager packageManager = mContext.getPackageManager();

        String[] packageNames = packageManager.getPackagesForUid(uid);

        if (ArrayUtils.isEmpty(packageNames)) {