Merge "Merge "Change ownership of the account request notification." into... (d9e6c1ee) · Commits · e / os / android_frameworks_base

core/res/res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -3958,6 +3958,8 @@
		<string name="deny">Deny</string>
		<string name="permission_request_notification_title">Permission requested</string>
		<string name="permission_request_notification_with_subtitle">Permission requested\nfor account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g>.</string>
		<!-- Title and subtitle for notification shown when app request account access (two lines) [CHAR LIMIT=NONE] -->
		<string name="permission_request_notification_for_app_with_subtitle">Permission requested by <xliff:g id="app" example="Gmail">%1$s</xliff:g>\nfor account <xliff:g id="account" example="foo@gmail.com">%2$s</xliff:g>.</string>

		<!-- Message to show when an intent automatically switches users into the personal profile. -->
		<string name="forward_intent_to_owner">You\'re using this app outside of your work profile</string>

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -561,6 +561,7 @@
		<java-symbol type="string" name="notification_title" />
		<java-symbol type="string" name="other_networks_no_internet" />
		<java-symbol type="string" name="permission_request_notification_with_subtitle" />
		<java-symbol type="string" name="permission_request_notification_for_app_with_subtitle" />
		<java-symbol type="string" name="prepend_shortcut_label" />
		<java-symbol type="string" name="private_dns_broken_detailed" />
		<java-symbol type="string" name="paste_as_plain_text" />

services/core/java/com/android/server/accounts/AccountManagerService.java

+15 −6

Original line number	Diff line number	Diff line
		@@ -453,7 +453,7 @@ public class AccountManagerService
		if (!checkAccess \|\| hasAccountAccess(account, packageName,
		UserHandle.getUserHandleForUid(uid))) {
		cancelNotification(getCredentialPermissionNotificationId(account,
		AccountManager.ACCOUNT_ACCESS_TOKEN_TYPE, uid), packageName,
		AccountManager.ACCOUNT_ACCESS_TOKEN_TYPE, uid),
		UserHandle.getUserHandleForUid(uid));
		}
		}
		@@ -3136,8 +3136,8 @@ public class AccountManagerService
		String authTokenType = intent.getStringExtra(
		GrantCredentialsPermissionActivity.EXTRAS_AUTH_TOKEN_TYPE);
		final String titleAndSubtitle =
		mContext.getString(R.string.permission_request_notification_with_subtitle,
		account.name);
		mContext.getString(R.string.permission_request_notification_for_app_with_subtitle,
		getApplicationLabel(packageName), account.name);
		final int index = titleAndSubtitle.indexOf('\n');
		String title = titleAndSubtitle;
		String subtitle = "";
		@@ -3160,7 +3160,16 @@ public class AccountManagerService
		null, user))
		.build();
		installNotification(getCredentialPermissionNotificationId(
		account, authTokenType, uid), n, packageName, user.getIdentifier());
		account, authTokenType, uid), n, "android", user.getIdentifier());
		}

		private String getApplicationLabel(String packageName) {
		try {
		return mPackageManager.getApplicationLabel(
		mPackageManager.getApplicationInfo(packageName, 0)).toString();
		} catch (PackageManager.NameNotFoundException e) {
		return packageName;
		}
		}

		private Intent newGrantCredentialsPermissionIntent(Account account, String packageName,
		@@ -3196,7 +3205,7 @@ public class AccountManagerService
		nId = accounts.credentialsPermissionNotificationIds.get(key);
		if (nId == null) {
		String tag = TAG + ":" + SystemMessage.NOTE_ACCOUNT_CREDENTIAL_PERMISSION
		+ ":" + account.hashCode() + ":" + authTokenType.hashCode();
		+ ":" + account.hashCode() + ":" + authTokenType.hashCode() + ":" + uid;
		int id = SystemMessage.NOTE_ACCOUNT_CREDENTIAL_PERMISSION;
		nId = new NotificationId(tag, id);
		accounts.credentialsPermissionNotificationIds.put(key, nId);
		@@ -4147,7 +4156,7 @@ public class AccountManagerService

		private void handleAuthenticatorResponse(boolean accessGranted) throws RemoteException {
		cancelNotification(getCredentialPermissionNotificationId(account,
		AccountManager.ACCOUNT_ACCESS_TOKEN_TYPE, uid), packageName,
		AccountManager.ACCOUNT_ACCESS_TOKEN_TYPE, uid),
		UserHandle.getUserHandleForUid(uid));
		if (callback != null) {
		Bundle result = new Bundle();