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

Commit c6cb7dda authored by Kenny Guy's avatar Kenny Guy Committed by android-build-merger
Browse files

Merge "Don\'t crash if KeyChain can\'t be bound to." into nyc-dev am: fdadb4b4 

am: e71699e2

* commit 'e71699e2':
  Don't crash if KeyChain can't be bound to.
parents f127e01b e71699e2

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

+1 −1
Original line number Diff line number Diff line
@@ -2638,7 +2638,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                }

            } catch (InterruptedException e) {

                Thread.currentThread().interrupt();

            } catch (RuntimeException e) {

            } catch (RuntimeException | AssertionError e) {

                Log.e(LOG_TAG, "Could not connect to KeyChain service", e);

            }

            if (!hasCert) {