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>
This commit is contained in:
committed by
Automerger Merge Worker
commit
1c2937d51a
@@ -87,7 +87,7 @@ public class BpfLoaderRcUtils {
|
||||
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();
|
||||
|
||||
Reference in New Issue
Block a user