From 59bd89fa295a2434f176c617d8b56a92d58b9992 Mon Sep 17 00:00:00 2001 From: Paul Navin Date: Mon, 13 Feb 2017 18:33:33 +0000 Subject: DO NOT MERGE Change permissions review mode check. In ag/1835531 we introduced a check for permissions review mode, that relies on an overlay resource. Since we can't use overlay resources for the Unified Build, this CL temporarily introduces the checking for a build property as well. This possibly won't work for O/G, but will work for the Feldspar release of the Unified build. BUG: 35028846 Change-Id: I4c82f242bc680028ecd872589552534a419f0152 --- core/java/android/app/ApplicationPackageManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index c44cdb290de6..30af60e40205 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -62,6 +62,7 @@ import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -293,7 +294,7 @@ public class ApplicationPackageManager extends PackageManager { @Override public boolean isPermissionReviewModeEnabled() { - return mContext.getResources().getBoolean( + return Build.PERMISSIONS_REVIEW_REQUIRED || mContext.getResources().getBoolean( com.android.internal.R.bool.config_permissionReviewRequired); } -- cgit v1.2.3-59-g8ed1b