Commit bb82feea authored Jun 30, 2015 by Dianne Hackborn Committed by Android Git Automerger Jun 30, 2015

am 707cb64d: am 5a6f2136: Merge "Fix issue #22185268: apps crash with missing...

am 707cb64d: am 5a6f2136: Merge "Fix issue #22185268: apps crash with missing permissions and NPE on AppOpsManager" into mnc-dev

* commit '707cb64d':
  Fix issue #22185268: apps crash with missing permissions and NPE on AppOpsManager

parents f2a08d05 707cb64d

services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ final class DefaultPermissionGrantPolicy {

		private static final Set<String> ACCOUNTS_PERMISSIONS = new ArraySet<>();
		static {
		ACCOUNTS_PERMISSIONS.add(Manifest.permission.GET_ACCOUNTS);
		//ACCOUNTS_PERMISSIONS.add(Manifest.permission.GET_ACCOUNTS);
		}

		private static final Set<String> SETTINGS_PERMISSIONS = new ArraySet<>();