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

Commit 71bbe831 authored by Ellen Arteca's avatar Ellen Arteca Committed by Automerger Merge Worker
Browse files

Merge "Update arguments to vold binder to use byte[] secret for CE storage"... 

Merge "Update arguments to vold binder to use byte[] secret for CE storage" into main am: acc32640

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3026304



Change-Id: Ie38f71ede05792f4cb56a30fa5d3b03b0c6b9101
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07663527 acc32640

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

+2 −3
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ import com.android.internal.os.FuseUnavailableMountException; 
import com.android.internal.os.SomeArgs;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.HexDump;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Preconditions;

import com.android.modules.utils.TypedXmlPullParser;
@@ -3270,7 +3269,7 @@ class StorageManagerService extends IStorageManager.Stub 
            throws RemoteException {

        super.setCeStorageProtection_enforcePermission();



        mVold.setCeStorageProtection(userId, HexDump.toHexString(secret));

        mVold.setCeStorageProtection(userId, secret);

    }



    /* Only for use by LockSettingsService */
@@ -3280,7 +3279,7 @@ class StorageManagerService extends IStorageManager.Stub 
        super.unlockCeStorage_enforcePermission();



        if (StorageManager.isFileEncrypted()) {

            mVold.unlockCeStorage(userId, HexDump.toHexString(secret));

            mVold.unlockCeStorage(userId, secret);

        }

        synchronized (mLock) {

            mCeUnlockedUsers.append(userId);