Snap for 7135433 from 1d559508ac9a1f4657ef4f61ca2bd6aeb5674d4e to sc-d1-release

Change-Id: I61e2bf18fc42042d68c45f17b07218b6c59acae9

9 files changed, 15 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 0f927eb..2f0e4cd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,9 +19,9 @@ genrule {
   out: ["com/android/imsserviceentitlement/ImsServiceEntitlementStatsLog.java"],
 }
 
-android_app {
-    name: "ImsServiceEntitlement",
-
+// Library isn't proguard optimized, suitable for unit test
+android_library {
+    name: "ImsServiceEntitlementLib",
     static_libs: [
         "androidx.annotation_annotation",
         "android-support-v4",
@@ -30,27 +30,29 @@ android_app {
         "setupdesign",
         "guava",
     ],
-
     libs: [
         "auto_value_annotations",
     ],
-
     plugins: ["auto_value_plugin"],
-
     resource_dirs: ["res"],
-
     srcs: [
         "src/**/*.java",
         ":statslog-imsentitlement-java-gen",
     ],
+    sdk_version: "system_current",
+}
 
+android_app {
+    name: "ImsServiceEntitlement",
+    static_libs: [
+        "ImsServiceEntitlementLib",
+    ],
     optimize: {
         proguard_flags_files: ["proguard.flags"],
     },
-
     product_specific: true,
     sdk_version: "system_current",
     certificate: "platform",
     privileged: true,
     required: ["privapp_whitelist_com.android.imsserviceentitlement"],
-}
\ No newline at end of file
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index b9f2705..981a136 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,12 +1,12 @@
 {
   "presubmit": [
     {
-      "name": "ImsServiceEntitlementTests"
+      "name": "ImsServiceEntitlementUnitTests"
     }
   ],
   "postsubmit": [
     {
-      "name": "ImsServiceEntitlementTests"
+      "name": "ImsServiceEntitlementUnitTests"
     }
   ]
 }
diff --git a/proguard.flags b/proguard.flags
index fdec2fc..f5bd5b2 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -2,7 +2,3 @@
 -keepclassmembers class * {
     @android.webkit.JavascriptInterface <methods>;
 }
-# Preserve fields used in test
--keep public abstract class com.android.imsserviceentitlement.ts43.Ts43VowifiStatus {
-    public *;
-}
\ No newline at end of file
diff --git a/tests/Android.bp b/tests/unittests/Android.bp
index 8890580..799ef94 100644
--- a/tests/Android.bp
+++ b/tests/unittests/Android.bp
@@ -14,12 +14,12 @@
 // limitations under the License.
 
 android_test {
-    name: "ImsServiceEntitlementTests",
-    instrumentation_for: "ImsServiceEntitlement",
+    name: "ImsServiceEntitlementUnitTests",
     srcs: ["src/**/*.java"],
     manifest: "AndroidManifest.xml",
     resource_dirs: [],
     static_libs: [
+        "ImsServiceEntitlementLib",
         "androidx.test.core",
         "androidx.test.ext.junit",
         "androidx.test.rules",
diff --git a/tests/AndroidManifest.xml b/tests/unittests/AndroidManifest.xml
index be8024f..be8024f 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/unittests/AndroidManifest.xml
diff --git a/tests/src/com/android/imsserviceentitlement/EntitlementUtilsTest.java b/tests/unittests/src/com/android/imsserviceentitlement/EntitlementUtilsTest.java
index 359b0e4..359b0e4 100644
--- a/tests/src/com/android/imsserviceentitlement/EntitlementUtilsTest.java
+++ b/tests/unittests/src/com/android/imsserviceentitlement/EntitlementUtilsTest.java
diff --git a/tests/src/com/android/imsserviceentitlement/WfcActivationControllerTest.java b/tests/unittests/src/com/android/imsserviceentitlement/WfcActivationControllerTest.java
index 001a6a6..001a6a6 100644
--- a/tests/src/com/android/imsserviceentitlement/WfcActivationControllerTest.java
+++ b/tests/unittests/src/com/android/imsserviceentitlement/WfcActivationControllerTest.java
diff --git a/tests/src/com/android/imsserviceentitlement/ts43/Ts43VowifiStatusTest.java b/tests/unittests/src/com/android/imsserviceentitlement/ts43/Ts43VowifiStatusTest.java
index b39fcf4..b39fcf4 100644
--- a/tests/src/com/android/imsserviceentitlement/ts43/Ts43VowifiStatusTest.java
+++ b/tests/unittests/src/com/android/imsserviceentitlement/ts43/Ts43VowifiStatusTest.java
diff --git a/tests/src/com/android/imsserviceentitlement/utils/XmlDocTest.java b/tests/unittests/src/com/android/imsserviceentitlement/utils/XmlDocTest.java
index b5161c6..b5161c6 100644
--- a/tests/src/com/android/imsserviceentitlement/utils/XmlDocTest.java
+++ b/tests/unittests/src/com/android/imsserviceentitlement/utils/XmlDocTest.java