commit f7a2e7c57a8d3e0752469a28d455096a77b8a909
author Jordan Liu <jminjie@google.com> Wed Aug 19 10:13:03 2020 -0700
committer Jordan Liu <jminjie@google.com> Thu Aug 20 18:05:31 2020 +0000
tree 302d4e16ff52901888235f1b45e2722643118027
parent a4c31c9f056c173292a960d40df704e3a7b859b1

Fallback to non-gzip

Bug: 142906839
Test: manual and CarrierKeyDownloadMgrTest
Change-Id: I7ae2ddd701f3929c32922a495a08247645ce5c8d

src/java/com/android/internal/telephony/CarrierKeyDownloadManager.java

diff --git a/src/java/com/android/internal/telephony/CarrierKeyDownloadManager.java b/src/java/com/android/internal/telephony/CarrierKeyDownloadManager.java
index 3e94f4f..941dd38 100644
--- a/src/java/com/android/internal/telephony/CarrierKeyDownloadManager.java
+++ b/src/java/com/android/internal/telephony/CarrierKeyDownloadManager.java
@@ -60,6 +60,7 @@
 import java.util.Date;
 import java.util.Random;
 import java.util.zip.GZIPInputStream;
+import java.util.zip.ZipException;
 
 /**
  * This class contains logic to get Certificates and keep them current.
@@ -403,11 +404,15 @@
 
     private static String convertToString(InputStream is) {
         try {
-            // The current implementation at certain Carriers has the data gzipped, which requires
-            // us to unzip the contents. Longer term, we want to add a flag in carrier config which
-            // determines if the data needs to be zipped or not.
-            GZIPInputStream gunzip = new GZIPInputStream(is);
-            BufferedReader reader = new BufferedReader(new InputStreamReader(gunzip, UTF_8));
+            // If the carrier does not have the data gzipped, fallback to assuming it is not zipped.
+            // parseJsonAndPersistKey may still fail if the data is malformed, so we won't be
+            // persisting random bogus strings thinking it's the cert
+            try {
+                is = new GZIPInputStream(is);
+            } catch (ZipException e) {
+                Log.d(LOG_TAG, "fallback to no gzip");
+            }
+            BufferedReader reader = new BufferedReader(new InputStreamReader(is, UTF_8));
             StringBuilder sb = new StringBuilder();
 
             String line;