mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-09-27 11:41:04 -04:00
14/19/20: November 2024 ASB Picks
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi
parent
5a8d90d2b1
commit
a245234db2
10 changed files with 223 additions and 5 deletions
48
Patches/LineageOS-14.1/android_external_skia/407794.patch
Normal file
48
Patches/LineageOS-14.1/android_external_skia/407794.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
From 261d6dc3a3fd7b094928a00e8f413539ecda097a Mon Sep 17 00:00:00 2001
|
||||
From: Brian Osman <brianosman@google.com>
|
||||
Date: Tue, 27 Aug 2024 14:22:52 -0400
|
||||
Subject: [PATCH] RESTRICT AUTOMERGE: Avoid potential overflow when allocating
|
||||
3D mask from emboss filter
|
||||
|
||||
Note: the original fix landed after
|
||||
Iac8b937e516dbfbbcefef54360dd5b7300bacb67 introduced SkMaskBuilder, so
|
||||
this cherry-pick had to be tweaked to avoid conflicts. Unfortuantely
|
||||
that means we need RESTRICT AUTOMERGE to prevent this modified version
|
||||
from flowing through API boundaries into VIC, and we need to manually
|
||||
cherry-pick it to each API level.
|
||||
|
||||
Bug: 344620577
|
||||
Test: N/A -- unclear if even reachable
|
||||
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/893738
|
||||
Commit-Queue: Brian Osman <brianosman@google.com>
|
||||
Reviewed-by: Ben Wagner <bungeman@google.com>
|
||||
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2bc38734eec777bf2574d4b38a7fd4fc05f0ecde)
|
||||
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bd6b1b730157b35457c9dbdb3bbf15ede15f6ba7)
|
||||
Merged-In: Ia35860371d45120baca63238e77faa5c0eb25d51
|
||||
Change-Id: Ia35860371d45120baca63238e77faa5c0eb25d51
|
||||
---
|
||||
src/effects/SkEmbossMaskFilter.cpp | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp
|
||||
index 64afa49447d..f0e97dd1d37 100644
|
||||
--- a/src/effects/SkEmbossMaskFilter.cpp
|
||||
+++ b/src/effects/SkEmbossMaskFilter.cpp
|
||||
@@ -95,11 +95,13 @@ bool SkEmbossMaskFilter::filterMask(SkMask* dst, const SkMask& src,
|
||||
|
||||
{
|
||||
uint8_t* alphaPlane = dst->fImage;
|
||||
- size_t planeSize = dst->computeImageSize();
|
||||
- if (0 == planeSize) {
|
||||
- return false; // too big to allocate, abort
|
||||
+ size_t totalSize = dst->computeTotalImageSize();
|
||||
+ if (totalSize == 0) {
|
||||
+ return false; // too big to allocate, abort
|
||||
}
|
||||
- dst->fImage = SkMask::AllocImage(planeSize * 3);
|
||||
+ size_t planeSize = dst->computeImageSize();
|
||||
+ SkASSERT(planeSize != 0); // if totalSize didn't overflow, this can't either
|
||||
+ dst->fImage = SkMask::AllocImage(totalSize);
|
||||
memcpy(dst->fImage, alphaPlane, planeSize);
|
||||
SkMask::FreeImage(alphaPlane);
|
||||
}
|
||||
37
Patches/LineageOS-14.1/android_frameworks_base/407791.patch
Normal file
37
Patches/LineageOS-14.1/android_frameworks_base/407791.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
From 90cdc60d6b846c5f07556e350c108b937c809fd6 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Dementyev <dementyev@google.com>
|
||||
Date: Tue, 2 Jul 2024 11:02:07 -0700
|
||||
Subject: [PATCH] [BACKPORT] Remove authenticator data if it was disabled.
|
||||
|
||||
Test: manual
|
||||
Bug: 343440463
|
||||
Flag: EXEMPT bugfix
|
||||
(cherry picked from commit ddfc078af7e89641360b896f99af23a6b371b847)
|
||||
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cd372149336675c82e032fe2613d1dc8b03122f6)
|
||||
Merged-In: I36bd6bf101da03c9c30a6d3c0080b801e7898bc6
|
||||
Change-Id: I36bd6bf101da03c9c30a6d3c0080b801e7898bc6
|
||||
---
|
||||
.../android/server/accounts/AccountManagerService.java | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||||
index 126955add01a9..9e8f1708b8520 100644
|
||||
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||||
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||||
@@ -633,6 +633,16 @@ private void validateAccountsInternal(
|
||||
META_KEY_FOR_AUTHENTICATOR_UID_FOR_TYPE_PREFIX + type,
|
||||
uid}
|
||||
);
|
||||
+ } else if (knownUid != null && !uid.equals(knownUid.toString())) {
|
||||
+ Slog.w(TAG, "authenticator no longer exist for type " + type);
|
||||
+ obsoleteAuthType.add(type);
|
||||
+ db.delete(
|
||||
+ TABLE_META,
|
||||
+ META_KEY + "=? AND " + META_VALUE + "=?",
|
||||
+ new String[] {
|
||||
+ META_KEY_FOR_AUTHENTICATOR_UID_FOR_TYPE_PREFIX + type,
|
||||
+ uid}
|
||||
+ );
|
||||
}
|
||||
}
|
||||
}
|
||||
84
Patches/LineageOS-14.1/android_frameworks_base/407792.patch
Normal file
84
Patches/LineageOS-14.1/android_frameworks_base/407792.patch
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
From 4f133c1c3c9b219d070046e575cc3a8074788cef Mon Sep 17 00:00:00 2001
|
||||
From: Ben Murdoch <benm@google.com>
|
||||
Date: Fri, 30 Aug 2024 17:22:59 +0000
|
||||
Subject: [PATCH] RESTRICT AUTOMERGE Clear app-provided shortcut icons
|
||||
|
||||
When displaying keyboard shortcuts provided by an app, clear
|
||||
any icon that may have been set (this is only possible via
|
||||
reflection, and is not a intended for usage outside of the system).
|
||||
|
||||
Bug: 331180422
|
||||
Test: Verify on device
|
||||
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8dc5ed150f2c0e08870f656f3170f304ba9ad260)
|
||||
Merged-In: If7e291eb2254c3cbec23673c65e7477e6ad45b09
|
||||
Change-Id: If7e291eb2254c3cbec23673c65e7477e6ad45b09
|
||||
|
||||
Change-Id: I03cd38e124f393f950c520f8aa9619c42a755ebb
|
||||
---
|
||||
core/java/android/view/KeyboardShortcutInfo.java | 13 +++++++++++--
|
||||
.../systemui/statusbar/KeyboardShortcuts.java | 9 +++++++++
|
||||
2 files changed, 20 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/core/java/android/view/KeyboardShortcutInfo.java b/core/java/android/view/KeyboardShortcutInfo.java
|
||||
index a9f2699a6bb16..b3965fde115b3 100644
|
||||
--- a/core/java/android/view/KeyboardShortcutInfo.java
|
||||
+++ b/core/java/android/view/KeyboardShortcutInfo.java
|
||||
@@ -28,7 +28,7 @@
|
||||
*/
|
||||
public final class KeyboardShortcutInfo implements Parcelable {
|
||||
private final CharSequence mLabel;
|
||||
- private final Icon mIcon;
|
||||
+ private Icon mIcon;
|
||||
private final char mBaseCharacter;
|
||||
private final int mKeycode;
|
||||
private final int mModifiers;
|
||||
@@ -114,6 +114,15 @@ public Icon getIcon() {
|
||||
return mIcon;
|
||||
}
|
||||
|
||||
+ /**
|
||||
+ * Removes an icon that was previously set.
|
||||
+ *
|
||||
+ * @hide
|
||||
+ */
|
||||
+ public void clearIcon() {
|
||||
+ mIcon = null;
|
||||
+ }
|
||||
+
|
||||
/**
|
||||
* Returns the base keycode that, combined with the modifiers, triggers this shortcut. If the
|
||||
* base character was set instead, returns {@link KeyEvent#KEYCODE_UNKNOWN}. Valid keycodes are
|
||||
@@ -164,4 +173,4 @@ public KeyboardShortcutInfo[] newArray(int size) {
|
||||
return new KeyboardShortcutInfo[size];
|
||||
}
|
||||
};
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
|
||||
index 9972d0d52b05d..c3028659cdf1f 100644
|
||||
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
|
||||
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
|
||||
@@ -362,6 +362,7 @@ private void showKeyboardShortcuts(int deviceId) {
|
||||
@Override
|
||||
public void onKeyboardShortcutsReceived(
|
||||
final List<KeyboardShortcutGroup> result) {
|
||||
+ sanitiseShortcuts(result);
|
||||
result.add(getSystemShortcuts());
|
||||
final KeyboardShortcutGroup appShortcuts = getDefaultApplicationShortcuts();
|
||||
if (appShortcuts != null) {
|
||||
@@ -372,6 +373,14 @@ public void onKeyboardShortcutsReceived(
|
||||
}, deviceId);
|
||||
}
|
||||
|
||||
+ static void sanitiseShortcuts(List<KeyboardShortcutGroup> shortcutGroups) {
|
||||
+ for (KeyboardShortcutGroup group : shortcutGroups) {
|
||||
+ for (KeyboardShortcutInfo info : group.getItems()) {
|
||||
+ info.clearIcon();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
private void dismissKeyboardShortcuts() {
|
||||
if (mKeyboardShortcutsDialog != null) {
|
||||
mKeyboardShortcutsDialog.dismiss();
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
From 26cf73176cdffde0864cf87b9656afcc1fb8ba13 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Bookatz <bookatz@google.com>
|
||||
Date: Mon, 22 Jul 2024 17:03:12 -0700
|
||||
Subject: [PATCH] startActivityForResult with new Intent
|
||||
|
||||
Rather than use the raw Intent, we make a copy of it. See bug.
|
||||
|
||||
Bug: 330722900
|
||||
Flag: EXEMPT bugfix
|
||||
Test: manual
|
||||
Test: atest com.android.settings.users.UserSettingsTest
|
||||
com.android.settings.users.UserDetailsSettingsTest
|
||||
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1189e24e47571eae86634aeaa7dc60b8fe7f4820)
|
||||
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:73210aa26773ae91f23361f51eb00399643726a8)
|
||||
Merged-In: Id74e4b7ae261f2916eedaef04a679f83409a4b67
|
||||
Change-Id: Id74e4b7ae261f2916eedaef04a679f83409a4b67
|
||||
---
|
||||
src/com/android/settings/users/AppRestrictionsFragment.java | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
|
||||
index f72bf9e97bf..9971d103fe2 100644
|
||||
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
|
||||
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
|
||||
@@ -638,7 +638,7 @@ public void onReceive(Context context, Intent intent) {
|
||||
int requestCode = generateCustomActivityRequestCode(
|
||||
RestrictionsResultReceiver.this.preference);
|
||||
AppRestrictionsFragment.this.startActivityForResult(
|
||||
- restrictionsIntent, requestCode);
|
||||
+ new Intent(restrictionsIntent), requestCode);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 9ed056697c2f924eaf069f6e72b3a978f0a458db
|
||||
Subproject commit ee95ec7291d107f711e19226c350daa0118767f0
|
||||
Loading…
Add table
Add a link
Reference in a new issue