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

am d2a11d97: Merge "Add explicit close of Scanner input"

Browse Source 
* commit 'd2a11d97a94bed18629bded429f118f57f4f7821':
  Add explicit close of Scanner input
This commit is contained in:
Elliott Hughes
2014-04-11 17:18:14 +00:00
committed by Android Git Automerger
parent de442781cd d2a11d97a9
commit 90e2301e23
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -573,14 +573,19 @@ public class UsbDeviceManager {
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
intent.putExtra("state", (enabled ? 1 : 0)); intent.putExtra("state", (enabled ? 1 : 0));
if (enabled) { if (enabled) {
Scanner scanner = null;
try { 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 card = scanner.nextInt();
int device = scanner.nextInt(); int device = scanner.nextInt();
intent.putExtra("card", card); intent.putExtra("card", card);
intent.putExtra("device", device); intent.putExtra("device", device);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Slog.e(TAG, "could not open audio source PCM file", e); Slog.e(TAG, "could not open audio source PCM file", e);
} finally {
if (scanner != null) {
scanner.close();
}
} }
} }
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);