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

Commit db4b619a authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Pass both partition GUID and filesystem UUID. 

FDE keys are indexed using the partition GUID, while FBE keys will be
indexed using the filesystem UUID, so pass both of those identifiers
along when forgetting a volume.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug: 25861755
Change-Id: I88e13b6b39c5675403a3199e69f978720f26814a
parent e0653fab

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

+6 −6
Original line number Diff line number Diff line
@@ -641,8 +641,8 @@ class StorageManagerService extends IStorageManager.Stub implements Watchdog.Mon 
                    break;

                }

                case H_PARTITION_FORGET: {

                    final String partGuid = (String) msg.obj;

                    forgetPartition(partGuid);

                    final VolumeRecord rec = (VolumeRecord) msg.obj;

                    forgetPartition(rec.partGuid, rec.fsUuid);

                    break;

                }

                case H_RESET: {
@@ -1694,7 +1694,7 @@ class StorageManagerService extends IStorageManager.Stub implements Watchdog.Mon 
        synchronized (mLock) {

            final VolumeRecord rec = mRecords.remove(fsUuid);

            if (rec != null && !TextUtils.isEmpty(rec.partGuid)) {

                mHandler.obtainMessage(H_PARTITION_FORGET, rec.partGuid).sendToTarget();

                mHandler.obtainMessage(H_PARTITION_FORGET, rec).sendToTarget();

            }

            mCallbacks.notifyVolumeForgotten(fsUuid);
@@ -1718,7 +1718,7 @@ class StorageManagerService extends IStorageManager.Stub implements Watchdog.Mon 
                final String fsUuid = mRecords.keyAt(i);

                final VolumeRecord rec = mRecords.valueAt(i);

                if (!TextUtils.isEmpty(rec.partGuid)) {

                    mHandler.obtainMessage(H_PARTITION_FORGET, rec.partGuid).sendToTarget();

                    mHandler.obtainMessage(H_PARTITION_FORGET, rec).sendToTarget();

                }

                mCallbacks.notifyVolumeForgotten(fsUuid);

            }
@@ -1733,9 +1733,9 @@ class StorageManagerService extends IStorageManager.Stub implements Watchdog.Mon 
        }

    }



    private void forgetPartition(String partGuid) {

    private void forgetPartition(String partGuid, String fsUuid) {

        try {

            mVold.forgetPartition(partGuid);

            mVold.forgetPartition(partGuid, fsUuid);

        } catch (Exception e) {

            Slog.wtf(TAG, e);

        }