Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Change permissions review mode check.

Browse Source 
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
This commit is contained in:
Paul Navin
2017-02-13 18:33:33 +00:00
parent 106f1443c1
commit 59bd89fa29
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/ApplicationPackageManager.java
View File

@@ -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);
}