Remove connection encryption.

milesking · Oct 22, 2019 · e9645a5 · e9645a5
1 parent dfde284
commit e9645a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CarLife-Android-Vehicle/src/com/baidu/carlifevehicle/CarlifeActivity.java b/CarLife-Android-Vehicle/src/com/baidu/carlifevehicle/CarlifeActivity.java
@@ -90,6 +90,7 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
+import android.os.StrictMode;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
@@ -170,6 +171,11 @@ protected void onCreate(Bundle savedInstanceState) {
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         setContentView(R.layout.activity_main);
+        // disable android.os.NetworkOnMainThreadException
+        if (android.os.Build.VERSION.SDK_INT > 9) {
+            StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
+            StrictMode.setThreadPolicy(policy);
+        }
         mRootView = (ViewGroup) findViewById(R.id.main_root_view);
         PreferenceUtil.getInstance().init(this);
         mCarLifeFragmentManager = new CarLifeFragmentManager(this);

diff --git a/CarLife-Android-Vehicle/src/com/baidu/carlifevehicle/util/CarlifeConfUtil.java b/CarLife-Android-Vehicle/src/com/baidu/carlifevehicle/util/CarlifeConfUtil.java
@@ -354,7 +354,7 @@ private int readBdcf() {
             propertyMap.put("CONNECT_TYPE_ANDROID", "1");
             propertyMap.put("CONNECT_TYPE_IPHONE", "1");
             propertyMap.put("AUDIO_TRANSMISSION_MODE", "0");
-            propertyMap.put("CONTENT_ENCRYPTION", "true");
+            propertyMap.put("CONTENT_ENCRYPTION", "false");
             propertyMap.put("ENGINE_TYPE", "0");
         } catch (Exception e) {
             LogUtil.e(TAG, "[ERROR]read file exception");