diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-11-15 11:31:05 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-15 11:31:05 -0800 |
| commit | 5548758d33852432b0d0b8fcb43f2ec499782557 (patch) | |
| tree | 7580b2d8781f06e76a69bf29c10b1e5bb5f3d3e1 | |
| parent | 160b977c81ce1b3edc7c310a661c31e3d5183768 (diff) | |
| parent | 725d8f06ecd31cd2e31eaa06e52de052dd07c5c7 (diff) | |
| download | frameworks_base-5548758d33852432b0d0b8fcb43f2ec499782557.zip frameworks_base-5548758d33852432b0d0b8fcb43f2ec499782557.tar.gz frameworks_base-5548758d33852432b0d0b8fcb43f2ec499782557.tar.bz2 | |
Merge "Close some things in system_server that CloseGuard found."
| -rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index 90ebf3f..6a86076 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -585,6 +585,7 @@ class BackupManagerService extends IBackupManager.Stub { } } } + tf.close(); } catch (FileNotFoundException fnf) { // Probably innocuous Slog.v(TAG, "No ancestral data"); diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 4707bbf..cd58284 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -7334,6 +7334,7 @@ class PackageManagerService extends IPackageManager.Stub { byte[] data = new byte[avail]; in.read(data); pw.print(new String(data)); + in.close(); } catch (FileNotFoundException e) { } catch (IOException e) { } |