mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-08-17 02:21:02 -04:00
Broken EUICC handling
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
196dfddf63
commit
7ef5d9a9c4
8 changed files with 102 additions and 10 deletions
|
@ -13,6 +13,11 @@ PRODUCT_PACKAGES += \
|
|||
# OpenCamera
|
||||
#endif
|
||||
|
||||
#ifneq ($(filter crosshatch blueline bonito sargo coral flame sunfish barbet redfin bluejay oriole raven panther cheetah FP4,$(TARGET_DEVICE)),)
|
||||
#PRODUCT_PACKAGES += \
|
||||
# OpenEUICC
|
||||
#endif
|
||||
|
||||
# Extras
|
||||
PRODUCT_PACKAGES += \
|
||||
TalkBack \
|
||||
|
|
|
@ -8,10 +8,10 @@ Subject: [PATCH] reject updates with serialno constraints
|
|||
1 file changed, 2 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/install/install.cpp b/install/install.cpp
|
||||
index 61bab17b..e14cbf50 100644
|
||||
index 11a6b3ff..8dd647be 100644
|
||||
--- a/install/install.cpp
|
||||
+++ b/install/install.cpp
|
||||
@@ -221,22 +221,10 @@ bool CheckPackageMetadata(const std::map<std::string, std::string>& metadata, Ot
|
||||
@@ -223,22 +223,10 @@ bool CheckPackageMetadata(const std::map<std::string, std::string>& metadata, Ot
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,54 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Scott <olivercscott@gmail.com>
|
||||
Date: Wed, 17 May 2023 15:42:52 -0400
|
||||
Subject: [PATCH] Filter select package queries for GMS
|
||||
|
||||
Bit of a hack to pretend that microG is not available,
|
||||
to make apps work
|
||||
|
||||
[tad@spotco.us]: adjusted package list
|
||||
Change-Id: Ic5ddb78b1014ce567d1a5c57fc79f79edd1154c0
|
||||
|
||||
Change-Id: I7969470baa125eef349e82808b0d6e643e344c8b
|
||||
---
|
||||
.../java/com/android/server/pm/AppsFilterBase.java | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/pm/AppsFilterBase.java b/services/core/java/com/android/server/pm/AppsFilterBase.java
|
||||
index 01252c48081e..07746236320e 100644
|
||||
--- a/services/core/java/com/android/server/pm/AppsFilterBase.java
|
||||
+++ b/services/core/java/com/android/server/pm/AppsFilterBase.java
|
||||
@@ -37,6 +37,7 @@ import android.util.Slog;
|
||||
import android.util.SparseArray;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
+import com.android.internal.util.ArrayUtils;
|
||||
import com.android.internal.util.function.QuadFunction;
|
||||
import com.android.server.om.OverlayReferenceMapper;
|
||||
import com.android.server.pm.parsing.pkg.AndroidPackage;
|
||||
@@ -64,6 +65,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
||||
public abstract class AppsFilterBase implements AppsFilterSnapshot {
|
||||
protected static final String TAG = "AppsFilter";
|
||||
|
||||
+ private static final String GMS = "com.google.android.gms";
|
||||
+ private static final String[] GMS_HIDDEN_PACKAGES = { "com.google.euiccpixel" };
|
||||
+
|
||||
// Logs all filtering instead of enforcing
|
||||
protected static final boolean DEBUG_ALLOW_ALL = false;
|
||||
protected static final boolean DEBUG_LOGGING = false;
|
||||
@@ -496,6 +500,15 @@ public abstract class AppsFilterBase implements AppsFilterSnapshot {
|
||||
if (DEBUG_LOGGING) {
|
||||
log(callingSetting, targetPkgSetting, "force queryable");
|
||||
}
|
||||
+ if (GMS.equals(targetPkgSetting.getPackageName())
|
||||
+ && callingPkgSetting != null) {
|
||||
+ // HACK: Hide GMS from these packages
|
||||
+ // Breaks login but makes them work
|
||||
+ if (ArrayUtils.contains(GMS_HIDDEN_PACKAGES,
|
||||
+ callingPkgSetting.getPackageName())) {
|
||||
+ return true;
|
||||
+ }
|
||||
+ }
|
||||
return false;
|
||||
}
|
||||
} finally {
|
|
@ -0,0 +1,24 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
|
||||
Date: Sun, 19 Mar 2023 17:57:26 +0200
|
||||
Subject: [PATCH] do not auto-grant Camera permission to the eUICC LPA UI app
|
||||
|
||||
Google's LPA that is shipped on GrapheneOS handles requesting the Camera permission at runtime,
|
||||
which allows the user to give it a one-time grant.
|
||||
---
|
||||
.../server/pm/permission/DefaultPermissionGrantPolicy.java | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
|
||||
index 0443d19ba1d4..39608dcc9ccb 100644
|
||||
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
|
||||
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
|
||||
@@ -1060,8 +1060,6 @@ final class DefaultPermissionGrantPolicy {
|
||||
|
||||
public void grantDefaultPermissionsToActiveLuiApp(String packageName, int userId) {
|
||||
Log.i(TAG, "Granting permissions to active LUI app for user:" + userId);
|
||||
- grantSystemFixedPermissionsToSystemPackage(NO_PM_CACHE, packageName, userId,
|
||||
- CAMERA_PERMISSIONS);
|
||||
}
|
||||
|
||||
public void revokeDefaultPermissionsFromLuiApps(String[] packageNames, int userId) {
|
Loading…
Add table
Add a link
Reference in a new issue