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

Commit a16cd59a authored by Robert Berry's avatar Robert Berry
Browse files

Create exception hierarchy for RecoveryController 

Sets up a sensible exception hierarchy. Consolidates two error codes
that both represented some kind of internal error into a single code.
Fixed some cases where the wrong error codes were used to signal.

Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I6b1f97715cdc28a4be79912abb6f48e6657b048b
parent b1a00d5e

core/java/android/security/keystore/BadCertificateFormatException.java

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.security.keystore;



/**

 * Error thrown when the recovery agent supplies an invalid X509 certificate.

 *

 * @hide

 */

public class BadCertificateFormatException extends RecoveryControllerException {

    public BadCertificateFormatException(String msg) {

        super(msg);

    }

}

core/java/android/security/keystore/DecryptionFailedException.java

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.security.keystore;



/**

 * Error thrown when decryption failed, due to an agent error. i.e., using the incorrect key,

 * trying to decrypt garbage data, trying to decrypt data that has somehow been corrupted, etc.

 *

 * @hide

 */

public class DecryptionFailedException extends RecoveryControllerException {



    public DecryptionFailedException(String msg) {

        super(msg);

    }

}

core/java/android/security/keystore/InternalRecoveryServiceException.java

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.security.keystore;



/**

 * An error thrown when something went wrong internally in the recovery service.

 *

 * <p>This is an unexpected error, and indicates a problem with the service itself, rather than the

 * caller having performed some kind of illegal action.

 *

 * @hide

 */

public class InternalRecoveryServiceException extends RecoveryControllerException {

    public InternalRecoveryServiceException(String msg) {

        super(msg);

    }



    public InternalRecoveryServiceException(String message, Throwable cause) {

        super(message, cause);

    }

}

core/java/android/security/keystore/LockScreenRequiredException.java

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.security.keystore;



/**

 * Error thrown when trying to generate keys for a profile that has no lock screen set.

 *

 * <p>A lock screen must be set, as the lock screen is used to encrypt the snapshot.

 *

 * @hide

 */

public class LockScreenRequiredException extends RecoveryControllerException {

    public LockScreenRequiredException(String msg) {

        super(msg);

    }

}

core/java/android/security/keystore/RecoveryControllerException.java

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.security.keystore;



import java.security.GeneralSecurityException;



/**

 * Base exception for errors thrown by {@link RecoveryManager}.

 *

 * @hide

 */

public abstract class RecoveryControllerException extends GeneralSecurityException {

    RecoveryControllerException() { }



    RecoveryControllerException(String msg) {

        super(msg);

    }



    public RecoveryControllerException(String message, Throwable cause) {

        super(message, cause);

    }

}