Commit 0ee586de authored Apr 20, 2022 by Eric Biggers Committed by Automerger Merge Worker Apr 20, 2022

[automerge] StorageManagerService: don't ignore failures to prepare user...

[automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a04 am: 63fec800

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



Change-Id: Ie33a08f08b63cde747a213f0d1acf69732d909eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5d674174 63fec800

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -3400,8 +3400,12 @@ class StorageManagerService extends IStorageManager.Stub
		mInstaller.tryMountDataMirror(volumeUuid);
		}
		}
		} catch (Exception e) {
		} catch (RemoteException \| Installer.InstallerException e) {
		Slog.wtf(TAG, e);
		// Make sure to re-throw this exception; we must not ignore failure
		// to prepare the user storage as it could indicate that encryption
		// wasn't successfully set up.
		throw new RuntimeException(e);
		}
		}