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

Commit 88922c61 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... 

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

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

Change-Id: I88de757b8416a4619726bdf836782b1ce6bf85b9
parents e99cc5ce 3e42e3a8

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

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

    @Override

    public int getPasswordType() {

        mContext.enforceCallingOrSelfPermission(Manifest.permission.STORAGE_INTERNAL,

            "no permission to access the crypt keeper");



        waitForReady();



        final NativeDaemonEvent event;

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

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



        boolean storageManagerIsNonDefaultBlockEncrypted() {

            long identity = Binder.clearCallingIdentity();

            try {

                return StorageManager.isNonDefaultBlockEncrypted();

            } finally {

                Binder.restoreCallingIdentity(identity);

            }

        }



        boolean storageManagerIsEncrypted() {