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

Commit a806d53a authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Catch IllegalStateException during KeyChain binding" into main

parents 27dad1a6 1bd943cc
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -444,7 +444,8 @@ public class SecurityControllerImpl implements SecurityController {
                    UserHandle.of(userId))) {
                boolean hasCACerts = !(conn.getService().getUserCaAliases().getList().isEmpty());
                idWithCert = new Pair<Integer, Boolean>(userId, hasCACerts);
            } catch (RemoteException | InterruptedException | AssertionError e) {
            } catch (RemoteException | InterruptedException | AssertionError
                     | IllegalStateException e) {
                Log.i(TAG, "failed to get CA certs", e);
                idWithCert = new Pair<Integer, Boolean>(userId, null);
            } finally {