Merge "introduce GET_PASSWORD_PRIVILEDGED permission." into nyc-dev (bb5e52f9) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -71,6 +71,7 @@ package android {
	field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";		field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";
	field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED";		field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED";
	field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";		field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";
			field public static final java.lang.String GET_PASSWORD_PRIVILEGED = "android.permission.GET_PASSWORD_PRIVILEGED";
	field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS";		field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS";
	field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";		field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";
	field public static final java.lang.String INSTALL_LOCATION_PROVIDER = "android.permission.INSTALL_LOCATION_PROVIDER";		field public static final java.lang.String INSTALL_LOCATION_PROVIDER = "android.permission.INSTALL_LOCATION_PROVIDER";

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -103,6 +103,7 @@ package android {
	field public static final java.lang.String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS";		field public static final java.lang.String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS";
	field public static final java.lang.String GET_PACKAGE_IMPORTANCE = "android.permission.GET_PACKAGE_IMPORTANCE";		field public static final java.lang.String GET_PACKAGE_IMPORTANCE = "android.permission.GET_PACKAGE_IMPORTANCE";
	field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";		field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";
			field public static final java.lang.String GET_PASSWORD_PRIVILEGED = "android.permission.GET_PASSWORD_PRIVILEGED";
	field public static final java.lang.String GET_PROCESS_STATE_AND_OOM_SCORE = "android.permission.GET_PROCESS_STATE_AND_OOM_SCORE";		field public static final java.lang.String GET_PROCESS_STATE_AND_OOM_SCORE = "android.permission.GET_PROCESS_STATE_AND_OOM_SCORE";
	field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS";		field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS";
	field public static final java.lang.String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO";		field public static final java.lang.String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO";

api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -71,6 +71,7 @@ package android {
	field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";		field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";
	field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED";		field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED";
	field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";		field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";
			field public static final java.lang.String GET_PASSWORD_PRIVILEGED = "android.permission.GET_PASSWORD_PRIVILEGED";
	field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS";		field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS";
	field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";		field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";
	field public static final java.lang.String INSTALL_LOCATION_PROVIDER = "android.permission.INSTALL_LOCATION_PROVIDER";		field public static final java.lang.String INSTALL_LOCATION_PROVIDER = "android.permission.INSTALL_LOCATION_PROVIDER";

core/java/android/accounts/AccountManager.java

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2798,6 +2798,15 @@ public class AccountManager {
	if (account == null) {		if (account == null) {
	throw new IllegalArgumentException("account is null");		throw new IllegalArgumentException("account is null");
	}		}

			// Always include the calling package name. This just makes life easier
			// down stream.
			final Bundle optionsIn = new Bundle();
			if (options != null) {
			optionsIn.putAll(options);
			}
			optionsIn.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName());

	return new AmsTask(activity, handler, callback) {		return new AmsTask(activity, handler, callback) {
	@Override		@Override
	public void doWork() throws RemoteException {		public void doWork() throws RemoteException {
	@@ -2806,7 +2815,7 @@ public class AccountManager {
	account,		account,
	authTokenType,		authTokenType,
	activity != null,		activity != null,
	options);		optionsIn);
	}		}
	}.start();		}.start();
	}		}

core/res/AndroidManifest.xml

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2004,6 +2004,11 @@
	<permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED"		<permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED"
	android:protectionLevel="signature\|privileged" />		android:protectionLevel="signature\|privileged" />

			<!-- @SystemApi Allows but does not guarantee access to user passwords at the conclusion of add
			account -->
			<permission android:name="android.permission.GET_PASSWORD_PRIVILEGED"
			android:protectionLevel="signature\|privileged" />

	<!-- @SystemApi Allows applications to RW to diagnostic resources.		<!-- @SystemApi Allows applications to RW to diagnostic resources.
	<p>Not for use by third-party applications. -->		<p>Not for use by third-party applications. -->
	<permission android:name="android.permission.DIAGNOSTIC"		<permission android:name="android.permission.DIAGNOSTIC"