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

Commit aca5a208 authored by Farid Zare Seisan's avatar Farid Zare Seisan Committed by android-build-merger
Browse files

Merge "Ignore mkdirs requests if CE storage not available." into pi-dev am: 29f6a3fe 

am: 719b3d3c

Change-Id: Ic68a02d128e5f08b4761bba39ae48ba86ae520fe
parents 27384c4b 719b3d3c

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

+9 −1
Original line number Diff line number Diff line
@@ -2667,9 +2667,17 @@ class StorageManagerService extends IStorageManager.Stub 
    public void mkdirs(String callingPkg, String appPath) {

        final int userId = UserHandle.getUserId(Binder.getCallingUid());

        final UserEnvironment userEnv = new UserEnvironment(userId);

        final String propertyName = "sys.user." + userId + ".ce_available";



        // Ignore requests to create directories while storage is locked

        if (!isUserKeyUnlocked(userId)) return;

        if (!isUserKeyUnlocked(userId)) {

            throw new IllegalStateException("Failed to prepare " + appPath);

        }



        // Ignore requests to create directories if CE storage is not available

        if (!SystemProperties.getBoolean(propertyName, false)) {

            throw new IllegalStateException("Failed to prepare " + appPath);

        }



        // Validate that reported package name belongs to caller

        final AppOpsManager appOps = (AppOpsManager) mContext.getSystemService(