Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixup dirty patch

Browse Source 
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-09-04 12:51:48 -04:00
parent 3f55f4df58
commit 470bb1c6cd
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Patches/LineageOS-18.1/android_frameworks_base/399737.patch
View File

@ -10,11 +10,9 @@ Merged-In: I96370cbd4f6a55f894c1a93307e5f82dfd394652
Change-Id: I96370cbd4f6a55f894c1a93307e5f82dfd394652 Change-Id: I96370cbd4f6a55f894c1a93307e5f82dfd394652
--- ---
.../android/server/pm/ShortcutPackage.java | 35 +++++++++++++++++++ .../android/server/pm/ShortcutPackage.java | 35 +++++++++++++++++++
.../server/pm/ShortcutPackage.java.rej | 16 +++++++++
.../android/server/pm/ShortcutService.java | 12 +++---- .../android/server/pm/ShortcutService.java | 12 +++----
.../server/pm/ShortcutManagerTest2.java | 2 ++ .../server/pm/ShortcutManagerTest2.java | 2 ++
4 files changed, 57 insertions(+), 8 deletions(-) 3 files changed, 41 insertions(+), 8 deletions(-)
create mode 100644 services/core/java/com/android/server/pm/ShortcutPackage.java.rej
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java 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 index 4bc3cdb730a3..dabbf375a5e2 100644
@ -97,28 +95,6 @@ index 4bc3cdb730a3..dabbf375a5e2 100644
public void dump(@NonNull PrintWriter pw, @NonNull String prefix, DumpFilter filter) { public void dump(@NonNull PrintWriter pw, @NonNull String prefix, DumpFilter filter) {
pw.println(); 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 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 index 2b00ab5d6669..3d1fce98307d 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java --- a/services/core/java/com/android/server/pm/ShortcutService.java