mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-24 06:59:27 -05:00
Churn
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
parent
4b0bf74d68
commit
c3555ebac2
@ -1,4 +1,4 @@
|
|||||||
From c68f62f62fc3ffe077098e45f26ffa2fb3300d6c Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Rakesh Kumar <rakesh.kumar@ittiam.com>
|
From: Rakesh Kumar <rakesh.kumar@ittiam.com>
|
||||||
Date: Thu, 30 May 2024 11:17:48 +0000
|
Date: Thu, 30 May 2024 11:17:48 +0000
|
||||||
Subject: [PATCH] StagefrightRecoder: Disabling B-frame support
|
Subject: [PATCH] StagefrightRecoder: Disabling B-frame support
|
||||||
@ -21,7 +21,7 @@ Change-Id: I4098655eb9687fb633085333bc140634441566e6
|
|||||||
1 file changed, 5 insertions(+)
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
|
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
|
||||||
index a7344de402b..c66def491b9 100644
|
index a7344de402..c66def491b 100644
|
||||||
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
|
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
|
||||||
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
|
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
|
||||||
@@ -1843,6 +1843,11 @@ status_t StagefrightRecorder::setupVideoEncoder(
|
@@ -1843,6 +1843,11 @@ status_t StagefrightRecorder::setupVideoEncoder(
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From a8d8d9bb68570d395ddb20449ee466e2b468840c Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Pinyao Ting <pinyaoting@google.com>
|
From: Pinyao Ting <pinyaoting@google.com>
|
||||||
Date: Tue, 20 Jul 2021 00:01:29 +0000
|
Date: Tue, 20 Jul 2021 00:01:29 +0000
|
||||||
Subject: [PATCH] Prevend user spoofing in isRequestPinItemSupported
|
Subject: [PATCH] Prevend user spoofing in isRequestPinItemSupported
|
||||||
@ -19,10 +19,10 @@ Change-Id: Icab7cdf25b870b88ecfde9b99e107bbeda0eb485
|
|||||||
1 file changed, 15 insertions(+)
|
1 file changed, 15 insertions(+)
|
||||||
|
|
||||||
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 c18cdcb891409..f4c8127439181 100644
|
index 3d1fce98307d..001268066701 100644
|
||||||
--- a/services/core/java/com/android/server/pm/ShortcutService.java
|
--- a/services/core/java/com/android/server/pm/ShortcutService.java
|
||||||
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
|
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
|
||||||
@@ -1566,6 +1566,19 @@ void injectEnforceCallingPermission(
|
@@ -1614,6 +1614,19 @@ public class ShortcutService extends IShortcutService.Stub {
|
||||||
mContext.enforceCallingPermission(permission, message);
|
mContext.enforceCallingPermission(permission, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -42,7 +42,7 @@ index c18cdcb891409..f4c8127439181 100644
|
|||||||
private void verifyCaller(@NonNull String packageName, @UserIdInt int userId) {
|
private void verifyCaller(@NonNull String packageName, @UserIdInt int userId) {
|
||||||
Preconditions.checkStringNotEmpty(packageName, "packageName");
|
Preconditions.checkStringNotEmpty(packageName, "packageName");
|
||||||
|
|
||||||
@@ -2303,6 +2316,8 @@ public void reportShortcutUsed(String packageName, String shortcutId, int userId
|
@@ -2609,6 +2622,8 @@ public class ShortcutService extends IShortcutService.Stub {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isRequestPinItemSupported(int callingUserId, int requestType) {
|
public boolean isRequestPinItemSupported(int callingUserId, int requestType) {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From c7d4f0461aae8e8b2a65960ce8eb3ed8dc550c13 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Pinyao Ting <pinyaoting@google.com>
|
From: Pinyao Ting <pinyaoting@google.com>
|
||||||
Date: Thu, 30 Nov 2023 23:12:39 +0000
|
Date: Thu, 30 Nov 2023 23:12:39 +0000
|
||||||
Subject: [PATCH] Added throttle when reporting shortcut usage
|
Subject: [PATCH] Added throttle when reporting shortcut usage
|
||||||
@ -17,10 +17,10 @@ Change-Id: I96370cbd4f6a55f894c1a93307e5f82dfd394652
|
|||||||
create mode 100644 services/core/java/com/android/server/pm/ShortcutPackage.java.rej
|
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 4bc3cdb730a38..dabbf375a5e27 100644
|
index 4bc3cdb730a3..dabbf375a5e2 100644
|
||||||
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
|
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
|
||||||
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
|
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
|
||||||
@@ -19,6 +19,7 @@
|
@@ -19,6 +19,7 @@ import android.annotation.NonNull;
|
||||||
import android.annotation.Nullable;
|
import android.annotation.Nullable;
|
||||||
import android.annotation.UserIdInt;
|
import android.annotation.UserIdInt;
|
||||||
import android.app.Person;
|
import android.app.Person;
|
||||||
@ -28,7 +28,7 @@ index 4bc3cdb730a38..dabbf375a5e27 100644
|
|||||||
import android.content.ComponentName;
|
import android.content.ComponentName;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.IntentFilter;
|
import android.content.IntentFilter;
|
||||||
@@ -29,6 +30,7 @@
|
@@ -29,6 +30,7 @@ import android.content.pm.ShortcutManager;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.graphics.drawable.Icon;
|
import android.graphics.drawable.Icon;
|
||||||
import android.os.PersistableBundle;
|
import android.os.PersistableBundle;
|
||||||
@ -36,7 +36,7 @@ index 4bc3cdb730a38..dabbf375a5e27 100644
|
|||||||
import android.text.format.Formatter;
|
import android.text.format.Formatter;
|
||||||
import android.util.ArrayMap;
|
import android.util.ArrayMap;
|
||||||
import android.util.ArraySet;
|
import android.util.ArraySet;
|
||||||
@@ -37,6 +39,7 @@
|
@@ -37,6 +39,7 @@ import android.util.Log;
|
||||||
import android.util.Slog;
|
import android.util.Slog;
|
||||||
import android.util.Xml;
|
import android.util.Xml;
|
||||||
|
|
||||||
@ -66,7 +66,7 @@ index 4bc3cdb730a38..dabbf375a5e27 100644
|
|||||||
private ShortcutPackage(ShortcutUser shortcutUser,
|
private ShortcutPackage(ShortcutUser shortcutUser,
|
||||||
int packageUserId, String packageName, ShortcutPackageInfo spi) {
|
int packageUserId, String packageName, ShortcutPackageInfo spi) {
|
||||||
super(shortcutUser, packageUserId, packageName,
|
super(shortcutUser, packageUserId, packageName,
|
||||||
@@ -1545,6 +1556,30 @@ public boolean hasNonManifestShortcuts() {
|
@@ -1545,6 +1556,30 @@ class ShortcutPackage extends ShortcutPackageItem {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -99,7 +99,7 @@ index 4bc3cdb730a38..dabbf375a5e27 100644
|
|||||||
|
|
||||||
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java.rej b/services/core/java/com/android/server/pm/ShortcutPackage.java.rej
|
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
|
new file mode 100644
|
||||||
index 0000000000000..fee101cb86a7b
|
index 000000000000..fee101cb86a7
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java.rej
|
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java.rej
|
||||||
@@ -0,0 +1,16 @@
|
@@ -0,0 +1,16 @@
|
||||||
@ -120,10 +120,10 @@ index 0000000000000..fee101cb86a7b
|
|||||||
+ import com.android.internal.util.ArrayUtils;
|
+ import com.android.internal.util.ArrayUtils;
|
||||||
+ import com.android.internal.util.Preconditions;
|
+ 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 2b00ab5d66699..3d1fce98307d3 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
|
||||||
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
|
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
|
||||||
@@ -338,7 +338,7 @@ public boolean test(PackageInfo pi) {
|
@@ -338,7 +338,7 @@ public class ShortcutService extends IShortcutService.Stub {
|
||||||
private CompressFormat mIconPersistFormat;
|
private CompressFormat mIconPersistFormat;
|
||||||
private int mIconPersistQuality;
|
private int mIconPersistQuality;
|
||||||
|
|
||||||
@ -132,7 +132,7 @@ index 2b00ab5d66699..3d1fce98307d3 100644
|
|||||||
|
|
||||||
private final IPackageManager mIPackageManager;
|
private final IPackageManager mIPackageManager;
|
||||||
private final PackageManagerInternal mPackageManagerInternal;
|
private final PackageManagerInternal mPackageManagerInternal;
|
||||||
@@ -2591,10 +2591,11 @@ public void reportShortcutUsed(String packageName, String shortcutId, int userId
|
@@ -2591,10 +2591,11 @@ public class ShortcutService extends IShortcutService.Stub {
|
||||||
shortcutId, packageName, userId));
|
shortcutId, packageName, userId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -145,7 +145,7 @@ index 2b00ab5d66699..3d1fce98307d3 100644
|
|||||||
|
|
||||||
if (ps.findShortcutById(shortcutId) == null) {
|
if (ps.findShortcutById(shortcutId) == null) {
|
||||||
Log.w(TAG, String.format("reportShortcutUsed: package %s doesn't have shortcut %s",
|
Log.w(TAG, String.format("reportShortcutUsed: package %s doesn't have shortcut %s",
|
||||||
@@ -2603,12 +2604,7 @@ public void reportShortcutUsed(String packageName, String shortcutId, int userId
|
@@ -2603,12 +2604,7 @@ public class ShortcutService extends IShortcutService.Stub {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -160,10 +160,10 @@ index 2b00ab5d66699..3d1fce98307d3 100644
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
|
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
|
||||||
index 088d693205c2d..c509cb8baf0da 100644
|
index 088d693205c2..c509cb8baf0d 100644
|
||||||
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
|
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
|
||||||
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
|
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
|
||||||
@@ -2130,6 +2130,8 @@ public void testThrottling_resetByInternalCall() throws Exception {
|
@@ -2130,6 +2130,8 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest {
|
||||||
|
|
||||||
public void testReportShortcutUsed() {
|
public void testReportShortcutUsed() {
|
||||||
mRunningUsers.put(USER_10, true);
|
mRunningUsers.put(USER_10, true);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From d532c7c42dbb9298ac64d7f38d56214af754a336 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Nan Wu <wnan@google.com>
|
From: Nan Wu <wnan@google.com>
|
||||||
Date: Tue, 30 Apr 2024 17:20:29 +0000
|
Date: Tue, 30 Apr 2024 17:20:29 +0000
|
||||||
Subject: [PATCH] RESTRICT AUTOMERGE Backport preventing BAL bypass via bound
|
Subject: [PATCH] RESTRICT AUTOMERGE Backport preventing BAL bypass via bound
|
||||||
@ -20,10 +20,10 @@ Change-Id: Ib113e45aa18296b4475b90d6dcec5dd5664f4c80
|
|||||||
4 files changed, 7 insertions(+), 4 deletions(-)
|
4 files changed, 7 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java b/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java
|
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java b/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java
|
||||||
index 565ed959aeb4d..51ffc7f9379c7 100644
|
index 565ed959aeb4..51ffc7f9379c 100644
|
||||||
--- a/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java
|
--- a/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java
|
||||||
+++ b/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java
|
+++ b/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java
|
||||||
@@ -252,7 +252,7 @@ boolean executeRunnableJob(JobStatus job) {
|
@@ -252,7 +252,7 @@ public final class JobServiceContext implements ServiceConnection {
|
||||||
try {
|
try {
|
||||||
binding = mContext.bindServiceAsUser(intent, this,
|
binding = mContext.bindServiceAsUser(intent, this,
|
||||||
Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND
|
Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND
|
||||||
@ -33,7 +33,7 @@ index 565ed959aeb4d..51ffc7f9379c7 100644
|
|||||||
} catch (SecurityException e) {
|
} catch (SecurityException e) {
|
||||||
// Some permission policy, for example INTERACT_ACROSS_USERS and
|
// Some permission policy, for example INTERACT_ACROSS_USERS and
|
||||||
diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java
|
diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java
|
||||||
index ec12a971e445a..7ce6104262373 100644
|
index ec12a971e445..7ce610426237 100644
|
||||||
--- a/services/core/java/com/android/server/content/SyncManager.java
|
--- a/services/core/java/com/android/server/content/SyncManager.java
|
||||||
+++ b/services/core/java/com/android/server/content/SyncManager.java
|
+++ b/services/core/java/com/android/server/content/SyncManager.java
|
||||||
@@ -221,7 +221,8 @@ public class SyncManager {
|
@@ -221,7 +221,8 @@ public class SyncManager {
|
||||||
@ -47,10 +47,10 @@ index ec12a971e445a..7ce6104262373 100644
|
|||||||
/** Singleton instance. */
|
/** Singleton instance. */
|
||||||
@GuardedBy("SyncManager.class")
|
@GuardedBy("SyncManager.class")
|
||||||
diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
|
diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
|
||||||
index ab38dca2387d8..66502179ba895 100644
|
index ab38dca2387d..66502179ba89 100644
|
||||||
--- a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
|
--- a/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
|
||||||
+++ b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
|
+++ b/services/core/java/com/android/server/media/MediaRoute2ProviderServiceProxy.java
|
||||||
@@ -224,7 +224,8 @@ private void bind() {
|
@@ -224,7 +224,8 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider
|
||||||
service.setComponent(mComponentName);
|
service.setComponent(mComponentName);
|
||||||
try {
|
try {
|
||||||
mBound = mContext.bindServiceAsUser(service, this,
|
mBound = mContext.bindServiceAsUser(service, this,
|
||||||
@ -61,10 +61,10 @@ index ab38dca2387d8..66502179ba895 100644
|
|||||||
if (!mBound && DEBUG) {
|
if (!mBound && DEBUG) {
|
||||||
Slog.d(TAG, this + ": Bind failed");
|
Slog.d(TAG, this + ": Bind failed");
|
||||||
diff --git a/services/print/java/com/android/server/print/RemotePrintService.java b/services/print/java/com/android/server/print/RemotePrintService.java
|
diff --git a/services/print/java/com/android/server/print/RemotePrintService.java b/services/print/java/com/android/server/print/RemotePrintService.java
|
||||||
index 502cd2c60f4aa..702ddbb9f912a 100644
|
index 502cd2c60f4a..702ddbb9f912 100644
|
||||||
--- a/services/print/java/com/android/server/print/RemotePrintService.java
|
--- a/services/print/java/com/android/server/print/RemotePrintService.java
|
||||||
+++ b/services/print/java/com/android/server/print/RemotePrintService.java
|
+++ b/services/print/java/com/android/server/print/RemotePrintService.java
|
||||||
@@ -572,7 +572,8 @@ private void ensureBound() {
|
@@ -572,7 +572,8 @@ final class RemotePrintService implements DeathRecipient {
|
||||||
|
|
||||||
boolean wasBound = mContext.bindServiceAsUser(mIntent, mServiceConnection,
|
boolean wasBound = mContext.bindServiceAsUser(mIntent, mServiceConnection,
|
||||||
Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE
|
Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 45ee08b07a12600ead2f3a789d60094c9d886fb8 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Kiran S <krns@google.com>
|
From: Kiran S <krns@google.com>
|
||||||
Date: Mon, 13 May 2024 05:49:06 +0000
|
Date: Mon, 13 May 2024 05:49:06 +0000
|
||||||
Subject: [PATCH] Restrict USB poups while setup is in progress
|
Subject: [PATCH] Restrict USB poups while setup is in progress
|
||||||
@ -14,7 +14,7 @@ Change-Id: I7d54534696fd73f3b94c5b4250142eed9341c5d8
|
|||||||
1 file changed, 21 insertions(+)
|
1 file changed, 21 insertions(+)
|
||||||
|
|
||||||
diff --git a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
|
diff --git a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
|
||||||
index d7b6b5d0d36a2..de49091759df3 100644
|
index d7b6b5d0d36a..de49091759df 100644
|
||||||
--- a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
|
--- a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
|
||||||
+++ b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
|
+++ b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
|
||||||
@@ -16,6 +16,8 @@
|
@@ -16,6 +16,8 @@
|
||||||
@ -26,7 +26,7 @@ index d7b6b5d0d36a2..de49091759df3 100644
|
|||||||
import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE;
|
import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE;
|
||||||
|
|
||||||
import android.annotation.NonNull;
|
import android.annotation.NonNull;
|
||||||
@@ -42,6 +44,7 @@
|
@@ -42,6 +44,7 @@ import android.os.AsyncTask;
|
||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
@ -34,7 +34,7 @@ index d7b6b5d0d36a2..de49091759df3 100644
|
|||||||
import android.service.usb.UsbProfileGroupSettingsManagerProto;
|
import android.service.usb.UsbProfileGroupSettingsManagerProto;
|
||||||
import android.service.usb.UsbSettingsAccessoryPreferenceProto;
|
import android.service.usb.UsbSettingsAccessoryPreferenceProto;
|
||||||
import android.service.usb.UsbSettingsDevicePreferenceProto;
|
import android.service.usb.UsbSettingsDevicePreferenceProto;
|
||||||
@@ -900,10 +903,28 @@ private void resolveActivity(Intent intent, UsbDevice device, boolean showMtpNot
|
@@ -900,10 +903,28 @@ class UsbProfileGroupSettingsManager {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 644e95940f57497b7dd155d42f6b0bf42b5540b3 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Linus Tufvesson <lus@google.com>
|
From: Linus Tufvesson <lus@google.com>
|
||||||
Date: Mon, 29 Apr 2024 16:32:15 +0200
|
Date: Mon, 29 Apr 2024 16:32:15 +0200
|
||||||
Subject: [PATCH] Hide SAW subwindows
|
Subject: [PATCH] Hide SAW subwindows
|
||||||
@ -17,10 +17,10 @@ Change-Id: If19240f5aec2e048de80d75cbbdc00be47622d7f
|
|||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
|
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
|
||||||
index 319b7e88258db..12c301b300d69 100644
|
index 319b7e88258d..12c301b300d6 100644
|
||||||
--- a/services/core/java/com/android/server/wm/WindowState.java
|
--- a/services/core/java/com/android/server/wm/WindowState.java
|
||||||
+++ b/services/core/java/com/android/server/wm/WindowState.java
|
+++ b/services/core/java/com/android/server/wm/WindowState.java
|
||||||
@@ -3041,8 +3041,9 @@ boolean hideLw(boolean doAnimation, boolean requestAnim) {
|
@@ -3041,8 +3041,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
|
||||||
}
|
}
|
||||||
|
|
||||||
void setForceHideNonSystemOverlayWindowIfNeeded(boolean forceHide) {
|
void setForceHideNonSystemOverlayWindowIfNeeded(boolean forceHide) {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 2c0deba7d780ae11d16fc675fc6aa9abba344fd7 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Brian Delwiche <delwiche@google.com>
|
From: Brian Delwiche <delwiche@google.com>
|
||||||
Date: Mon, 22 Apr 2024 16:43:29 +0000
|
Date: Mon, 22 Apr 2024 16:43:29 +0000
|
||||||
Subject: [PATCH] Fix heap-buffer overflow in sdp_utils.cc
|
Subject: [PATCH] Fix heap-buffer overflow in sdp_utils.cc
|
||||||
@ -24,7 +24,7 @@ Change-Id: Ib536cbeac454efbf6af3d713c05c8e3e077e069b
|
|||||||
1 file changed, 22 insertions(+), 2 deletions(-)
|
1 file changed, 22 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/stack/sdp/sdp_utils.cc b/stack/sdp/sdp_utils.cc
|
diff --git a/stack/sdp/sdp_utils.cc b/stack/sdp/sdp_utils.cc
|
||||||
index f8cde2c34c5..9581dc72a77 100644
|
index f8cde2c34..9581dc72a 100644
|
||||||
--- a/stack/sdp/sdp_utils.cc
|
--- a/stack/sdp/sdp_utils.cc
|
||||||
+++ b/stack/sdp/sdp_utils.cc
|
+++ b/stack/sdp/sdp_utils.cc
|
||||||
@@ -949,8 +949,28 @@ bool sdpu_compare_uuid_arrays(uint8_t* p_uuid1, uint32_t len1, uint8_t* p_uuid2,
|
@@ -949,8 +949,28 @@ bool sdpu_compare_uuid_arrays(uint8_t* p_uuid1, uint32_t len1, uint8_t* p_uuid2,
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From f33554bf3b2998d04a78d19c46d9db26f2d27478 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Brian Delwiche <delwiche@google.com>
|
From: Brian Delwiche <delwiche@google.com>
|
||||||
Date: Mon, 22 Apr 2024 16:43:29 +0000
|
Date: Mon, 22 Apr 2024 16:43:29 +0000
|
||||||
Subject: [PATCH] Fix heap-buffer overflow in sdp_utils.cc
|
Subject: [PATCH] Fix heap-buffer overflow in sdp_utils.cc
|
||||||
|
Loading…
Reference in New Issue
Block a user