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

am 0d04da1f: am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev

Browse Source 
* commit '0d04da1fb71960c79820bb04cb65c7c41125fcee':
  Fix issue #22124996: VI: Command Request not Active
This commit is contained in:
Dianne Hackborn
2015-07-15 23:51:34 +00:00
committed by Android Git Automerger
parent baa370e16b 0d04da1fb7
commit e12c549b7a
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/service/voice/VoiceInteractionSession.java
View File

@@ -650,7 +650,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
class MyCallbacks implements HandlerCaller.Callback, SoftInputWindow.Callback {
@Override
public void executeMessage(Message msg) {
SomeArgs args;
SomeArgs args = null;
switch (msg.what) {
case MSG_START_CONFIRMATION:
if (DEBUG) Log.d(TAG, "onConfirm: req=" + msg.obj);
@@ -676,6 +676,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
args = (SomeArgs)msg.obj;
if (DEBUG) Log.d(TAG, "onGetSupportedCommands: cmds=" + args.arg1);
args.arg1 = onGetSupportedCommands((String[]) args.arg1);
args.complete();
args = null;
break;
case MSG_CANCEL:
if (DEBUG) Log.d(TAG, "onCancel: req=" + ((Request)msg.obj));
@@ -723,6 +725,9 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
doHide();
break;
}
if (args != null) {
args.recycle();
}
}
@Override

10
core/java/com/android/internal/os/SomeArgs.java
View File

@@ -73,6 +73,16 @@ public final class SomeArgs {
}
}
public void complete() {
synchronized (this) {
if (mWaitState != WAIT_WAITING) {
throw new IllegalStateException("Not waiting");
}
mWaitState = WAIT_FINISHED;
notifyAll();
}
}
public void recycle() {
if (mInPool) {
throw new IllegalStateException("Already recycled.");

8
tests/VoiceInteraction/src/com/android/test/voiceinteraction/TestInteractionActivity.java
View File

@@ -103,6 +103,14 @@ public class TestInteractionActivity extends Activity implements View.OnClickLis
}
};
mInteractor.submitRequest(mCurrentRequest, REQUEST_CONFIRM);
String[] cmds = new String[] {
"com.android.test.voiceinteraction.COMMAND",
"com.example.foo.bar"
};
boolean sup[] = mInteractor.supportsCommands(cmds);
for (int i=0; i<cmds.length; i++) {
mLog.append(cmds[i] + ": " + (sup[i] ? "SUPPORTED" : "NOT SUPPORTED") + "\n");
}
} else {
Log.i(TAG, "Restarting with active confirmation: " + mCurrentRequest);
}