diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-01-22 15:48:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-22 15:48:10 -0800 |
| commit | 05f1f0ece8f39e77c96825fb2e3451ebd388adad (patch) | |
| tree | 4860647575300552158bbe03aa71976489824337 /services/java | |
| parent | 58fb00025daa78360a3d033b223d15364d49086f (diff) | |
| parent | 555b07df08dd4c2472374d0767926ebab928dede (diff) | |
| download | frameworks_base-05f1f0ece8f39e77c96825fb2e3451ebd388adad.zip frameworks_base-05f1f0ece8f39e77c96825fb2e3451ebd388adad.tar.gz frameworks_base-05f1f0ece8f39e77c96825fb2e3451ebd388adad.tar.bz2 | |
am 555b07df: am 2c64b539: am 596532d9: Properly initialize recognition service if the recognizer component changed.
* commit '555b07df08dd4c2472374d0767926ebab928dede':
Properly initialize recognition service if the recognizer component changed.
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/RecognitionManagerService.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/services/java/com/android/server/RecognitionManagerService.java b/services/java/com/android/server/RecognitionManagerService.java index 1e0755d..c2e749d 100644 --- a/services/java/com/android/server/RecognitionManagerService.java +++ b/services/java/com/android/server/RecognitionManagerService.java @@ -89,17 +89,15 @@ public class RecognitionManagerService extends Binder { private void initForUser(int userHandle) { if (DEBUG) Slog.i(TAG, "initForUser user=" + userHandle); ComponentName comp = getCurRecognizer(userHandle); + ServiceInfo info = null; if (comp != null) { - // See if the current recognizer is no longer available. + // See if the current recognizer is still available. try { - mIPm.getServiceInfo(comp, 0, userHandle); + info = mIPm.getServiceInfo(comp, 0, userHandle); } catch (RemoteException e) { - comp = findAvailRecognizer(null, userHandle); - if (comp != null) { - setCurRecognizer(comp, userHandle); - } } - } else { + } + if (info == null) { comp = findAvailRecognizer(null, userHandle); if (comp != null) { setCurRecognizer(comp, userHandle); |