From 470bb1c6cdf79180d7c36916f696d423988a5291 Mon Sep 17 00:00:00 2001 From: Tavi Date: Wed, 4 Sep 2024 12:51:48 -0400 Subject: [PATCH] Fixup dirty patch Signed-off-by: Tavi --- .../android_frameworks_base/399737.patch | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/Patches/LineageOS-18.1/android_frameworks_base/399737.patch b/Patches/LineageOS-18.1/android_frameworks_base/399737.patch index 7e4c6f70..7669480f 100644 --- a/Patches/LineageOS-18.1/android_frameworks_base/399737.patch +++ b/Patches/LineageOS-18.1/android_frameworks_base/399737.patch @@ -10,11 +10,9 @@ Merged-In: I96370cbd4f6a55f894c1a93307e5f82dfd394652 Change-Id: I96370cbd4f6a55f894c1a93307e5f82dfd394652 --- .../android/server/pm/ShortcutPackage.java | 35 +++++++++++++++++++ - .../server/pm/ShortcutPackage.java.rej | 16 +++++++++ .../android/server/pm/ShortcutService.java | 12 +++---- .../server/pm/ShortcutManagerTest2.java | 2 ++ - 4 files changed, 57 insertions(+), 8 deletions(-) - create mode 100644 services/core/java/com/android/server/pm/ShortcutPackage.java.rej + 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index 4bc3cdb730a3..dabbf375a5e2 100644 @@ -97,28 +95,6 @@ index 4bc3cdb730a3..dabbf375a5e2 100644 public void dump(@NonNull PrintWriter pw, @NonNull String prefix, DumpFilter filter) { pw.println(); -diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java.rej b/services/core/java/com/android/server/pm/ShortcutPackage.java.rej -new file mode 100644 -index 000000000000..fee101cb86a7 ---- /dev/null -+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java.rej -@@ -0,0 +1,16 @@ -+diff a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java (rejected hunks) -+@@ -28,12 +29,14 @@ -+ import android.content.pm.ShortcutManager; -+ import android.content.res.Resources; -+ import android.os.PersistableBundle; -++import android.os.SystemClock; -+ import android.text.format.Formatter; -+ import android.util.ArrayMap; -+ import android.util.ArraySet; -+ import android.util.Log; -+ import android.util.Slog; -+ -++import com.android.internal.annotations.GuardedBy; -+ import com.android.internal.annotations.VisibleForTesting; -+ import com.android.internal.util.ArrayUtils; -+ import com.android.internal.util.Preconditions; diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index 2b00ab5d6669..3d1fce98307d 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java