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

Commit 3b7cb790 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Fix crash on AssertionError from KeyChain.bind 

Bug: 199803465
Bug: 200064367
Test: None
Change-Id: Iefc776436235ecb10b0f6145835b898dc93f69f9
parent 4d16327f

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -1150,8 +1150,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                        && packageName.equals(service.getCredentialManagementAppPackageName())) {

                    service.removeCredentialManagementApp();

                }

            } catch (RemoteException | InterruptedException | IllegalStateException e) {

                Slogf.e(LOG_TAG, "Unable to remove the credential management app");

            } catch (RemoteException | InterruptedException | IllegalStateException

                    | AssertionError e) {

                Slogf.e(LOG_TAG, "Unable to remove the credential management app", e);

            }

        });

    }