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

Commit 17fb45ed authored by Paul Lawrence's avatar Paul Lawrence Committed by android-build-merger
Browse files

Merge "Revert "Don\'t enforce this API - it\'s not sensitive"" into nyc-dev am: fc0810b4 

am: 4abeb3fc

* commit '4abeb3fc':
  Revert "Don't enforce this API - it's not sensitive"

Change-Id: I53421cff8bf4d356a8313e1b5b44a72f85f7189c
parents 410e4a5d 4abeb3fc

services/core/java/com/android/server/MountService.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -2648,6 +2648,9 @@ class MountService extends IMountService.Stub 
     */

     */

    @Override

    @Override

    public int getPasswordType() {

    public int getPasswordType() {

        mContext.enforceCallingOrSelfPermission(Manifest.permission.STORAGE_INTERNAL,

            "no permission to access the crypt keeper");



        waitForReady();

        waitForReady();





        final NativeDaemonEvent event;

        final NativeDaemonEvent event;

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -1395,7 +1395,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }

        }





        boolean storageManagerIsNonDefaultBlockEncrypted() {

        boolean storageManagerIsNonDefaultBlockEncrypted() {

            long identity = Binder.clearCallingIdentity();

            try {

                return StorageManager.isNonDefaultBlockEncrypted();

                return StorageManager.isNonDefaultBlockEncrypted();

            } finally {

                Binder.restoreCallingIdentity(identity);

            }

        }

        }





        boolean storageManagerIsEncrypted() {

        boolean storageManagerIsEncrypted() {