diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-11 17:25:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 17:25:08 +0000 |
| commit | 988b38bc812b12871ac7452a40d9d73273d126bc (patch) | |
| tree | 14c6483c282e793f667e5847bcb234c4a4eb5677 /services/usb/java/com | |
| parent | dec50073c93dff71d6d6fb3a2f14969690f02b9d (diff) | |
| parent | 5b7dccc4f9cc1d07650cd7d1f499c3c11ba3ede2 (diff) | |
| download | frameworks_base-988b38bc812b12871ac7452a40d9d73273d126bc.zip frameworks_base-988b38bc812b12871ac7452a40d9d73273d126bc.tar.gz frameworks_base-988b38bc812b12871ac7452a40d9d73273d126bc.tar.bz2 | |
am 5b7dccc4: am 90e2301e: am d2a11d97: Merge "Add explicit close of Scanner input"
* commit '5b7dccc4f9cc1d07650cd7d1f499c3c11ba3ede2':
Add explicit close of Scanner input
Diffstat (limited to 'services/usb/java/com')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 502ee18..f5ac178 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -590,14 +590,19 @@ public class UsbDeviceManager { intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); intent.putExtra("state", (enabled ? 1 : 0)); if (enabled) { + Scanner scanner = null; try { - Scanner scanner = new Scanner(new File(AUDIO_SOURCE_PCM_PATH)); + scanner = new Scanner(new File(AUDIO_SOURCE_PCM_PATH)); int card = scanner.nextInt(); int device = scanner.nextInt(); intent.putExtra("card", card); intent.putExtra("device", device); } catch (FileNotFoundException e) { Slog.e(TAG, "could not open audio source PCM file", e); + } finally { + if (scanner != null) { + scanner.close(); + } } } mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); |