allow users to disable hardened_malloc for Bluetooth app

GrapheneOS-Archive · Mar 14, 2024 · 5053f47 · 5053f47
1 parent 3fd0aae
commit 5053f47
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/core/java/android/ext/BluetoothUtils.java b/core/java/android/ext/BluetoothUtils.java
@@ -0,0 +1,21 @@
+package android.ext;
+
+import android.content.Context;
+import android.ext.settings.BoolSysProperty;
+
+import com.android.internal.R;
+
+/** @hide */
+public class BluetoothUtils {
+    private static volatile String bluetoothStackPackageName;
+
+    public static String getBluetoothStackPackageName(Context ctx) {
+        String cache = bluetoothStackPackageName;
+        if (cache != null) {
+            return cache;
+        }
+        String res = ctx.getString(R.string.config_systemBluetoothStack);
+        bluetoothStackPackageName = res;
+        return res;
+    }
+}
diff --git a/core/java/android/ext/settings/app/AswUseHardenedMalloc.java b/core/java/android/ext/settings/app/AswUseHardenedMalloc.java
@@ -5,9 +5,12 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.GosPackageState;
 import android.content.pm.GosPackageStateBase;
+import android.ext.BluetoothUtils;
 
 import com.android.server.os.nano.AppCompatProtos;
 
+import java.util.Objects;
+
 import dalvik.system.VMRuntime;
 
 /** @hide */
@@ -23,6 +26,14 @@ private AswUseHardenedMalloc() {
     @Override
     public Boolean getImmutableValue(Context ctx, int userId, ApplicationInfo appInfo,
                                      @Nullable GosPackageStateBase ps, StateInfo si) {
+        if (appInfo.isSystemApp()) {
+            if (Objects.equals(appInfo.packageName, BluetoothUtils.getBluetoothStackPackageName(ctx))) {
+                return null;
+            }
+            si.immutabilityReason = IR_IS_SYSTEM_APP;
+            return true;
+        }
+
         String primaryAbi = appInfo.primaryCpuAbi;
         if (primaryAbi == null) {
             si.immutabilityReason = IR_NO_NATIVE_CODE;
@@ -42,11 +53,6 @@ public Boolean getImmutableValue(Context ctx, int userId, ApplicationInfo appInf
             return true;
         }
 
-        if (appInfo.isSystemApp()) {
-            si.immutabilityReason = IR_IS_SYSTEM_APP;
-            return true;
-        }
-
         if (ps != null && ps.hasFlags(GosPackageState.FLAG_ENABLE_EXPLOIT_PROTECTION_COMPAT_MODE)) {
             si.immutabilityReason = IR_EXPLOIT_PROTECTION_COMPAT_MODE;
             return false;