From 5939d078a01edc9f83fce102317540ffbcac17c1 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Thu, 15 Nov 2018 09:54:25 -0800 Subject: [PATCH] Fix compatibility issue for android 16 device.Fixes #22294 (#22295) Summary: Fix compatibility issue for android 16 device. Related issue https://github.com/facebook/react-native/pull/22295. pass all current ci. none [GENERAL] [ANDROID] [Fixed] - Fix compatibility issue for android 16 device Pull Request resolved: https://github.com/facebook/react-native/pull/22295 Differential Revision: D13084152 Pulled By: hramos fbshipit-source-id: 42459ddc6f84f870affdda5ba19bcd8bb27b56d7 --- .../facebook/react/modules/systeminfo/AndroidInfoHelpers.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java index 16dc414dcd690d..01d3c6abbff6d6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java @@ -7,6 +7,7 @@ import java.io.BufferedReader; import java.io.InputStreamReader; +import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Locale; @@ -84,7 +85,7 @@ private static synchronized String getMetroHostPropValue() { Runtime.getRuntime().exec(new String[] {"/system/bin/getprop", METRO_HOST_PROP_NAME}); reader = new BufferedReader( - new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8)); + new InputStreamReader(process.getInputStream(), Charset.forName("UTF-8"))); String lastLine = ""; String line;