From a9a46a64085e9359c7f1d825edec9a3a3e66bdf5 Mon Sep 17 00:00:00 2001
From: Dan Zivkovic <zivkovic@google.com>
Date: Mon, 6 Apr 2015 15:32:19 +0000
Subject: [PATCH] Revert "Declare that LatinIME does not use cleartext network
 traffic."

This reverts commit 24a9683ac9fc1b6d3ac49de449ea4b2f155f26a9.

Change-Id: I6f305aac6ac8d5c550a39eb5c88ec2881203cecc
Reason: Breaks a clean build on master.
---
 java/AndroidManifest.xml                               |  3 +--
 .../latin/network/HttpUrlConnectionBuilderTests.java   | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 7e77e77d1..f58c401c7 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -38,8 +38,7 @@
     <application android:label="@string/english_ime_name"
             android:icon="@drawable/ic_launcher_keyboard"
             android:supportsRtl="true"
-            android:allowBackup="true"
-            android:usesCleartextTraffic="false">
+            android:allowBackup="true">
 
         <!-- Services -->
         <service android:name="LatinIME"
diff --git a/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java b/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
index 54808b793..5b3e78eaf 100644
--- a/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
+++ b/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
@@ -87,7 +87,7 @@ public class HttpUrlConnectionBuilderTests extends AndroidTestCase {
 
     public void testAddHeader() throws IOException {
         HttpUrlConnectionBuilder builder = new HttpUrlConnectionBuilder();
-        builder.setUrl("https://www.example.com");
+        builder.setUrl("http://www.example.com");
         builder.addHeader("some-random-key", "some-random-value");
         HttpURLConnection connection = builder.build();
         assertEquals("some-random-value", connection.getRequestProperty("some-random-key"));
@@ -95,14 +95,14 @@ public class HttpUrlConnectionBuilderTests extends AndroidTestCase {
 
     public void testSetUseCache_notSet() throws IOException {
         HttpUrlConnectionBuilder builder = new HttpUrlConnectionBuilder();
-        builder.setUrl("https://www.example.com");
+        builder.setUrl("http://www.example.com");
         HttpURLConnection connection = builder.build();
         assertFalse(connection.getUseCaches());
     }
 
     public void testSetUseCache_false() throws IOException {
         HttpUrlConnectionBuilder builder = new HttpUrlConnectionBuilder();
-        builder.setUrl("https://www.example.com");
+        builder.setUrl("http://www.example.com");
         HttpURLConnection connection = builder.build();
         connection.setUseCaches(false);
         assertFalse(connection.getUseCaches());
@@ -110,7 +110,7 @@ public class HttpUrlConnectionBuilderTests extends AndroidTestCase {
 
     public void testSetUseCache_true() throws IOException {
         HttpUrlConnectionBuilder builder = new HttpUrlConnectionBuilder();
-        builder.setUrl("https://www.example.com");
+        builder.setUrl("http://www.example.com");
         HttpURLConnection connection = builder.build();
         connection.setUseCaches(true);
         assertTrue(connection.getUseCaches());
@@ -118,7 +118,7 @@ public class HttpUrlConnectionBuilderTests extends AndroidTestCase {
 
     public void testSetMode_uploadOnly() throws IOException {
         HttpUrlConnectionBuilder builder = new HttpUrlConnectionBuilder();
-        builder.setUrl("https://www.example.com");
+        builder.setUrl("http://www.example.com");
         builder.setMode(MODE_UPLOAD_ONLY);
         HttpURLConnection connection = builder.build();
         assertTrue(connection.getDoInput());