From 49b1bc15450d823e86ee4b2b77d77dc9eeca388e Mon Sep 17 00:00:00 2001
From: Yanting Yang <yantingyang@google.com>
Date: Fri, 19 Jul 2019 01:46:36 +0800
Subject: [PATCH] Support new regulatory label for location

Fixes: 137348817
Test: visual, robotests
Change-Id: I165b1e859891c7897e837d82702582458cecbb0d
---
 .../settings/RegulatoryInfoDisplayActivity.java    |  25 +++++--
 tests/robotests/res/drawable/regulatory_info.png   | Bin 0 -> 159 bytes
 .../robotests/res/drawable/regulatory_info_sku.png | Bin 0 -> 159 bytes
 .../res/drawable/regulatory_info_sku1_coo.png      | Bin 0 -> 159 bytes
 .../RegulatoryInfoDisplayActivityTest.java         |  83 +++++++++++++++++++++
 5 files changed, 103 insertions(+), 5 deletions(-)
 create mode 100644 tests/robotests/res/drawable/regulatory_info.png
 create mode 100644 tests/robotests/res/drawable/regulatory_info_sku.png
 create mode 100644 tests/robotests/res/drawable/regulatory_info_sku1_coo.png
 create mode 100644 tests/robotests/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java

diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
index 8bc1cefec5..4c7515d10f 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
@@ -119,7 +119,8 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
         }
     }
 
-    private int getResourceId() {
+    @VisibleForTesting
+    int getResourceId() {
         // Use regulatory_info by default.
         int resId = getResources().getIdentifier(
                 REGULATORY_INFO_RESOURCE, "drawable", getPackageName());
@@ -134,6 +135,18 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
                 resId = id;
             }
         }
+
+        // When hardware coo property exists, use regulatory_info_<sku>_<coo> resource if valid.
+        final String coo = getCoo();
+        if (!TextUtils.isEmpty(coo) && !TextUtils.isEmpty(sku)) {
+            final String regulatory_info_coo_res =
+                    REGULATORY_INFO_RESOURCE + "_" + sku.toLowerCase() + "_" + coo.toLowerCase();
+            final int id = getResources().getIdentifier(
+                    regulatory_info_coo_res, "drawable", getPackageName());
+            if (id != 0) {
+                resId = id;
+            }
+        }
         return resId;
     }
 
@@ -142,13 +155,15 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
         finish();   // close the activity
     }
 
-    @VisibleForTesting
-    public static String getSku() {
+    private String getCoo() {
+        return SystemProperties.get("ro.boot.hardware.coo", "");
+    }
+
+    private String getSku() {
         return SystemProperties.get("ro.boot.hardware.sku", "");
     }
 
-    @VisibleForTesting
-    public static String getRegulatoryInfoImageFileName() {
+    private String getRegulatoryInfoImageFileName() {
         final String sku = getSku();
         if (TextUtils.isEmpty(sku)) {
             return DEFAULT_REGULATORY_INFO_FILEPATH;
diff --git a/tests/robotests/res/drawable/regulatory_info.png b/tests/robotests/res/drawable/regulatory_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..65de26c0eb28b05d6d0d6903288e1bbbce409d18
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?slj7I;J!Gca%q
zgD@k*tT_@uLG}_)Usv`!oI*kxYUgfUzX24IEOCt}an8@pP0cG|a4t$sEJ;mKD9<d(
xP;mG34G3@K69+2d@pN$v;kcgs<Ntqq2G)N}|L&ZLd=3<6@O1TaS?83{1ONjlD&_zH

literal 0
HcmV?d00001

diff --git a/tests/robotests/res/drawable/regulatory_info_sku.png b/tests/robotests/res/drawable/regulatory_info_sku.png
new file mode 100644
index 0000000000000000000000000000000000000000..65de26c0eb28b05d6d0d6903288e1bbbce409d18
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?slj7I;J!Gca%q
zgD@k*tT_@uLG}_)Usv`!oI*kxYUgfUzX24IEOCt}an8@pP0cG|a4t$sEJ;mKD9<d(
xP;mG34G3@K69+2d@pN$v;kcgs<Ntqq2G)N}|L&ZLd=3<6@O1TaS?83{1ONjlD&_zH

literal 0
HcmV?d00001

diff --git a/tests/robotests/res/drawable/regulatory_info_sku1_coo.png b/tests/robotests/res/drawable/regulatory_info_sku1_coo.png
new file mode 100644
index 0000000000000000000000000000000000000000..65de26c0eb28b05d6d0d6903288e1bbbce409d18
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?slj7I;J!Gca%q
zgD@k*tT_@uLG}_)Usv`!oI*kxYUgfUzX24IEOCt}an8@pP0cG|a4t$sEJ;mKD9<d(
xP;mG34G3@K69+2d@pN$v;kcgs<Ntqq2G)N}|L&ZLd=3<6@O1TaS?83{1ONjlD&_zH

literal 0
HcmV?d00001

diff --git a/tests/robotests/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java b/tests/robotests/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
new file mode 100644
index 0000000000..d05d5d77d4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.SystemProperties;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+
+@RunWith(RobolectricTestRunner.class)
+public class RegulatoryInfoDisplayActivityTest {
+
+    private static final String SKU_PROP_KEY = "ro.boot.hardware.sku";
+    private static final String COO_PROP_KEY = "ro.boot.hardware.coo";
+
+    private RegulatoryInfoDisplayActivity mRegulatoryInfoDisplayActivity;
+
+    @Before
+    public void setUp() {
+        mRegulatoryInfoDisplayActivity = Robolectric.buildActivity(
+                RegulatoryInfoDisplayActivity.class).create().get();
+    }
+
+    @Test
+    public void getResourceId_noSkuProperty_shouldReturnDefaultLabel() {
+        SystemProperties.set(SKU_PROP_KEY, "");
+
+        final int expectedResId = getResourceId("regulatory_info");
+        assertThat(mRegulatoryInfoDisplayActivity.getResourceId()).isEqualTo(expectedResId);
+    }
+
+    @Test
+    public void getResourceId_noCooProperty_shouldReturnSkuLabel() {
+        SystemProperties.set(SKU_PROP_KEY, "sku");
+        SystemProperties.set(COO_PROP_KEY, "");
+
+        final int expectedResId = getResourceId("regulatory_info_sku");
+        assertThat(mRegulatoryInfoDisplayActivity.getResourceId()).isEqualTo(expectedResId);
+    }
+
+    @Test
+    public void getResourceId_hasSkuAndCooProperties_shouldReturnCooLabel() {
+        SystemProperties.set(SKU_PROP_KEY, "sku1");
+        SystemProperties.set(COO_PROP_KEY, "coo");
+
+        final int expectedResId = getResourceId("regulatory_info_sku1_coo");
+        assertThat(mRegulatoryInfoDisplayActivity.getResourceId()).isEqualTo(expectedResId);
+    }
+
+    @Test
+    public void getResourceId_noCorrespondingCooLabel_shouldReturnSkuLabel() {
+        SystemProperties.set(SKU_PROP_KEY, "sku");
+        SystemProperties.set(COO_PROP_KEY, "unknown");
+
+        final int expectedResId = getResourceId("regulatory_info_sku");
+        assertThat(mRegulatoryInfoDisplayActivity.getResourceId()).isEqualTo(expectedResId);
+    }
+
+    private int getResourceId(String resourceName) {
+        return mRegulatoryInfoDisplayActivity.getResources().getIdentifier(resourceName, "drawable",
+                mRegulatoryInfoDisplayActivity.getPackageName());
+    }
+}
-- 
2.11.0