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

Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev

Browse Source
This commit is contained in:
Chris Thornton
2017-06-11 17:56:21 +00:00
committed by Android (Google) Code Review
parent a96a9f7326 23a57404e3
commit 1761985e42
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
View File

@@ -191,7 +191,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
// Process existing model first. // Process existing model first.
if (model != null && !model.getModelId().equals(soundModel.uuid)) { if (model != null && !model.getModelId().equals(soundModel.uuid)) {
// The existing model has a different UUID, should be replaced. // The existing model has a different UUID, should be replaced.
int status = cleanUpExistingKeyphraseModel(model); int status = cleanUpExistingKeyphraseModelLocked(model);
if (status != STATUS_OK) { if (status != STATUS_OK) {
return status; return status;
} }
@@ -210,7 +210,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
} }
} }
private int cleanUpExistingKeyphraseModel(ModelData modelData) { private int cleanUpExistingKeyphraseModelLocked(ModelData modelData) {
// Stop and clean up a previous ModelData if one exists. This usually is used when the // Stop and clean up a previous ModelData if one exists. This usually is used when the
// previous model has a different UUID for the same keyphrase ID. // previous model has a different UUID for the same keyphrase ID.
int status = tryStopAndUnloadLocked(modelData, true /* stop */, true /* unload */); int status = tryStopAndUnloadLocked(modelData, true /* stop */, true /* unload */);
@@ -620,7 +620,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
try { try {
callback.onGenericSoundTriggerDetected((GenericRecognitionEvent) event); callback.onGenericSoundTriggerDetected((GenericRecognitionEvent) event);
} catch (DeadObjectException e) { } catch (DeadObjectException e) {
forceStopAndUnloadModel(model, e); forceStopAndUnloadModelLocked(model, e);
return; return;
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.w(TAG, "RemoteException in onGenericSoundTriggerDetected", e); Slog.w(TAG, "RemoteException in onGenericSoundTriggerDetected", e);
@@ -710,7 +710,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
try { try {
modelData.getCallback().onRecognitionPaused(); modelData.getCallback().onRecognitionPaused();
} catch (DeadObjectException e) { } catch (DeadObjectException e) {
forceStopAndUnloadModel(modelData, e); forceStopAndUnloadModelLocked(modelData, e);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.w(TAG, "RemoteException in onRecognitionPaused", e); Slog.w(TAG, "RemoteException in onRecognitionPaused", e);
} }
@@ -721,7 +721,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
Slog.w(TAG, "Recognition failure"); Slog.w(TAG, "Recognition failure");
MetricsLogger.count(mContext, "sth_recognition_failure_event", 1); MetricsLogger.count(mContext, "sth_recognition_failure_event", 1);
try { try {
sendErrorCallbacksToAll(STATUS_ERROR); sendErrorCallbacksToAllLocked(STATUS_ERROR);
} finally { } finally {
internalClearModelStateLocked(); internalClearModelStateLocked();
internalClearGlobalStateLocked(); internalClearGlobalStateLocked();
@@ -763,7 +763,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
try { try {
modelData.getCallback().onKeyphraseDetected((KeyphraseRecognitionEvent) event); modelData.getCallback().onKeyphraseDetected((KeyphraseRecognitionEvent) event);
} catch (DeadObjectException e) { } catch (DeadObjectException e) {
forceStopAndUnloadModel(modelData, e); forceStopAndUnloadModelLocked(modelData, e);
return; return;
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.w(TAG, "RemoteException in onKeyphraseDetected", e); Slog.w(TAG, "RemoteException in onKeyphraseDetected", e);
@@ -782,7 +782,9 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
private void updateAllRecognitionsLocked(boolean notify) { private void updateAllRecognitionsLocked(boolean notify) {
boolean isAllowed = isRecognitionAllowed(); boolean isAllowed = isRecognitionAllowed();
for (ModelData modelData : mModelDataMap.values()) { // updateRecognitionLocked can possibly update the list of models
ArrayList<ModelData> modelDatas = new ArrayList<ModelData>(mModelDataMap.values());
for (ModelData modelData : modelDatas) {
updateRecognitionLocked(modelData, isAllowed, notify); updateRecognitionLocked(modelData, isAllowed, notify);
} }
} }
@@ -804,7 +806,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
private void onServiceDiedLocked() { private void onServiceDiedLocked() {
try { try {
MetricsLogger.count(mContext, "sth_service_died", 1); MetricsLogger.count(mContext, "sth_service_died", 1);
sendErrorCallbacksToAll(SoundTrigger.STATUS_DEAD_OBJECT); sendErrorCallbacksToAllLocked(SoundTrigger.STATUS_DEAD_OBJECT);
} finally { } finally {
internalClearModelStateLocked(); internalClearModelStateLocked();
internalClearGlobalStateLocked(); internalClearGlobalStateLocked();
@@ -889,14 +891,14 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
} }
// Sends an error callback to all models with a valid registered callback. // Sends an error callback to all models with a valid registered callback.
private void sendErrorCallbacksToAll(int errorCode) { private void sendErrorCallbacksToAllLocked(int errorCode) {
for (ModelData modelData : mModelDataMap.values()) { for (ModelData modelData : mModelDataMap.values()) {
IRecognitionStatusCallback callback = modelData.getCallback(); IRecognitionStatusCallback callback = modelData.getCallback();
if (callback != null) { if (callback != null) {
try { try {
callback.onError(errorCode); callback.onError(errorCode);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.w(TAG, "RemoteException sendErrorCallbacksToAll for model handle " + Slog.w(TAG, "RemoteException sendErrorCallbacksToAllLocked for model handle " +
modelData.getHandle(), e); modelData.getHandle(), e);
} }
} }
@@ -909,8 +911,8 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
* @param modelData The model data to remove. * @param modelData The model data to remove.
* @param exception Optional exception to print in logcat. May be null. * @param exception Optional exception to print in logcat. May be null.
*/ */
private void forceStopAndUnloadModel(ModelData modelData, Exception exception) { private void forceStopAndUnloadModelLocked(ModelData modelData, Exception exception) {
forceStopAndUnloadModel(modelData, exception, null /* modelDataIterator */); forceStopAndUnloadModelLocked(modelData, exception, null /* modelDataIterator */);
} }
/** /**
@@ -924,7 +926,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
* ConcurrentModificationException, since this function will try and remove the model * ConcurrentModificationException, since this function will try and remove the model
* data from the mModelDataMap when it can successfully unload the model. * data from the mModelDataMap when it can successfully unload the model.
*/ */
private void forceStopAndUnloadModel(ModelData modelData, Exception exception, private void forceStopAndUnloadModelLocked(ModelData modelData, Exception exception,
Iterator modelDataIterator) { Iterator modelDataIterator) {
if (exception != null) { if (exception != null) {
Slog.e(TAG, "forceStopAndUnloadModel", exception); Slog.e(TAG, "forceStopAndUnloadModel", exception);
@@ -973,7 +975,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
&& !modelData.getCallback().asBinder().pingBinder())) { && !modelData.getCallback().asBinder().pingBinder())) {
// No one is listening on this model, so we might as well evict it. // No one is listening on this model, so we might as well evict it.
Slog.w(TAG, "Removing model " + modelData.getHandle() + " that has no clients"); Slog.w(TAG, "Removing model " + modelData.getHandle() + " that has no clients");
forceStopAndUnloadModel(modelData, null /* exception */, it); forceStopAndUnloadModelLocked(modelData, null /* exception */, it);
} }
} }
} }
@@ -1067,7 +1069,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
try { try {
callback.onError(status); callback.onError(status);
} catch (DeadObjectException e) { } catch (DeadObjectException e) {
forceStopAndUnloadModel(modelData, e); forceStopAndUnloadModelLocked(modelData, e);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.w(TAG, "RemoteException in onError", e); Slog.w(TAG, "RemoteException in onError", e);
} }
@@ -1081,7 +1083,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
try { try {
callback.onRecognitionResumed(); callback.onRecognitionResumed();
} catch (DeadObjectException e) { } catch (DeadObjectException e) {
forceStopAndUnloadModel(modelData, e); forceStopAndUnloadModelLocked(modelData, e);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.w(TAG, "RemoteException in onRecognitionResumed", e); Slog.w(TAG, "RemoteException in onRecognitionResumed", e);
} }
@@ -1108,7 +1110,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
try { try {
callback.onError(status); callback.onError(status);
} catch (DeadObjectException e) { } catch (DeadObjectException e) {
forceStopAndUnloadModel(modelData, e); forceStopAndUnloadModelLocked(modelData, e);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.w(TAG, "RemoteException in onError", e); Slog.w(TAG, "RemoteException in onError", e);
} }
@@ -1121,7 +1123,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
try { try {
callback.onRecognitionPaused(); callback.onRecognitionPaused();
} catch (DeadObjectException e) { } catch (DeadObjectException e) {
forceStopAndUnloadModel(modelData, e); forceStopAndUnloadModelLocked(modelData, e);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.w(TAG, "RemoteException in onRecognitionPaused", e); Slog.w(TAG, "RemoteException in onRecognitionPaused", e);
} }