diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2023-03-07 09:12:21 -0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2023-03-07 09:12:21 -0800 |
| commit | 42065940fb45d80b37d5d419e65afcc4fc07658c (patch) | |
| tree | e03663207468849b1d7dafb48b70da43b149367d | |
| parent | ddca2ed252dc0b2f3c72d388dac663d9e3c8e904 (diff) | |
| parent | 16589e33149d7cdd9a4cb0405eee0f3889a3139a (diff) | |
Merge 16589e33149d7cdd9a4cb0405eee0f3889a3139a on remote branch
Change-Id: I94d54c671ce28c787454e990084d59e2f126538d
| -rw-r--r-- | services/core/java/com/android/server/pm/InstallPackageHelper.java | 3 | ||||
| -rw-r--r-- | telephony/java/android/telephony/data/DataProfile.java | 2 |
2 files changed, 3 insertions, 2 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; diff --git a/telephony/java/android/telephony/data/DataProfile.java b/telephony/java/android/telephony/data/DataProfile.java index 5e111639b100..f346b9208bcd 100644 --- a/telephony/java/android/telephony/data/DataProfile.java +++ b/telephony/java/android/telephony/data/DataProfile.java @@ -147,7 +147,7 @@ public final class DataProfile implements Parcelable { if (mApnSetting != null) { return mApnSetting.getProtocol(); } - return ApnSetting.PROTOCOL_IP; + return ApnSetting.PROTOCOL_IPV4V6; } /** |