| commit | 1c2937d51a8873561b605173640e19726cf6d38d | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Fri Dec 08 12:08:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 08 12:08:20 2023 +0000 |
| tree | b13b10b97902e5b2c1c65d00a565a039e828047e | |
| parent | 453d24ba8207ad8e473eda7f9b13277345ea1adf [diff] | |
| parent | 742c476d8966ec8fb0bce3eec0e1956d609c6749 [diff] |
Merge "Fix BpfLoaderRcUtils to support IOS_8859_1" into main am: 742c476d89 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2864287 Change-Id: I08c79f7266116cfe8d6b0ed42a6f026547660cbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/src/com/android/server/BpfLoaderRcUtils.java b/service/src/com/android/server/BpfLoaderRcUtils.java index 1b6ee55..293e757 100644 --- a/service/src/com/android/server/BpfLoaderRcUtils.java +++ b/service/src/com/android/server/BpfLoaderRcUtils.java
@@ -87,7 +87,7 @@ List<String> contents = new ArrayList<>(); boolean bpfSectionFound = false; try (BufferedReader br = new BufferedReader( - new InputStreamReader(inputStream, StandardCharsets.UTF_8))) { + new InputStreamReader(inputStream, StandardCharsets.ISO_8859_1))) { String line; while ((line = br.readLine()) != null) { line = line.trim();