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

Merge "Ignore instead of throw errors in QuittingState and reorder some parameters."

Browse Source
This commit is contained in:
Wink Saville
2010-03-11 14:43:06 -08:00
committed by Android (Google) Code Review
parent eb3035cbca f0f566ec46
commit ef5a8e5bdc
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/util/HierarchicalStateMachine.java
View File

@@ -550,7 +550,8 @@ public class HierarchicalStateMachine {
private class QuittingState extends HierarchicalState {
@Override
public boolean processMessage(Message msg) {
throw new RuntimeException("QuitingState: processMessage called should not happen");
// Ignore
return false;
}
}
@@ -960,7 +961,7 @@ public class HierarchicalStateMachine {
* @param looper for this state machine
* @param name of the state machine
*/
private void initStateMachine(Looper looper, String name) {
private void initStateMachine(String name, Looper looper) {
mName = name;
mHsmHandler = new HsmHandler(looper, this);
}
@@ -975,7 +976,7 @@ public class HierarchicalStateMachine {
mHsmThread.start();
Looper looper = mHsmThread.getLooper();
initStateMachine(looper, name);
initStateMachine(name, looper);
}
/**
@@ -983,8 +984,8 @@ public class HierarchicalStateMachine {
*
* @param name of the state machine
*/
protected HierarchicalStateMachine(Looper looper, String name) {
initStateMachine(looper, name);
protected HierarchicalStateMachine(String name, Looper looper) {
initStateMachine(name, looper);
}
/**

6
core/tests/coretests/src/android/os/HierarchicalStateMachineTest.java
View File

@@ -1204,8 +1204,8 @@ public class HierarchicalStateMachineTest extends TestCase {
* complete.
*/
class StateMachineSharedThread extends HierarchicalStateMachine {
StateMachineSharedThread(Looper looper, String name, int maxCount) {
super(looper, name);
StateMachineSharedThread(String name, Looper looper, int maxCount) {
super(name, looper);
mMaxCount = maxCount;
setDbg(DBG);
@@ -1254,7 +1254,7 @@ public class HierarchicalStateMachineTest extends TestCase {
// Create the state machines
StateMachineSharedThread sms[] = new StateMachineSharedThread[10];
for (int i = 0; i < sms.length; i++) {
sms[i] = new StateMachineSharedThread(smThread.getLooper(), "sm", sms.length);
sms[i] = new StateMachineSharedThread("sm", smThread.getLooper(), sms.length);
sms[i].start();
}