- Revert Freetype branch switching for 15.1+, broken
- Don't include OpenEUICC on Pixel 2 and 3 series, they won't work
- Churn

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-08-24 01:17:08 -04:00
parent 1fde0f9c45
commit 52a0c55c41
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
11 changed files with 29 additions and 37 deletions

View file

@ -1,4 +1,4 @@
From a7a13d846ec35cbab5acbac9580679eb1878be8f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: syphyr <syphyr@gmail.com>
Date: Mon, 13 Jun 2022 20:18:46 +0200
Subject: [PATCH] Backport Makefile for Nougat

View file

@ -1,4 +1,4 @@
From 4cbccba5585d15b6763fe581e58ce953fbfd0a6a Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: syphyr <syphyr@gmail.com>
Date: Tue, 8 Aug 2023 23:58:29 +0200
Subject: [PATCH] Add Android.mk for legacy builds

View file

@ -15,8 +15,8 @@ Change-Id: Iac6baa889965b8ffecd9a43179a4c96632ad1d02
---
core/java/android/app/ActivityManager.java | 3 ++
core/res/AndroidManifest.xml | 6 +++-
.../server/am/ActivityManagerService.java | 33 +++++++++++++++++--
3 files changed, 39 insertions(+), 3 deletions(-)
.../server/am/ActivityManagerService.java | 32 +++++++++++++++++--
3 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index da7d711194de..9f6e25c74386 100644
@ -33,6 +33,7 @@ index da7d711194de..9f6e25c74386 100644
* {@link android.Manifest.permission#KILL_BACKGROUND_PROCESSES} to be able to
* call this method.
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0f224dae3337..ef6ce2503061 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1741,7 +1741,11 @@
@ -49,6 +50,7 @@ diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-->
<permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 8f26804d51bd..a96ad5e24399 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5819,8 +5819,20 @@ public final class ActivityManagerService extends ActivityManagerNative