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

Commit 3d6f6060 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Add a privileged permission to get user accounts" into mnc-dev

parents 3f2c5108 2062eeff

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ package android { 
    field public static final java.lang.String FACTORY_TEST = "android.permission.FACTORY_TEST";

    field public static final java.lang.String FLASHLIGHT = "android.permission.FLASHLIGHT";

    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_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";

    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";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ package android { 
    field public static final java.lang.String FORCE_BACK = "android.permission.FORCE_BACK";

    field public static final java.lang.String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";

    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_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_SIZE = "android.permission.GET_PACKAGE_SIZE";

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -1749,6 +1749,10 @@ 
    <!-- ==================================== -->

    <eat-comment />



    <!-- @SystemApi Allows access to the list of accounts in the Accounts Service. -->

    <permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows applications to RW to diagnostic resources.

    <p>Not for use by third-party applications. -->

    <permission android:name="android.permission.DIAGNOSTIC"

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

+2 −1
Original line number Diff line number Diff line
@@ -3799,7 +3799,8 @@ public class AccountManagerService 
         * access accounts of the specified account.

         */

        boolean isPermitted =

                isPermitted(callingUid, Manifest.permission.GET_ACCOUNTS);

                isPermitted(callingUid, Manifest.permission.GET_ACCOUNTS,

                        Manifest.permission.GET_ACCOUNTS_PRIVILEGED);

        boolean isAccountManagedByCaller = isAccountManagedByCaller(accountType, callingUid);

        Log.w(TAG, String.format(

                "isReadAccountPermitted: isPermitted: %s, isAM: %s",