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

am 7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread

Browse Source 
Merge commit '7747795af508354b3792e497e6a7b4bc749b4007' into gingerbread-plus-aosp

* commit '7747795af508354b3792e497e6a7b4bc749b4007':
  These are not javadoc tags, they are annotations in sample code. Escape them properly.
This commit is contained in:
Joe Onorato
2010-09-16 09:27:42 -07:00
committed by Android Git Automerger
parent f4fd88f8d8 7747795af5
commit d35186ce18
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ class HelloWorld extends HierarchicalStateMachine {
} }
class State1 extends HierarchicalState { class State1 extends HierarchicalState {
@Override public boolean processMessage(Message message) { @Override public boolean processMessage(Message message) {
Log.d(TAG, "Hello World"); Log.d(TAG, "Hello World");
return HANDLED; return HANDLED;
} }
@@ -257,10 +257,10 @@ class Hsm1 extends HierarchicalStateMachine {
} }
class P1 extends HierarchicalState { class P1 extends HierarchicalState {
@Override public void enter() { @Override public void enter() {
Log.d(TAG, "mP1.enter"); Log.d(TAG, "mP1.enter");
} }
@Override public boolean processMessage(Message message) { @Override public boolean processMessage(Message message) {
boolean retVal; boolean retVal;
Log.d(TAG, "mP1.processMessage what=" + message.what); Log.d(TAG, "mP1.processMessage what=" + message.what);
switch(message.what) { switch(message.what) {
@@ -278,16 +278,16 @@ class Hsm1 extends HierarchicalStateMachine {
} }
return retVal; return retVal;
} }
@Override public void exit() { @Override public void exit() {
Log.d(TAG, "mP1.exit"); Log.d(TAG, "mP1.exit");
} }
} }
class S1 extends HierarchicalState { class S1 extends HierarchicalState {
@Override public void enter() { @Override public void enter() {
Log.d(TAG, "mS1.enter"); Log.d(TAG, "mS1.enter");
} }
@Override public boolean processMessage(Message message) { @Override public boolean processMessage(Message message) {
Log.d(TAG, "S1.processMessage what=" + message.what); Log.d(TAG, "S1.processMessage what=" + message.what);
if (message.what == CMD_1) { if (message.what == CMD_1) {
// Transition to ourself to show that enter/exit is called // Transition to ourself to show that enter/exit is called
@@ -298,16 +298,16 @@ class Hsm1 extends HierarchicalStateMachine {
return NOT_HANDLED; return NOT_HANDLED;
} }
} }
@Override public void exit() { @Override public void exit() {
Log.d(TAG, "mS1.exit"); Log.d(TAG, "mS1.exit");
} }
} }
class S2 extends HierarchicalState { class S2 extends HierarchicalState {
@Override public void enter() { @Override public void enter() {
Log.d(TAG, "mS2.enter"); Log.d(TAG, "mS2.enter");
} }
@Override public boolean processMessage(Message message) { @Override public boolean processMessage(Message message) {
boolean retVal; boolean retVal;
Log.d(TAG, "mS2.processMessage what=" + message.what); Log.d(TAG, "mS2.processMessage what=" + message.what);
switch(message.what) { switch(message.what) {
@@ -326,17 +326,17 @@ class Hsm1 extends HierarchicalStateMachine {
} }
return retVal; return retVal;
} }
@Override public void exit() { @Override public void exit() {
Log.d(TAG, "mS2.exit"); Log.d(TAG, "mS2.exit");
} }
} }
class P2 extends HierarchicalState { class P2 extends HierarchicalState {
@Override public void enter() { @Override public void enter() {
Log.d(TAG, "mP2.enter"); Log.d(TAG, "mP2.enter");
sendMessage(obtainMessage(CMD_5)); sendMessage(obtainMessage(CMD_5));
} }
@Override public boolean processMessage(Message message) { @Override public boolean processMessage(Message message) {
Log.d(TAG, "P2.processMessage what=" + message.what); Log.d(TAG, "P2.processMessage what=" + message.what);
switch(message.what) { switch(message.what) {
case(CMD_3): case(CMD_3):
@@ -349,12 +349,12 @@ class Hsm1 extends HierarchicalStateMachine {
} }
return HANDLED; return HANDLED;
} }
@Override public void exit() { @Override public void exit() {
Log.d(TAG, "mP2.exit"); Log.d(TAG, "mP2.exit");
} }
} }
@Override @Override
void halting() { void halting() {
Log.d(TAG, "halting"); Log.d(TAG, "halting");
synchronized (this) { synchronized (this) {