Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 7b0c0c7694

Change-Id: I854a2106a59542463c3c20383f99d1073203b6ac
This commit is contained in:
Quang Luong
2019-04-05 08:58:29 -07:00
committed by android-build-merger
parent ffe47c199f 7b0c0c7694
commit c75cc8e5e2
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/util/StateMachine.java
View File

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