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

Commit 28265615 authored Feb 22, 2017 by Shijian Li Committed by android-build-merger Feb 22, 2017

DO NOT MERGE: Refactor function names to match master branch.

am: 4f2e2ff4

Change-Id: Ia86139589bcb9cac58422c3403fd0922b657abab

parents dfbd9900 4f2e2ff4

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
		}
		}

		public boolean hasRuntimePermission() {
		public boolean doesSupportRuntimePermissions() {
		return mAppSupportsRuntimePermissions;
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -347,8 +347,8 @@ public class PermissionApps {
		return mAppPermissionGroup.hasGrantedByDefaultPermission();
		}

		public boolean hasRuntimePermissions() {
		return mAppPermissionGroup.hasRuntimePermission();
		public boolean doesSupportRuntimePermissions() {
		return mAppPermissionGroup.doesSupportRuntimePermissions();
		}

		public int getUserId() {

src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -281,7 +281,8 @@ public final class AppPermissionsFragment extends SettingsWithHeader
		group.grantRuntimePermissions(false);
		} else {
		final boolean grantedByDefault = group.hasGrantedByDefaultPermission();
		if (grantedByDefault \|\| (!group.hasRuntimePermission() && !mHasConfirmedRevoke)) {
		if (grantedByDefault \|\| (!group.doesSupportRuntimePermissions()
		&& !mHasConfirmedRevoke)) {
		new AlertDialog.Builder(getContext())
		.setMessage(grantedByDefault ? R.string.system_warning
		: R.string.old_sdk_deny_warning)

src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -350,7 +350,8 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
		app.grantRuntimePermissions();
		} else {
		final boolean grantedByDefault = app.hasGrantedByDefaultPermissions();
		if (grantedByDefault \|\| (!app.hasRuntimePermissions() && !mHasConfirmedRevoke)) {
		if (grantedByDefault \|\| (!app.doesSupportRuntimePermissions()
		&& !mHasConfirmedRevoke)) {
		new AlertDialog.Builder(getContext())
		.setMessage(grantedByDefault ? R.string.system_warning
		: R.string.old_sdk_deny_warning)

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -301,7 +301,8 @@ public final class AppPermissionsFragment extends SettingsWithHeader
		group.grantRuntimePermissions(false);
		} else {
		final boolean grantedByDefault = group.hasGrantedByDefaultPermission();
		if (grantedByDefault \|\| (!group.hasRuntimePermission() && !mHasConfirmedRevoke)) {
		if (grantedByDefault \|\| (!group.doesSupportRuntimePermissions()
		&& !mHasConfirmedRevoke)) {
		new AlertDialog.Builder(getContext())
		.setMessage(grantedByDefault ? R.string.system_warning
		: R.string.old_sdk_deny_warning)