From 74441f0ef33e384d79d4905dd8b69b143bcf1236 Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Thu, 18 Aug 2022 13:43:11 +0800
Subject: [PATCH] Add SpaPrivilegedLib-defaults

Bug: 235727273
Test: make Settings app
Change-Id: I2829031251b379d4f21955ca8d9f65089fef8119
---
 packages/SettingsLib/SpaPrivileged/Android.bp        | 12 ++++++++++++
 .../spaprivileged/model/app/AppOpsController.kt      |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/SettingsLib/SpaPrivileged/Android.bp b/packages/SettingsLib/SpaPrivileged/Android.bp
index a6469b5172bb6..082ce97e3273d 100644
--- a/packages/SettingsLib/SpaPrivileged/Android.bp
+++ b/packages/SettingsLib/SpaPrivileged/Android.bp
@@ -33,3 +33,15 @@ android_library {
         "-Xopt-in=kotlin.RequiresOptIn",
     ],
 }
+
+java_defaults {
+    name: "SpaPrivilegedLib-defaults",
+    static_libs: [
+        "androidx.compose.runtime_runtime",
+        "SpaPrivilegedLib",
+    ],
+    kotlincflags: ["-Xjvm-default=all"],
+    javacflags: [
+        "-J-Xmx4G",
+    ],
+}
diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppOpsController.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppOpsController.kt
index c2d85a54bc32c..8876f66bcafe4 100644
--- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppOpsController.kt
+++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppOpsController.kt
@@ -42,7 +42,7 @@ class AppOpsController(
     }
 
     @Mode
-    private fun getMode(): Int = appOpsManager.checkOpNoThrow(op, app.uid, app.packageName)
+    fun getMode(): Int = appOpsManager.checkOpNoThrow(op, app.uid, app.packageName)
 
     private val _isAllowed = object : MutableLiveData<Boolean>() {
         override fun onActive() {