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

Commit ffcba67b authored by Carlos Valdivia's avatar Carlos Valdivia Committed by Android (Google) Code Review
Browse files

Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev

parents a5dd3f32 714bbd85

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ package android { 
    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 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 java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";

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

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ 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_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_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 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";

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ package android { 
    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 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 java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";

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

core/res/AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -2038,10 +2038,10 @@ 
    <permission android:name="android.permission.GET_ACCOUNTS_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" />

    <!-- Allows but does not guarantee access to user passwords at the conclusion of add account

    @hide -->

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

        android:protectionLevel="signature" />



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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -2589,7 +2589,7 @@ public class AccountManagerService 
        // Check to see if the Password should be included to the caller.

        String callerPkg = optionsIn.getString(AccountManager.KEY_ANDROID_PACKAGE_NAME);

        boolean isPasswordForwardingAllowed = isPermitted(

                callerPkg, uid, Manifest.permission.GET_PASSWORD_PRIVILEGED);

                callerPkg, uid, Manifest.permission.GET_PASSWORD);



        int usrId = UserHandle.getCallingUserId();

        long identityToken = clearCallingIdentity();
@@ -3008,7 +3008,7 @@ public class AccountManagerService 
        // Check to see if the Password should be included to the caller.

        String callerPkg = loginOptions.getString(AccountManager.KEY_ANDROID_PACKAGE_NAME);

        boolean isPasswordForwardingAllowed = isPermitted(

                callerPkg, uid, Manifest.permission.GET_PASSWORD_PRIVILEGED);

                callerPkg, uid, Manifest.permission.GET_PASSWORD);



        long identityToken = clearCallingIdentity();

        try {