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

Commit a7ea9845 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Fix crash on AssertionError from KeyChain.bind"

parents f80e92b6 3b7cb790

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);

            }

        });

    }