commit 742c476d8966ec8fb0bce3eec0e1956d609c6749
author Maciej Żenczykowski <maze@google.com> Fri Dec 08 11:38:55 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 08 11:38:55 2023 +0000
tree 62bebe0f51bdfc67c09a5ef91bfab38ddfa8754c
parent ce6f14073cf412c8aca91f887ac1617633fb004a
parent 71a65dc21b673586bd3cb378a56ac8d3f2af12e6

Merge "Fix BpfLoaderRcUtils to support IOS_8859_1" into main

service/src/com/android/server/BpfLoaderRcUtils.java

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();