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

Commit 369d30c8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27976646',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27976646', 'googleplex-android-review.googlesource.com/28430009'] into 24Q3-release.

Change-Id: If96f97f737c82d24c69b82e93f23d189315efc44
parents 70cf9e5d 0fcd2d7a

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+2 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
            int yTranslation = mResources.getDimensionPixelSize(R.dimen.disappear_y_translation);



            AnimatorSet anims = new AnimatorSet();

            ObjectAnimator yAnim = ObjectAnimator.ofFloat(mView, View.TRANSLATION_Y, yTranslation);

            ObjectAnimator yAnim = ObjectAnimator.ofFloat(mViewFlipper, View.TRANSLATION_Y,

                    yTranslation);

            ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(mUserSwitcherViewGroup, View.ALPHA,

                    0f);

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+8 −1
Original line number Diff line number Diff line
@@ -149,6 +149,13 @@ final class DefaultPermissionGrantPolicy { 
        CONTACTS_PERMISSIONS.add(Manifest.permission.GET_ACCOUNTS);

    }



    private static final Set<String> CALL_LOG_PERMISSIONS = new ArraySet<>();

    static {

        CALL_LOG_PERMISSIONS.add(Manifest.permission.READ_CALL_LOG);

        CALL_LOG_PERMISSIONS.add(Manifest.permission.WRITE_CALL_LOG);

    }





    private static final Set<String> ALWAYS_LOCATION_PERMISSIONS = new ArraySet<>();

    static {

        ALWAYS_LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_FINE_LOCATION);
@@ -753,7 +760,7 @@ final class DefaultPermissionGrantPolicy { 
        String contactsProviderPackage =

                getDefaultProviderAuthorityPackage(ContactsContract.AUTHORITY, userId);

        grantSystemFixedPermissionsToSystemPackage(pm, contactsProviderPackage, userId,

                CONTACTS_PERMISSIONS, PHONE_PERMISSIONS);

                CONTACTS_PERMISSIONS, PHONE_PERMISSIONS, CALL_LOG_PERMISSIONS);

        grantPermissionsToSystemPackage(pm, contactsProviderPackage, userId, STORAGE_PERMISSIONS);



        // Device provisioning