diff options
| author | Ganesh Vilas Chaudhari <quic_ganeshvi@quicinc.com> | 2023-02-20 15:22:02 +0530 |
|---|---|---|
| committer | Ganesh Vilas Chaudhari <quic_ganeshvi@quicinc.com> | 2023-02-20 12:21:26 +0000 |
| commit | 37fa2dc812b4fd31f3b45b13ce2604d6fb445c60 (patch) | |
| tree | e03663207468849b1d7dafb48b70da43b149367d | |
| parent | 29a3da44368e23fa68a0f31426ac6c2bb13031ca (diff) | |
Allow mainline modules to be disabled at runtime
Added check to prevent installation of CellBroadcastApp and
CellBroadcastServiceModule as the path is appended with LKG tag.
Change-Id: Ie1cddb917bdcdc9042dd398cc229569a8edfd31f
CRs-Fixed: 3411060
| -rw-r--r-- | services/core/java/com/android/server/pm/InstallPackageHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index d000b6dec9b4..e39ed4a87dd2 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -3466,7 +3466,8 @@ final class InstallPackageHelper { } if (mPackagesToBeDisabled.values() != null && - mPackagesToBeDisabled.values().contains(file.toString())) { + (mPackagesToBeDisabled.values().contains(file.toString()) || + mPackagesToBeDisabled.values().stream().anyMatch(file.toString()::contains))) { // Ignore entries contained in {@link #mPackagesToBeDisabled} Slog.d(TAG, "ignoring package: " + file); continue; |