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

Commit c75cc8e5 authored by Quang Luong's avatar Quang Luong Committed by android-build-merger
Browse files

Merge "Catch ArrayIndexOutOfBoundsException in StateMachine.toString()" into qt-dev

am: 7b0c0c76

Change-Id: I854a2106a59542463c3c20383f99d1073203b6ac
parents ffe47c19 7b0c0c76
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import com.android.internal.annotations.VisibleForTesting;

import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
@@ -2102,7 +2101,7 @@ public class StateMachine {
        try {
            name = mName.toString();
            state = mSmHandler.getCurrentState().getName().toString();
        } catch (NullPointerException npe) {
        } catch (NullPointerException | ArrayIndexOutOfBoundsException e) {
            // Will use default(s) initialized above.
        }
        return "name=" + name + " state=" + state;