Changes for October 2023
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 1891dacd48c4d502666fb4468582c088e4c0c097 Mon Sep 17 00:00:00 2001
|
||||
From 5cd85c5a58621bd1365a22f7dad6f3d8ede2c194 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 25 Oct 2020 23:57:26 +0100
|
||||
Subject: [PATCH 1/3] Re-implement fnmatch-like behaviour for RRO java-side
|
||||
@@ -12,10 +12,10 @@ Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
|
||||
2 files changed, 22 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
|
||||
index 995092117f4d..28efda00393d 100644
|
||||
index c01e30ded50e..db6a36ee1b66 100644
|
||||
--- a/core/java/android/content/pm/PackageParser.java
|
||||
+++ b/core/java/android/content/pm/PackageParser.java
|
||||
@@ -2544,8 +2544,17 @@ public class PackageParser {
|
||||
@@ -2554,8 +2554,17 @@ public class PackageParser {
|
||||
for (int i = 0; i < propNames.length; i++) {
|
||||
// Check property value: make sure it is both set and equal to expected value
|
||||
final String currValue = SystemProperties.get(propNames[i]);
|
||||
@@ -36,14 +36,14 @@ index 995092117f4d..28efda00393d 100644
|
||||
}
|
||||
return true;
|
||||
diff --git a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
|
||||
index 3e1c5bb3d7ec..8182e9e0c771 100644
|
||||
index b75ba82ad091..b344f7232190 100644
|
||||
--- a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
|
||||
+++ b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
|
||||
@@ -215,8 +215,17 @@ public class FrameworkParsingPackageUtils {
|
||||
for (int i = 0; i < propNames.length; i++) {
|
||||
// Check property value: make sure it is both set and equal to expected value
|
||||
final String currValue = SystemProperties.get(propNames[i]);
|
||||
- if (!TextUtils.equals(currValue, propValues[i])) {
|
||||
@@ -223,8 +223,17 @@ public class FrameworkParsingPackageUtils {
|
||||
continue;
|
||||
}
|
||||
// 3. Check if prop is equal to expected value.
|
||||
- if (!currValue.equals(propValues[i])) {
|
||||
- return false;
|
||||
+ final String value = propValues[i];
|
||||
+ if(value.startsWith("+")) {
|
||||
@@ -60,5 +60,5 @@ index 3e1c5bb3d7ec..8182e9e0c771 100644
|
||||
}
|
||||
return true;
|
||||
--
|
||||
2.25.1
|
||||
2.34.1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b0333760d4370e63470fc61bece55e29f16a9eaf Mon Sep 17 00:00:00 2001
|
||||
From eca6f07922f3804f6f1844f067941fc8097459c5 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 24 Mar 2018 08:01:48 +0100
|
||||
Subject: [PATCH 2/3] LightsService: Alternative backlight scale
|
||||
@@ -42,5 +42,5 @@ index fea6b29d9260..2a9a3b63ea2e 100644
|
||||
color = 0xff000000 | (color << 16) | (color << 8) | color;
|
||||
setLightLocked(color, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
|
||||
--
|
||||
2.25.1
|
||||
2.34.1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From f962ed979393abb8297e790b452739a8eec9c76c Mon Sep 17 00:00:00 2001
|
||||
From 2bee84fb2e576ffb56d8ad428ba180aee67d2d8c Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Sat, 15 Oct 2022 09:33:56 +0000
|
||||
Subject: [PATCH 3/3] Revert "Remove more FDE methods from StorageManager"
|
||||
@@ -10,7 +10,7 @@ This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676.
|
||||
2 files changed, 65 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
|
||||
index 497bfa6380bc..646a7095c1b3 100644
|
||||
index d9604b3f0145..603612e82007 100644
|
||||
--- a/core/java/android/os/storage/StorageManager.java
|
||||
+++ b/core/java/android/os/storage/StorageManager.java
|
||||
@@ -1681,13 +1681,18 @@ public class StorageManager {
|
||||
@@ -104,10 +104,10 @@ index 497bfa6380bc..646a7095c1b3 100644
|
||||
public static boolean isFileEncryptedEmulatedOnly() {
|
||||
return SystemProperties.getBoolean(StorageManager.PROP_EMULATE_FBE, false);
|
||||
diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java
|
||||
index 98d81c9598b8..8b659f927633 100644
|
||||
index cccd80e82420..adb5c107bc62 100644
|
||||
--- a/core/java/com/android/internal/os/RoSystemProperties.java
|
||||
+++ b/core/java/com/android/internal/os/RoSystemProperties.java
|
||||
@@ -60,10 +60,14 @@ public class RoSystemProperties {
|
||||
@@ -62,10 +62,14 @@ public class RoSystemProperties {
|
||||
public static final CryptoProperties.type_values CRYPTO_TYPE =
|
||||
CryptoProperties.type().orElse(CryptoProperties.type_values.NONE);
|
||||
// These are pseudo-properties
|
||||
@@ -123,5 +123,5 @@ index 98d81c9598b8..8b659f927633 100644
|
||||
public static final boolean CONTROL_PRIVAPP_PERMISSIONS_LOG =
|
||||
"log".equalsIgnoreCase(CONTROL_PRIVAPP_PERMISSIONS);
|
||||
--
|
||||
2.25.1
|
||||
2.34.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user