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

Commit 6e20ff3d authored Oct 28, 2016 by Marie Janssen Committed by android-build-merger Oct 28, 2016

Merge "Add Bluetooth toggle prompts - package installer"

am: 4e2a5109

Change-Id: I72e7fc29c172f111ca37be023478cb3d30551569

parents 49c46a2e 4e2a5109

src/com/android/packageinstaller/permission/model/AppPermissions.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,9 @@ public final class AppPermissions {
		}

		public boolean isReviewRequired() {
		if (!Build.PERMISSIONS_REVIEW_REQUIRED) {
		if (!mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_permissionReviewRequired)
		&& !Build.PERMISSIONS_REVIEW_REQUIRED) {
		return false;
		}
		final int groupCount = mGroups.size();

src/com/android/packageinstaller/permission/ui/television/AllAppPermissionsFragment.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -288,8 +288,10 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader {
		return Utils.applyTint(context, icon, android.R.attr.colorControlNormal);
		}

		private static boolean isMutableGranularPermission(String name) {
		if (!Build.PERMISSIONS_REVIEW_REQUIRED) {
		private boolean isMutableGranularPermission(String name) {
		if (!getResources().getBoolean(
		com.android.internal.R.bool.config_permissionReviewRequired)
		&& !Build.PERMISSIONS_REVIEW_REQUIRED) {
		return false;
		}
		switch (name) {