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

Commit 2f939dba authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: Fix AssertionError in monkey"

parents c6823081 a9e187ad

src/com/android/settings/TrustedCredentialsSettings.java

100644 → 100755
+3 −0
Original line number Diff line number Diff line
@@ -740,6 +740,9 @@ public class TrustedCredentialsSettings extends OptionsMenuFragment 
                } catch (InterruptedException e) {

                    Log.e(TAG, "InterruptedException while loading aliases.", e);

                    return new SparseArray<List<CertHolder>>();

                } catch (AssertionError e){

                    Log.e(TAG, "AssertionError while loading aliases.", e);

                    return new SparseArray<List<CertHolder>>();

                }

            }

            @Override protected void onProgressUpdate(Integer... progressAndMax) {