From c613c7760f0c13381576d6c6a1ed3419ed9d4a9d Mon Sep 17 00:00:00 2001 From: Paul McLean Date: Fri, 13 Dec 2019 11:36:16 -0700 Subject: Fix "atest ResolverActivityTest" UPDATE_APP_OPS_STATS failure. Bug: 146215372 Test: run atest ResolverActivityTest. Scan results. Change-Id: I81311c4963b0946d34f6c610f73b603e7b821d1b --- core/java/com/android/internal/app/ResolverActivity.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 9cf5e9f47e7f..9b397610792f 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -36,7 +36,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.PermissionChecker; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -780,12 +779,9 @@ public class ResolverActivity extends Activity implements ActivityInfo activityInfo = ri.activityInfo; boolean hasRecordPermission = - PermissionChecker.checkPermissionForPreflight( - getApplicationContext(), - android.Manifest.permission.RECORD_AUDIO, -1, - activityInfo.applicationInfo.uid, + mPm.checkPermission(android.Manifest.permission.RECORD_AUDIO, activityInfo.packageName) - == android.content.pm.PackageManager.PERMISSION_GRANTED; + == android.content.pm.PackageManager.PERMISSION_GRANTED; if (!hasRecordPermission) { // OK, we know the record permission, is this a capture device -- cgit v1.2.3-59-g8ed1b