Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 1 | /** |
| 2 | * Copyright (C) 2014 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | package android.media.soundtrigger; |
Chris Thornton | 4ef8874 | 2016-07-11 22:03:16 -0700 | [diff] [blame] | 18 | import static android.hardware.soundtrigger.SoundTrigger.STATUS_OK; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 19 | |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 20 | import android.annotation.IntDef; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 21 | import android.annotation.NonNull; |
| 22 | import android.annotation.Nullable; |
Jeff Sharkey | d86b8fe | 2017-06-02 17:36:26 -0600 | [diff] [blame] | 23 | import android.annotation.RequiresPermission; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 24 | import android.annotation.SystemApi; |
Artur Satayev | 53ada2a | 2019-12-10 17:47:56 +0000 | [diff] [blame^] | 25 | import android.compat.annotation.UnsupportedAppUsage; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 26 | import android.hardware.soundtrigger.IRecognitionStatusCallback; |
| 27 | import android.hardware.soundtrigger.SoundTrigger; |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 28 | import android.hardware.soundtrigger.SoundTrigger.RecognitionConfig; |
| 29 | import android.media.AudioFormat; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 30 | import android.os.Handler; |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 31 | import android.os.Looper; |
| 32 | import android.os.Message; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 33 | import android.os.ParcelUuid; |
| 34 | import android.os.RemoteException; |
| 35 | import android.util.Slog; |
| 36 | |
| 37 | import com.android.internal.app.ISoundTriggerService; |
| 38 | |
| 39 | import java.io.PrintWriter; |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 40 | import java.lang.annotation.Retention; |
| 41 | import java.lang.annotation.RetentionPolicy; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 42 | import java.util.UUID; |
| 43 | |
| 44 | /** |
| 45 | * A class that allows interaction with the actual sound trigger detection on the system. |
| 46 | * Sound trigger detection refers to a detectors that match generic sound patterns that are |
| 47 | * not voice-based. The voice-based recognition models should utilize the {@link |
| 48 | * VoiceInteractionService} instead. Access to this class is protected by a permission |
| 49 | * granted only to system or privileged apps. |
| 50 | * |
| 51 | * @hide |
| 52 | */ |
Arunesh Mishra | 6a8fd79 | 2016-01-27 16:20:08 -0800 | [diff] [blame] | 53 | @SystemApi |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 54 | public final class SoundTriggerDetector { |
| 55 | private static final boolean DBG = false; |
| 56 | private static final String TAG = "SoundTriggerDetector"; |
| 57 | |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 58 | private static final int MSG_AVAILABILITY_CHANGED = 1; |
| 59 | private static final int MSG_SOUND_TRIGGER_DETECTED = 2; |
| 60 | private static final int MSG_DETECTION_ERROR = 3; |
| 61 | private static final int MSG_DETECTION_PAUSE = 4; |
| 62 | private static final int MSG_DETECTION_RESUME = 5; |
| 63 | |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 64 | private final Object mLock = new Object(); |
| 65 | |
| 66 | private final ISoundTriggerService mSoundTriggerService; |
| 67 | private final UUID mSoundModelId; |
| 68 | private final Callback mCallback; |
| 69 | private final Handler mHandler; |
| 70 | private final RecognitionCallback mRecognitionCallback; |
| 71 | |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 72 | /** @hide */ |
| 73 | @Retention(RetentionPolicy.SOURCE) |
| 74 | @IntDef(flag = true, |
| 75 | value = { |
| 76 | RECOGNITION_FLAG_NONE, |
| 77 | RECOGNITION_FLAG_CAPTURE_TRIGGER_AUDIO, |
| 78 | RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS |
| 79 | }) |
| 80 | public @interface RecognitionFlags {} |
| 81 | |
| 82 | /** |
| 83 | * Empty flag for {@link #startRecognition(int)}. |
| 84 | * |
| 85 | * @hide |
| 86 | */ |
| 87 | public static final int RECOGNITION_FLAG_NONE = 0; |
| 88 | |
| 89 | /** |
| 90 | * Recognition flag for {@link #startRecognition(int)} that indicates |
| 91 | * whether the trigger audio for hotword needs to be captured. |
| 92 | */ |
| 93 | public static final int RECOGNITION_FLAG_CAPTURE_TRIGGER_AUDIO = 0x1; |
| 94 | |
| 95 | /** |
| 96 | * Recognition flag for {@link #startRecognition(int)} that indicates |
| 97 | * whether the recognition should keep going on even after the |
| 98 | * model triggers. |
| 99 | * If this flag is specified, it's possible to get multiple |
| 100 | * triggers after a call to {@link #startRecognition(int)}, if the model |
| 101 | * triggers multiple times. |
| 102 | * When this isn't specified, the default behavior is to stop recognition once the |
| 103 | * trigger happenss, till the caller starts recognition again. |
| 104 | */ |
| 105 | public static final int RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS = 0x2; |
| 106 | |
| 107 | /** |
| 108 | * Additional payload for {@link Callback#onDetected}. |
| 109 | */ |
| 110 | public static class EventPayload { |
| 111 | private final boolean mTriggerAvailable; |
| 112 | |
| 113 | // Indicates if {@code captureSession} can be used to continue capturing more audio |
| 114 | // from the DSP hardware. |
| 115 | private final boolean mCaptureAvailable; |
| 116 | // The session to use when attempting to capture more audio from the DSP hardware. |
| 117 | private final int mCaptureSession; |
| 118 | private final AudioFormat mAudioFormat; |
| 119 | // Raw data associated with the event. |
| 120 | // This is the audio that triggered the keyphrase if {@code isTriggerAudio} is true. |
| 121 | private final byte[] mData; |
| 122 | |
| 123 | private EventPayload(boolean triggerAvailable, boolean captureAvailable, |
| 124 | AudioFormat audioFormat, int captureSession, byte[] data) { |
| 125 | mTriggerAvailable = triggerAvailable; |
| 126 | mCaptureAvailable = captureAvailable; |
| 127 | mCaptureSession = captureSession; |
| 128 | mAudioFormat = audioFormat; |
| 129 | mData = data; |
| 130 | } |
| 131 | |
| 132 | /** |
| 133 | * Gets the format of the audio obtained using {@link #getTriggerAudio()}. |
| 134 | * May be null if there's no audio present. |
| 135 | */ |
| 136 | @Nullable |
| 137 | public AudioFormat getCaptureAudioFormat() { |
| 138 | return mAudioFormat; |
| 139 | } |
| 140 | |
| 141 | /** |
Chris Thornton | 7554ff0 | 2017-04-30 19:46:39 -0700 | [diff] [blame] | 142 | * Gets the raw audio that triggered the detector. |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 143 | * This may be null if the trigger audio isn't available. |
| 144 | * If non-null, the format of the audio can be obtained by calling |
| 145 | * {@link #getCaptureAudioFormat()}. |
| 146 | * |
| 147 | * @see AlwaysOnHotwordDetector#RECOGNITION_FLAG_CAPTURE_TRIGGER_AUDIO |
| 148 | */ |
| 149 | @Nullable |
| 150 | public byte[] getTriggerAudio() { |
| 151 | if (mTriggerAvailable) { |
| 152 | return mData; |
| 153 | } else { |
| 154 | return null; |
| 155 | } |
| 156 | } |
| 157 | |
| 158 | /** |
Chris Thornton | 7554ff0 | 2017-04-30 19:46:39 -0700 | [diff] [blame] | 159 | * Gets the opaque data passed from the detection engine for the event. |
| 160 | * This may be null if it was not populated by the engine, or if the data is known to |
| 161 | * contain the trigger audio. |
| 162 | * |
| 163 | * @see #getTriggerAudio |
| 164 | * |
| 165 | * @hide |
| 166 | */ |
| 167 | @Nullable |
Mathew Inwood | 473b9d5 | 2018-08-17 09:07:01 +0100 | [diff] [blame] | 168 | @UnsupportedAppUsage |
Chris Thornton | 7554ff0 | 2017-04-30 19:46:39 -0700 | [diff] [blame] | 169 | public byte[] getData() { |
| 170 | if (!mTriggerAvailable) { |
| 171 | return mData; |
| 172 | } else { |
| 173 | return null; |
| 174 | } |
| 175 | } |
| 176 | |
| 177 | /** |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 178 | * Gets the session ID to start a capture from the DSP. |
| 179 | * This may be null if streaming capture isn't possible. |
| 180 | * If non-null, the format of the audio that can be captured can be |
| 181 | * obtained using {@link #getCaptureAudioFormat()}. |
| 182 | * |
| 183 | * TODO: Candidate for Public API when the API to start capture with a session ID |
| 184 | * is made public. |
| 185 | * |
| 186 | * TODO: Add this to {@link #getCaptureAudioFormat()}: |
| 187 | * "Gets the format of the audio obtained using {@link #getTriggerAudio()} |
| 188 | * or {@link #getCaptureSession()}. May be null if no audio can be obtained |
| 189 | * for either the trigger or a streaming session." |
| 190 | * |
| 191 | * TODO: Should this return a known invalid value instead? |
| 192 | * |
| 193 | * @hide |
| 194 | */ |
| 195 | @Nullable |
Mathew Inwood | 473b9d5 | 2018-08-17 09:07:01 +0100 | [diff] [blame] | 196 | @UnsupportedAppUsage |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 197 | public Integer getCaptureSession() { |
| 198 | if (mCaptureAvailable) { |
| 199 | return mCaptureSession; |
| 200 | } else { |
| 201 | return null; |
| 202 | } |
| 203 | } |
| 204 | } |
| 205 | |
| 206 | public static abstract class Callback { |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 207 | /** |
| 208 | * Called when the availability of the sound model changes. |
| 209 | */ |
| 210 | public abstract void onAvailabilityChanged(int status); |
| 211 | |
| 212 | /** |
| 213 | * Called when the sound model has triggered (such as when it matched a |
| 214 | * given sound pattern). |
| 215 | */ |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 216 | public abstract void onDetected(@NonNull EventPayload eventPayload); |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 217 | |
| 218 | /** |
| 219 | * Called when the detection fails due to an error. |
| 220 | */ |
| 221 | public abstract void onError(); |
| 222 | |
| 223 | /** |
| 224 | * Called when the recognition is paused temporarily for some reason. |
| 225 | * This is an informational callback, and the clients shouldn't be doing anything here |
| 226 | * except showing an indication on their UI if they have to. |
| 227 | */ |
| 228 | public abstract void onRecognitionPaused(); |
| 229 | |
| 230 | /** |
| 231 | * Called when the recognition is resumed after it was temporarily paused. |
| 232 | * This is an informational callback, and the clients shouldn't be doing anything here |
| 233 | * except showing an indication on their UI if they have to. |
| 234 | */ |
| 235 | public abstract void onRecognitionResumed(); |
| 236 | } |
| 237 | |
| 238 | /** |
| 239 | * This class should be constructed by the {@link SoundTriggerManager}. |
| 240 | * @hide |
| 241 | */ |
| 242 | SoundTriggerDetector(ISoundTriggerService soundTriggerService, UUID soundModelId, |
| 243 | @NonNull Callback callback, @Nullable Handler handler) { |
| 244 | mSoundTriggerService = soundTriggerService; |
| 245 | mSoundModelId = soundModelId; |
| 246 | mCallback = callback; |
| 247 | if (handler == null) { |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 248 | mHandler = new MyHandler(); |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 249 | } else { |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 250 | mHandler = new MyHandler(handler.getLooper()); |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 251 | } |
| 252 | mRecognitionCallback = new RecognitionCallback(); |
| 253 | } |
| 254 | |
| 255 | /** |
| 256 | * Starts recognition on the associated sound model. Result is indicated via the |
| 257 | * {@link Callback}. |
| 258 | * @return Indicates whether the call succeeded or not. |
| 259 | */ |
Jeff Sharkey | d86b8fe | 2017-06-02 17:36:26 -0600 | [diff] [blame] | 260 | @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 261 | public boolean startRecognition(@RecognitionFlags int recognitionFlags) { |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 262 | if (DBG) { |
| 263 | Slog.d(TAG, "startRecognition()"); |
| 264 | } |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 265 | boolean captureTriggerAudio = |
| 266 | (recognitionFlags & RECOGNITION_FLAG_CAPTURE_TRIGGER_AUDIO) != 0; |
| 267 | |
| 268 | boolean allowMultipleTriggers = |
| 269 | (recognitionFlags & RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS) != 0; |
Chris Thornton | 4ef8874 | 2016-07-11 22:03:16 -0700 | [diff] [blame] | 270 | int status = STATUS_OK; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 271 | try { |
Chris Thornton | 4ef8874 | 2016-07-11 22:03:16 -0700 | [diff] [blame] | 272 | status = mSoundTriggerService.startRecognition(new ParcelUuid(mSoundModelId), |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 273 | mRecognitionCallback, new RecognitionConfig(captureTriggerAudio, |
| 274 | allowMultipleTriggers, null, null)); |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 275 | } catch (RemoteException e) { |
| 276 | return false; |
| 277 | } |
Chris Thornton | 4ef8874 | 2016-07-11 22:03:16 -0700 | [diff] [blame] | 278 | return status == STATUS_OK; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 279 | } |
| 280 | |
| 281 | /** |
| 282 | * Stops recognition for the associated model. |
| 283 | */ |
Jeff Sharkey | d86b8fe | 2017-06-02 17:36:26 -0600 | [diff] [blame] | 284 | @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 285 | public boolean stopRecognition() { |
Chris Thornton | 4ef8874 | 2016-07-11 22:03:16 -0700 | [diff] [blame] | 286 | int status = STATUS_OK; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 287 | try { |
Chris Thornton | 4ef8874 | 2016-07-11 22:03:16 -0700 | [diff] [blame] | 288 | status = mSoundTriggerService.stopRecognition(new ParcelUuid(mSoundModelId), |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 289 | mRecognitionCallback); |
| 290 | } catch (RemoteException e) { |
| 291 | return false; |
| 292 | } |
Chris Thornton | 4ef8874 | 2016-07-11 22:03:16 -0700 | [diff] [blame] | 293 | return status == STATUS_OK; |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 294 | } |
| 295 | |
Arunesh Mishra | 6a8fd79 | 2016-01-27 16:20:08 -0800 | [diff] [blame] | 296 | /** |
| 297 | * @hide |
| 298 | */ |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 299 | public void dump(String prefix, PrintWriter pw) { |
| 300 | synchronized (mLock) { |
| 301 | // TODO: Dump useful debug information. |
| 302 | } |
| 303 | } |
| 304 | |
| 305 | /** |
| 306 | * Callback that handles events from the lower sound trigger layer. |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 307 | * |
| 308 | * Note that these callbacks will be called synchronously from the SoundTriggerService |
| 309 | * layer and thus should do minimal work (such as sending a message on a handler to do |
| 310 | * the real work). |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 311 | * @hide |
| 312 | */ |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 313 | private class RecognitionCallback extends IRecognitionStatusCallback.Stub { |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 314 | |
| 315 | /** |
| 316 | * @hide |
| 317 | */ |
| 318 | @Override |
Arunesh Mishra | f47f173 | 2016-02-18 16:16:12 -0800 | [diff] [blame] | 319 | public void onGenericSoundTriggerDetected(SoundTrigger.GenericRecognitionEvent event) { |
| 320 | Slog.d(TAG, "onGenericSoundTriggerDetected()" + event); |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 321 | Message.obtain(mHandler, |
| 322 | MSG_SOUND_TRIGGER_DETECTED, |
| 323 | new EventPayload(event.triggerInData, event.captureAvailable, |
| 324 | event.captureFormat, event.captureSession, event.data)) |
| 325 | .sendToTarget(); |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 326 | } |
| 327 | |
Arunesh Mishra | f47f173 | 2016-02-18 16:16:12 -0800 | [diff] [blame] | 328 | @Override |
| 329 | public void onKeyphraseDetected(SoundTrigger.KeyphraseRecognitionEvent event) { |
| 330 | Slog.e(TAG, "Ignoring onKeyphraseDetected() called for " + event); |
| 331 | } |
| 332 | |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 333 | /** |
| 334 | * @hide |
| 335 | */ |
| 336 | @Override |
| 337 | public void onError(int status) { |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 338 | Slog.d(TAG, "onError()" + status); |
| 339 | mHandler.sendEmptyMessage(MSG_DETECTION_ERROR); |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 340 | } |
| 341 | |
| 342 | /** |
| 343 | * @hide |
| 344 | */ |
| 345 | @Override |
| 346 | public void onRecognitionPaused() { |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 347 | Slog.d(TAG, "onRecognitionPaused()"); |
| 348 | mHandler.sendEmptyMessage(MSG_DETECTION_PAUSE); |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 349 | } |
| 350 | |
| 351 | /** |
| 352 | * @hide |
| 353 | */ |
| 354 | @Override |
| 355 | public void onRecognitionResumed() { |
Arunesh Mishra | 3fff7f5 | 2016-02-09 12:15:19 -0800 | [diff] [blame] | 356 | Slog.d(TAG, "onRecognitionResumed()"); |
| 357 | mHandler.sendEmptyMessage(MSG_DETECTION_RESUME); |
| 358 | } |
| 359 | } |
| 360 | |
| 361 | private class MyHandler extends Handler { |
| 362 | |
| 363 | MyHandler() { |
| 364 | super(); |
| 365 | } |
| 366 | |
| 367 | MyHandler(Looper looper) { |
| 368 | super(looper); |
| 369 | } |
| 370 | |
| 371 | @Override |
| 372 | public void handleMessage(Message msg) { |
| 373 | if (mCallback == null) { |
| 374 | Slog.w(TAG, "Received message: " + msg.what + " for NULL callback."); |
| 375 | return; |
| 376 | } |
| 377 | switch (msg.what) { |
| 378 | case MSG_SOUND_TRIGGER_DETECTED: |
| 379 | mCallback.onDetected((EventPayload) msg.obj); |
| 380 | break; |
| 381 | case MSG_DETECTION_ERROR: |
| 382 | mCallback.onError(); |
| 383 | break; |
| 384 | case MSG_DETECTION_PAUSE: |
| 385 | mCallback.onRecognitionPaused(); |
| 386 | break; |
| 387 | case MSG_DETECTION_RESUME: |
| 388 | mCallback.onRecognitionResumed(); |
| 389 | break; |
| 390 | default: |
| 391 | super.handleMessage(msg); |
| 392 | |
| 393 | } |
Arunesh Mishra | a772e5f | 2016-01-25 10:33:11 -0800 | [diff] [blame] | 394 | } |
| 395 | } |
| 396 | } |