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

Commit 1d8503c5 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Automerger Merge Worker
Browse files

Merge "Change ownership of the account request notification." into oc-mr1-dev... 

Merge "Change ownership of the account request notification." into oc-mr1-dev am: aaccd1b1 am: c9fdb5f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15016192

Change-Id: I9958960adcd72f402c545763ff89b67fb0af66a1
parents 6a154c0c c9fdb5f3

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3863,6 +3863,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
@@ -586,6 +586,7 @@ 
  <java-symbol type="string" name="menu_sym_shortcut_label" />

  <java-symbol type="string" name="notification_title" />

  <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="paste_as_plain_text" />

  <java-symbol type="string" name="replace" />

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

+15 −6
Original line number Diff line number Diff line
@@ -448,7 +448,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));

        }

    }
@@ -3028,8 +3028,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 = "";
@@ -3051,7 +3051,16 @@ public class AccountManagerService 
                            PendingIntent.FLAG_CANCEL_CURRENT, 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,
@@ -3087,7 +3096,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);
@@ -4040,7 +4049,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();