From dce8fa2708167620f4ed79b9e3966eab3f967ae2 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Mon, 1 Aug 2022 21:34:07 -0400
Subject: [PATCH] Move hidden API shims via reflection to a standalone package

This way we can skip them in AOSP builds
---
 .idea/compiler.xml                            |  1 +
 .idea/gradle.xml                              |  1 +
 app/build.gradle                              |  1 +
 libs/hidden-apis-shim/.gitignore              |  1 +
 libs/hidden-apis-shim/build.gradle            | 40 +++++++++++++++++++
 libs/hidden-apis-shim/consumer-rules.pro      |  0
 libs/hidden-apis-shim/proguard-rules.pro      | 21 ++++++++++
 .../ExampleInstrumentedTest.kt                | 24 +++++++++++
 .../src/main/AndroidManifest.xml              |  5 +++
 .../util/TelephonyManagerHiddenApi.kt         |  0
 .../hidden_apis_shim/ExampleUnitTest.kt       | 17 ++++++++
 settings.gradle                               |  1 +
 12 files changed, 112 insertions(+)
 create mode 100644 libs/hidden-apis-shim/.gitignore
 create mode 100644 libs/hidden-apis-shim/build.gradle
 create mode 100644 libs/hidden-apis-shim/consumer-rules.pro
 create mode 100644 libs/hidden-apis-shim/proguard-rules.pro
 create mode 100644 libs/hidden-apis-shim/src/androidTest/java/im/angry/openeuicc/hidden_apis_shim/ExampleInstrumentedTest.kt
 create mode 100644 libs/hidden-apis-shim/src/main/AndroidManifest.xml
 rename {app => libs/hidden-apis-shim}/src/main/java/im/angry/openeuicc/util/TelephonyManagerHiddenApi.kt (100%)
 create mode 100644 libs/hidden-apis-shim/src/test/java/im/angry/openeuicc/hidden_apis_shim/ExampleUnitTest.kt

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index e87380b..ed610c4 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -3,6 +3,7 @@
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="1.7">
       <module name="OpenEUICC.app" target="11" />
+      <module name="OpenEUICC.libs.hidden-apis-shim" target="11" />
       <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector" target="1.8" />
       <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector.main" target="1.8" />
       <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector.test" target="1.8" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d06202a..a891be1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,6 +13,7 @@
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/libs" />
+            <option value="$PROJECT_DIR$/libs/hidden-apis-shim" />
             <option value="$PROJECT_DIR$/libs/hidden-apis-stub" />
             <option value="$PROJECT_DIR$/libs/lpad-sm-dp-plus-connector" />
           </set>
diff --git a/app/build.gradle b/app/build.gradle
index f78f48e..0896dff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,6 +33,7 @@ android {
 
 dependencies {
     compileOnly project(':libs:hidden-apis-stub')
+    implementation project(':libs:hidden-apis-shim')
     implementation project(":libs:lpad-sm-dp-plus-connector")
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
diff --git a/libs/hidden-apis-shim/.gitignore b/libs/hidden-apis-shim/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/libs/hidden-apis-shim/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/libs/hidden-apis-shim/build.gradle b/libs/hidden-apis-shim/build.gradle
new file mode 100644
index 0000000..bc537f7
--- /dev/null
+++ b/libs/hidden-apis-shim/build.gradle
@@ -0,0 +1,40 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    compileSdk 32
+
+    defaultConfig {
+        minSdk 30
+        targetSdk 32
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+}
\ No newline at end of file
diff --git a/libs/hidden-apis-shim/consumer-rules.pro b/libs/hidden-apis-shim/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/libs/hidden-apis-shim/proguard-rules.pro b/libs/hidden-apis-shim/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/libs/hidden-apis-shim/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/libs/hidden-apis-shim/src/androidTest/java/im/angry/openeuicc/hidden_apis_shim/ExampleInstrumentedTest.kt b/libs/hidden-apis-shim/src/androidTest/java/im/angry/openeuicc/hidden_apis_shim/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..bc9c968
--- /dev/null
+++ b/libs/hidden-apis-shim/src/androidTest/java/im/angry/openeuicc/hidden_apis_shim/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package im.angry.openeuicc.hidden_apis_shim
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("im.angry.openeuicc.hidden_apis_shim.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/libs/hidden-apis-shim/src/main/AndroidManifest.xml b/libs/hidden-apis-shim/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..fd89b2d
--- /dev/null
+++ b/libs/hidden-apis-shim/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="im.angry.openeuicc.hidden_apis_shim">
+
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/im/angry/openeuicc/util/TelephonyManagerHiddenApi.kt b/libs/hidden-apis-shim/src/main/java/im/angry/openeuicc/util/TelephonyManagerHiddenApi.kt
similarity index 100%
rename from app/src/main/java/im/angry/openeuicc/util/TelephonyManagerHiddenApi.kt
rename to libs/hidden-apis-shim/src/main/java/im/angry/openeuicc/util/TelephonyManagerHiddenApi.kt
diff --git a/libs/hidden-apis-shim/src/test/java/im/angry/openeuicc/hidden_apis_shim/ExampleUnitTest.kt b/libs/hidden-apis-shim/src/test/java/im/angry/openeuicc/hidden_apis_shim/ExampleUnitTest.kt
new file mode 100644
index 0000000..65226a8
--- /dev/null
+++ b/libs/hidden-apis-shim/src/test/java/im/angry/openeuicc/hidden_apis_shim/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package im.angry.openeuicc.hidden_apis_shim
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 661e47c..534a3ba 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,3 +15,4 @@ dependencyResolutionManagement {
 rootProject.name = "OpenEUICC"
 include ':app', ':libs:lpad-sm-dp-plus-connector'
 include ':libs:hidden-apis-stub'
+include ':libs:hidden-apis-shim'