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

Updates, logging, and churn

Browse Source 
also add an extra March ASB patch for 17.1

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-03-31 11:21:35 -04:00
parent ca93ef33ce
commit 750f244304
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
31 changed files with 13678 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1347
Logs/patchWorkspace-LineageOS-14.1.log Normal file
View File

File diff suppressed because it is too large Load Diff

1349
Logs/patchWorkspace-LineageOS-15.1.log Normal file
View File

File diff suppressed because it is too large Load Diff

2888
Logs/patchWorkspace-LineageOS-16.0.log Normal file
View File

File diff suppressed because it is too large Load Diff

1536
Logs/patchWorkspace-LineageOS-17.1.log Normal file
View File

File diff suppressed because it is too large Load Diff

2029
Logs/patchWorkspace-LineageOS-18.1.log Normal file
View File

File diff suppressed because it is too large Load Diff

1848
Logs/patchWorkspace-LineageOS-19.1.log Normal file
View File

File diff suppressed because it is too large Load Diff

2535
Logs/patchWorkspace-LineageOS-20.0.log Normal file
View File

File diff suppressed because it is too large Load Diff

6
Patches/LineageOS-14.1/android_frameworks_base/352086.patch
View File

@ -1,4 +1,4 @@
From 5d17459a966adff163bad35c2bd07168767110dc Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nate Myren <ntmyren@google.com> From: Nate Myren <ntmyren@google.com>
Date: Fri, 2 Dec 2022 09:44:31 -0800 Date: Fri, 2 Dec 2022 09:44:31 -0800
Subject: [PATCH] RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to Subject: [PATCH] RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to
@ -18,10 +18,10 @@ Merged-In: I214396f455c5ed9e8bac2e50b1525b86475c81c7
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 915c40e5400e8..ebacb3c2c8950 100644 index 1e439c423a67..8920ca3ea50c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java --- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -10573,8 +10573,8 @@ && isSystemApp(pkg)) { @@ -10573,8 +10573,8 @@ public class PackageManagerService extends IPackageManager.Stub {
// Any pre-installed system app is allowed to get this permission. // Any pre-installed system app is allowed to get this permission.
allowed = true; allowed = true;
} }

6
Patches/LineageOS-15.1/android_frameworks_base/352086.patch
View File

@ -1,4 +1,4 @@
From 5d17459a966adff163bad35c2bd07168767110dc Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nate Myren <ntmyren@google.com> From: Nate Myren <ntmyren@google.com>
Date: Fri, 2 Dec 2022 09:44:31 -0800 Date: Fri, 2 Dec 2022 09:44:31 -0800
Subject: [PATCH] RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to Subject: [PATCH] RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to
@ -18,10 +18,10 @@ Merged-In: I214396f455c5ed9e8bac2e50b1525b86475c81c7
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 915c40e5400e8..ebacb3c2c8950 100644 index 9c59ecddee96..682dc46e5713 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java --- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -10573,8 +10573,8 @@ && isSystemApp(pkg)) { @@ -13737,8 +13737,8 @@ public class PackageManagerService extends IPackageManager.Stub
// Any pre-installed system app is allowed to get this permission. // Any pre-installed system app is allowed to get this permission.
allowed = true; allowed = true;
} }

22
Patches/LineageOS-17.1/android_frameworks_base/352555.patch
View File

@ -1,4 +1,4 @@
From ddd21af86421d0ef013ccc992bbbe3bd1a8b62ce Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexander Grund <flamefire89@gmail.com> From: Alexander Grund <flamefire89@gmail.com>
Date: Sun, 26 Mar 2023 17:36:03 +0200 Date: Sun, 26 Mar 2023 17:36:03 +0200
Subject: [PATCH] Revert "[RESTRICT AUTOMERGE] Trim the activity info of Subject: [PATCH] Revert "[RESTRICT AUTOMERGE] Trim the activity info of
@ -20,10 +20,10 @@ Merged-In: I078080b14b7cf7c6e605739f22f40f86802d3950
4 files changed, 5 insertions(+), 47 deletions(-) 4 files changed, 5 insertions(+), 47 deletions(-)
diff --git a/services/core/java/com/android/server/wm/AppTaskImpl.java b/services/core/java/com/android/server/wm/AppTaskImpl.java diff --git a/services/core/java/com/android/server/wm/AppTaskImpl.java b/services/core/java/com/android/server/wm/AppTaskImpl.java
index 900b59e0a8a2d..1eb7455135c78 100644 index 900b59e0a8a2..1eb7455135c7 100644
--- a/services/core/java/com/android/server/wm/AppTaskImpl.java --- a/services/core/java/com/android/server/wm/AppTaskImpl.java
+++ b/services/core/java/com/android/server/wm/AppTaskImpl.java +++ b/services/core/java/com/android/server/wm/AppTaskImpl.java
@@ -84,8 +84,7 @@ public ActivityManager.RecentTaskInfo getTaskInfo() { @@ -84,8 +84,7 @@ class AppTaskImpl extends IAppTask.Stub {
if (tr == null) { if (tr == null) {
throw new IllegalArgumentException("Unable to find task ID " + mTaskId); throw new IllegalArgumentException("Unable to find task ID " + mTaskId);
} }
@ -34,10 +34,10 @@ index 900b59e0a8a2d..1eb7455135c78 100644
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);
} }
diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java
index 56367f42886d6..541a8bbc88656 100644 index 56367f42886d..541a8bbc8865 100644
--- a/services/core/java/com/android/server/wm/RecentTasks.java --- a/services/core/java/com/android/server/wm/RecentTasks.java
+++ b/services/core/java/com/android/server/wm/RecentTasks.java +++ b/services/core/java/com/android/server/wm/RecentTasks.java
@@ -944,7 +944,7 @@ private ArrayList<ActivityManager.RecentTaskInfo> getRecentTasksImpl(int maxNum, @@ -944,7 +944,7 @@ class RecentTasks {
continue; continue;
} }
@ -46,7 +46,7 @@ index 56367f42886d6..541a8bbc88656 100644
if (!getDetailedTasks) { if (!getDetailedTasks) {
rti.baseIntent.replaceExtras((Bundle) null); rti.baseIntent.replaceExtras((Bundle) null);
} }
@@ -1715,15 +1715,12 @@ void dump(PrintWriter pw, boolean dumpAll, String dumpPackage) { @@ -1715,15 +1715,12 @@ class RecentTasks {
/** /**
* Creates a new RecentTaskInfo from a TaskRecord. * Creates a new RecentTaskInfo from a TaskRecord.
*/ */
@ -64,10 +64,10 @@ index 56367f42886d6..541a8bbc88656 100644
} }
diff --git a/services/core/java/com/android/server/wm/RunningTasks.java b/services/core/java/com/android/server/wm/RunningTasks.java diff --git a/services/core/java/com/android/server/wm/RunningTasks.java b/services/core/java/com/android/server/wm/RunningTasks.java
index 3c2e36cf245de..81a85476c53a4 100644 index 3c2e36cf245d..81a85476c53a 100644
--- a/services/core/java/com/android/server/wm/RunningTasks.java --- a/services/core/java/com/android/server/wm/RunningTasks.java
+++ b/services/core/java/com/android/server/wm/RunningTasks.java +++ b/services/core/java/com/android/server/wm/RunningTasks.java
@@ -69,7 +69,7 @@ void getTasks(int maxNum, List<RunningTaskInfo> list, @ActivityType int ignoreAc @@ -69,7 +69,7 @@ class RunningTasks {
} }
final TaskRecord task = iter.next(); final TaskRecord task = iter.next();
@ -76,7 +76,7 @@ index 3c2e36cf245de..81a85476c53a4 100644
maxNum--; maxNum--;
} }
} }
@@ -77,15 +77,11 @@ void getTasks(int maxNum, List<RunningTaskInfo> list, @ActivityType int ignoreAc @@ -77,15 +77,11 @@ class RunningTasks {
/** /**
* Constructs a {@link RunningTaskInfo} from a given {@param task}. * Constructs a {@link RunningTaskInfo} from a given {@param task}.
*/ */
@ -94,10 +94,10 @@ index 3c2e36cf245de..81a85476c53a4 100644
} }
} }
diff --git a/services/core/java/com/android/server/wm/TaskRecord.java b/services/core/java/com/android/server/wm/TaskRecord.java diff --git a/services/core/java/com/android/server/wm/TaskRecord.java b/services/core/java/com/android/server/wm/TaskRecord.java
index 9de4c8121e4d0..361f66e3106ae 100644 index 9de4c8121e4d..361f66e3106a 100644
--- a/services/core/java/com/android/server/wm/TaskRecord.java --- a/services/core/java/com/android/server/wm/TaskRecord.java
+++ b/services/core/java/com/android/server/wm/TaskRecord.java +++ b/services/core/java/com/android/server/wm/TaskRecord.java
@@ -2436,40 +2436,6 @@ void fillTaskInfo(TaskInfo info) { @@ -2436,40 +2436,6 @@ class TaskRecord extends ConfigurationContainer {
info.configuration.setTo(getConfiguration()); info.configuration.setTo(getConfiguration());
} }

82
Patches/LineageOS-17.1/android_frameworks_base/353117.patch Normal file
View File

@ -0,0 +1,82 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Liahav Eitan <liahav@google.com>
Date: Tue, 11 Oct 2022 13:20:52 +0000
Subject: [PATCH] Fix sharing to another profile where an app has multiple
targets
Moves the fixUris call from onTargetSelected directly to the intent
launch to ensure the intent which is actually started is updated with
userId specific URIs.
This is a backport of ag/19657256 and ag/20063949.
Bug:242165528
Bug:244876518
Bug:242605257
Test: manually share image from personal profile to work gmail,
first with chat target then backing up and selecting the main target
Test: manually share image from work Photos app to personal WhatsApp's
frequent contact target.
Change-Id: Id815984e691bf962e19e30a54f7247d16060b3b8
Merged-In: Id815984e691bf962e19e30a54f7247d16060b3b8
Merged-In: Ib41c8a3c46afcc2d62a4c1a924212bcd98bcfbe4
Merged-In: Iabf5dcf2612fe718f2f0886e2e5e9b76f37af1e1
(cherry picked from commit f50ced5f1e619d7fa7858748d6a9dbe861354f04)
Merged-In: Id815984e691bf962e19e30a54f7247d16060b3b8
(cherry picked from commit 0b4cfaca78dfadd546adc47cbcbcdde5425cf17a)
---
.../com/android/internal/app/ChooserActivity.java | 1 +
.../com/android/internal/app/ResolverActivity.java | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 4d71911921a8..f43ff17ed7d0 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -2455,6 +2455,7 @@ public class ChooserActivity extends ResolverActivity {
}
intent.setComponent(mChooserTarget.getComponentName());
intent.putExtras(mChooserTarget.getIntentExtras());
+ TargetInfo.prepareIntentForCrossProfileLaunch(intent, userId);
// Important: we will ignore the target security checks in ActivityManager
// if and only if the ChooserTarget's target package is the same package
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 070e3c101c8e..3de79838eaff 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -1514,6 +1514,7 @@ public class ResolverActivity extends Activity {
if (mEnableChooserDelegate) {
return activity.startAsCallerImpl(mResolvedIntent, options, false, userId);
} else {
+ TargetInfo.prepareIntentForCrossProfileLaunch(mResolvedIntent, userId);
activity.startActivityAsCaller(mResolvedIntent, options, null, false, userId);
return true;
}
@@ -1521,6 +1522,7 @@ public class ResolverActivity extends Activity {
@Override
public boolean startAsUser(Activity activity, Bundle options, UserHandle user) {
+ TargetInfo.prepareIntentForCrossProfileLaunch(mResolvedIntent, user.getIdentifier());
activity.startActivityAsUser(mResolvedIntent, options, user);
return false;
}
@@ -1642,6 +1644,17 @@ public class ResolverActivity extends Activity {
* @return true if this target should be pinned to the front by the request of the user
*/
boolean isPinned();
+
+ /**
+ * Fix the URIs in {@code intent} if cross-profile sharing is required. This should be called
+ * before launching the intent as another user.
+ */
+ static void prepareIntentForCrossProfileLaunch(Intent intent, int targetUserId) {
+ final int currentUserId = UserHandle.myUserId();
+ if (targetUserId != currentUserId) {
+ intent.fixUris(currentUserId);
+ }
+ }
}
public class ResolveListAdapter extends BaseAdapter {

12
Patches/LineageOS-19.1/android_frameworks_base/0030-System_JobScheduler_Allowance.patch
View File

@ -1,4 +1,4 @@
From 4f12bdfdda5cd0d538790c05ee784e5fb5e1e2fb Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Muhomor <muhomor.dmitry@gmail.com> From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
Date: Thu, 7 Jul 2022 09:28:40 +0300 Date: Thu, 7 Jul 2022 09:28:40 +0300
Subject: [PATCH] DeviceIdleJobsController: don't ignore whitelisted system Subject: [PATCH] DeviceIdleJobsController: don't ignore whitelisted system
@ -65,7 +65,7 @@ diff --git a/apex/jobscheduler/framework/java/com/android/server/DeviceIdleInter
index caf7e7f4a4ed..1b1d2252dae1 100644 index caf7e7f4a4ed..1b1d2252dae1 100644
--- a/apex/jobscheduler/framework/java/com/android/server/DeviceIdleInternal.java --- a/apex/jobscheduler/framework/java/com/android/server/DeviceIdleInternal.java
+++ b/apex/jobscheduler/framework/java/com/android/server/DeviceIdleInternal.java +++ b/apex/jobscheduler/framework/java/com/android/server/DeviceIdleInternal.java
@@ -73,7 +73,7 @@ void addPowerSaveTempWhitelistAppDirect(int uid, long duration, @@ -73,7 +73,7 @@ public interface DeviceIdleInternal {
boolean isAppOnWhitelist(int appid); boolean isAppOnWhitelist(int appid);
@ -78,7 +78,7 @@ diff --git a/apex/jobscheduler/service/java/com/android/server/DeviceIdleControl
index 84d05c8b4144..61f0ad028caf 100644 index 84d05c8b4144..61f0ad028caf 100644
--- a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java --- a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
+++ b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java +++ b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
@@ -2096,14 +2096,14 @@ public boolean isAppOnWhitelist(int appid) { @@ -2096,14 +2096,14 @@ public class DeviceIdleController extends SystemService
} }
/** /**
@ -100,7 +100,7 @@ diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/D
index 79ef321eaf07..393726426afa 100644 index 79ef321eaf07..393726426afa 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java
+++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java
@@ -89,7 +89,7 @@ public void onReceive(Context context, Intent intent) { @@ -89,7 +89,7 @@ public final class DeviceIdleJobsController extends StateController {
case PowerManager.ACTION_POWER_SAVE_WHITELIST_CHANGED: case PowerManager.ACTION_POWER_SAVE_WHITELIST_CHANGED:
synchronized (mLock) { synchronized (mLock) {
mDeviceIdleWhitelistAppIds = mDeviceIdleWhitelistAppIds =
@ -109,7 +109,7 @@ index 79ef321eaf07..393726426afa 100644
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, "Got whitelist " Slog.d(TAG, "Got whitelist "
+ Arrays.toString(mDeviceIdleWhitelistAppIds)); + Arrays.toString(mDeviceIdleWhitelistAppIds));
@@ -131,7 +131,7 @@ public DeviceIdleJobsController(JobSchedulerService service) { @@ -131,7 +131,7 @@ public final class DeviceIdleJobsController extends StateController {
mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
mLocalDeviceIdleController = mLocalDeviceIdleController =
LocalServices.getService(DeviceIdleInternal.class); LocalServices.getService(DeviceIdleInternal.class);
@ -118,7 +118,7 @@ index 79ef321eaf07..393726426afa 100644
mPowerSaveTempWhitelistAppIds = mPowerSaveTempWhitelistAppIds =
mLocalDeviceIdleController.getPowerSaveTempWhitelistAppIds(); mLocalDeviceIdleController.getPowerSaveTempWhitelistAppIds();
mDeviceIdleUpdateFunctor = new DeviceIdleUpdateFunctor(); mDeviceIdleUpdateFunctor = new DeviceIdleUpdateFunctor();
@@ -190,7 +190,7 @@ public void setUidActiveLocked(int uid, boolean active) { @@ -190,7 +190,7 @@ public final class DeviceIdleJobsController extends StateController {
} }
/** /**

4
Patches/LineageOS-19.1/android_packages_apps_Updater/0001-Server.patch
View File

@ -9,10 +9,10 @@ Change-Id: I26dc2942736cf0cfe4e7b92ddfdd04b9d74dbae5
1 file changed, 2 insertions(+), 9 deletions(-) 1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index c189641..980bed6 100644 index 79ded8f..69a5252 100644
--- a/src/org/lineageos/updater/misc/Utils.java --- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java
@@ -154,16 +154,9 @@ public class Utils { @@ -153,16 +153,9 @@ public class Utils {
String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL); String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE, String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
SystemProperties.get(Constants.PROP_DEVICE)); SystemProperties.get(Constants.PROP_DEVICE));

6
Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch
View File

@ -296,7 +296,7 @@ index b9c4b5d..b94fff0 100644
mClient.connect(); mClient.connect();
int responseCode = mClient.getResponseCode(); int responseCode = mClient.getResponseCode();
diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java
index 554098e..dbdc983 100644 index 6144ed7..37e81d8 100644
--- a/src/org/lineageos/updater/misc/Constants.java --- a/src/org/lineageos/updater/misc/Constants.java
+++ b/src/org/lineageos/updater/misc/Constants.java +++ b/src/org/lineageos/updater/misc/Constants.java
@@ -30,6 +30,7 @@ public final class Constants { @@ -30,6 +30,7 @@ public final class Constants {
@ -308,7 +308,7 @@ index 554098e..dbdc983 100644
public static final String PREF_AB_PERF_MODE = "ab_perf_mode"; public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning"; public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning";
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 980bed6..73985da 100644 index 69a5252..2b42726 100644
--- a/src/org/lineageos/updater/misc/Utils.java --- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java
@@ -44,6 +44,7 @@ import java.io.BufferedReader; @@ -44,6 +44,7 @@ import java.io.BufferedReader;
@ -319,7 +319,7 @@ index 980bed6..73985da 100644
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
@@ -150,11 +151,75 @@ public class Utils { @@ -149,11 +150,75 @@ public class Utils {
return updates; return updates;
} }

5
Scripts/Common/Functions.sh
View File

@ -27,6 +27,11 @@ resetWorkspace() {
} }
export -f resetWorkspace; export -f resetWorkspace;
patchWorkspace() {
patchWorkspaceReal |& tee "$DOS_WORKSPACE_ROOT/Logs/patchWorkspace-$DOS_VERSION.log";
}
export -f patchWorkspace;
verifyAllPlatformTags() { verifyAllPlatformTags() {
repo forall -c 'source $DOS_WORKSPACE_ROOT/Scripts/Common/Tag_Verifier.sh && verifyTagIfPlatform $REPO_PROJECT $REPO_PATH'; repo forall -c 'source $DOS_WORKSPACE_ROOT/Scripts/Common/Tag_Verifier.sh && verifyTagIfPlatform $REPO_PROJECT $REPO_PATH';
} }

2
Scripts/Common/Tag_Verifier.sh
View File

@ -36,7 +36,7 @@ gpgVerifyGitTag() {
echo -e "\e[0;33mWARNING: keyring is unavailable, GPG verification of $1 will not be performed!\e[0m"; echo -e "\e[0;33mWARNING: keyring is unavailable, GPG verification of $1 will not be performed!\e[0m";
fi; fi;
} }
export -f gpgVerifyGitHead; export -f gpgVerifyGitTag;
verifyTagIfPlatform() { verifyTagIfPlatform() {
if [[ "$1" == "platform/"* ]]; then if [[ "$1" == "platform/"* ]]; then

4
Scripts/LineageOS-14.1/Functions.sh
View File

@ -99,7 +99,7 @@ buildAll() {
} }
export -f buildAll; export -f buildAll;
patchWorkspace() { patchWorkspaceReal() {
umask 0022; umask 0022;
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";
touch DOS_PATCHED_FLAG; touch DOS_PATCHED_FLAG;
@ -122,7 +122,7 @@ patchWorkspace() {
sh "$DOS_SCRIPTS_COMMON/Post.sh"; sh "$DOS_SCRIPTS_COMMON/Post.sh";
source build/envsetup.sh; source build/envsetup.sh;
} }
export -f patchWorkspace; export -f patchWorkspaceReal;
enableDexPreOpt() { enableDexPreOpt() {
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";

2
Scripts/LineageOS-14.1/Patch.sh
View File

@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
# #
#Download some (non-executable) out-of-tree files for use later on #Download some (non-executable) out-of-tree files for use later on
cd "$DOS_TMP_DIR"; cd "$DOS_TMP_DIR";
if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi; if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
# #
#END OF PREPRATION #END OF PREPRATION

4
Scripts/LineageOS-15.1/Functions.sh
View File

@ -78,7 +78,7 @@ buildAll() {
} }
export -f buildAll; export -f buildAll;
patchWorkspace() { patchWorkspaceReal() {
umask 0022; umask 0022;
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";
touch DOS_PATCHED_FLAG; touch DOS_PATCHED_FLAG;
@ -99,7 +99,7 @@ patchWorkspace() {
sh "$DOS_SCRIPTS_COMMON/Post.sh"; sh "$DOS_SCRIPTS_COMMON/Post.sh";
source build/envsetup.sh; source build/envsetup.sh;
} }
export -f patchWorkspace; export -f patchWorkspaceReal;
enableDexPreOpt() { enableDexPreOpt() {
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";

2
Scripts/LineageOS-15.1/Patch.sh
View File

@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
# #
#Download some (non-executable) out-of-tree files for use later on #Download some (non-executable) out-of-tree files for use later on
cd "$DOS_TMP_DIR"; cd "$DOS_TMP_DIR";
if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi; if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
# #
#END OF PREPRATION #END OF PREPRATION

4
Scripts/LineageOS-16.0/Functions.sh
View File

@ -70,7 +70,7 @@ buildAll() {
} }
export -f buildAll; export -f buildAll;
patchWorkspace() { patchWorkspaceReal() {
umask 0022; umask 0022;
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";
touch DOS_PATCHED_FLAG; touch DOS_PATCHED_FLAG;
@ -105,7 +105,7 @@ patchWorkspace() {
sh "$DOS_SCRIPTS_COMMON/Post.sh"; sh "$DOS_SCRIPTS_COMMON/Post.sh";
source build/envsetup.sh; source build/envsetup.sh;
} }
export -f patchWorkspace; export -f patchWorkspaceReal;
enableDexPreOpt() { enableDexPreOpt() {
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";

2
Scripts/LineageOS-16.0/Patch.sh
View File

@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
# #
#Download some (non-executable) out-of-tree files for use later on #Download some (non-executable) out-of-tree files for use later on
cd "$DOS_TMP_DIR"; cd "$DOS_TMP_DIR";
if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi; if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
# #
#END OF PREPRATION #END OF PREPRATION

4
Scripts/LineageOS-17.1/Functions.sh
View File

@ -74,7 +74,7 @@ buildAll() {
} }
export -f buildAll; export -f buildAll;
patchWorkspace() { patchWorkspaceReal() {
umask 0022; umask 0022;
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";
touch DOS_PATCHED_FLAG; touch DOS_PATCHED_FLAG;
@ -96,7 +96,7 @@ patchWorkspace() {
sh "$DOS_SCRIPTS_COMMON/Post.sh"; sh "$DOS_SCRIPTS_COMMON/Post.sh";
source build/envsetup.sh; source build/envsetup.sh;
} }
export -f patchWorkspace; export -f patchWorkspaceReal;
enableDexPreOpt() { enableDexPreOpt() {
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";

3
Scripts/LineageOS-17.1/Patch.sh
View File

@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
# #
#Download some (non-executable) out-of-tree files for use later on #Download some (non-executable) out-of-tree files for use later on
cd "$DOS_TMP_DIR"; cd "$DOS_TMP_DIR";
if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi; if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
# #
#END OF PREPRATION #END OF PREPRATION
@ -144,6 +144,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/351414-backport.patch"; #R_asb_
applyPatch "$DOS_PATCHES/android_frameworks_base/351415.patch"; #R_asb_2023-03 Reconcile WorkSource parcel and unparcel code. applyPatch "$DOS_PATCHES/android_frameworks_base/351415.patch"; #R_asb_2023-03 Reconcile WorkSource parcel and unparcel code.
applyPatch "$DOS_PATCHES/android_frameworks_base/351436.patch"; #R_asb_2023-03 Revert "Ensure that only SysUI can override pending intent launch flags" applyPatch "$DOS_PATCHES/android_frameworks_base/351436.patch"; #R_asb_2023-03 Revert "Ensure that only SysUI can override pending intent launch flags"
applyPatch "$DOS_PATCHES/android_frameworks_base/352555.patch"; #Q_asb_2023-03 Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" applyPatch "$DOS_PATCHES/android_frameworks_base/352555.patch"; #Q_asb_2023-03 Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"
applyPatch "$DOS_PATCHES/android_frameworks_base/353117.patch"; #Q_asb_2023-03 Fix sharing to another profile where an app has multiple targets
#applyPatch "$DOS_PATCHES/android_frameworks_base/272645.patch"; #ten-bt-sbc-hd-dualchannel: Add CHANNEL_MODE_DUAL_CHANNEL constant (ValdikSS) #applyPatch "$DOS_PATCHES/android_frameworks_base/272645.patch"; #ten-bt-sbc-hd-dualchannel: Add CHANNEL_MODE_DUAL_CHANNEL constant (ValdikSS)
#applyPatch "$DOS_PATCHES/android_frameworks_base/272646-forwardport.patch"; #ten-bt-sbc-hd-dualchannel: Add Dual Channel into Bluetooth Audio Channel Mode developer options menu (ValdikSS) #applyPatch "$DOS_PATCHES/android_frameworks_base/272646-forwardport.patch"; #ten-bt-sbc-hd-dualchannel: Add Dual Channel into Bluetooth Audio Channel Mode developer options menu (ValdikSS)
#applyPatch "$DOS_PATCHES/android_frameworks_base/272647.patch"; #ten-bt-sbc-hd-dualchannel: Allow SBC as HD audio codec in Bluetooth device configuration (ValdikSS) #applyPatch "$DOS_PATCHES/android_frameworks_base/272647.patch"; #ten-bt-sbc-hd-dualchannel: Allow SBC as HD audio codec in Bluetooth device configuration (ValdikSS)

4
Scripts/LineageOS-18.1/Functions.sh
View File

@ -105,7 +105,7 @@ buildAll() {
} }
export -f buildAll; export -f buildAll;
patchWorkspace() { patchWorkspaceReal() {
umask 0022; umask 0022;
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";
touch DOS_PATCHED_FLAG; touch DOS_PATCHED_FLAG;
@ -134,7 +134,7 @@ patchWorkspace() {
cd device/google/marlin/marlin && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE"; cd device/google/marlin/marlin && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE";
cd device/google/marlin/sailfish && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE"; cd device/google/marlin/sailfish && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE";
} }
export -f patchWorkspace; export -f patchWorkspaceReal;
enableDexPreOpt() { enableDexPreOpt() {
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";

2
Scripts/LineageOS-18.1/Patch.sh
View File

@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
# #
#Download some (non-executable) out-of-tree files for use later on #Download some (non-executable) out-of-tree files for use later on
cd "$DOS_TMP_DIR"; cd "$DOS_TMP_DIR";
if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi; if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
# #
#END OF PREPRATION #END OF PREPRATION

4
Scripts/LineageOS-19.1/Functions.sh
View File

@ -65,7 +65,7 @@ buildAll() {
} }
export -f buildAll; export -f buildAll;
patchWorkspace() { patchWorkspaceReal() {
umask 0022; umask 0022;
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";
touch DOS_PATCHED_FLAG; touch DOS_PATCHED_FLAG;
@ -92,7 +92,7 @@ patchWorkspace() {
##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong ##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong
#none yet #none yet
} }
export -f patchWorkspace; export -f patchWorkspaceReal;
enableDexPreOpt() { enableDexPreOpt() {
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";

2
Scripts/LineageOS-19.1/Patch.sh
View File

@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
# #
#Download some (non-executable) out-of-tree files for use later on #Download some (non-executable) out-of-tree files for use later on
cd "$DOS_TMP_DIR"; cd "$DOS_TMP_DIR";
if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi; if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
# #
#END OF PREPRATION #END OF PREPRATION

7
Scripts/LineageOS-20.0/Functions.sh
View File

@ -108,7 +108,7 @@ buildAll() {
} }
export -f buildAll; export -f buildAll;
patchWorkspace() { patchWorkspaceReal() {
umask 0022; umask 0022;
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";
touch DOS_PATCHED_FLAG; touch DOS_PATCHED_FLAG;
@ -116,8 +116,7 @@ patchWorkspace() {
verifyAllPlatformTags; verifyAllPlatformTags;
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
source build/envsetup.sh; #source build/envsetup.sh;
repopick -i 350952; #SystemUI: Follow light/dark theme in SplitShade Header
sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
@ -134,7 +133,7 @@ patchWorkspace() {
##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong ##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong
#none yet #none yet
} }
export -f patchWorkspace; export -f patchWorkspaceReal;
enableDexPreOpt() { enableDexPreOpt() {
cd "$DOS_BUILD_BASE/$1"; cd "$DOS_BUILD_BASE/$1";

3
Scripts/LineageOS-20.0/Patch.sh
View File

@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
# #
#Download some (non-executable) out-of-tree files for use later on #Download some (non-executable) out-of-tree files for use later on
cd "$DOS_TMP_DIR"; cd "$DOS_TMP_DIR";
if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi; if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
cd "$DOS_BUILD_BASE"; cd "$DOS_BUILD_BASE";
# #
#END OF PREPRATION #END OF PREPRATION
@ -128,6 +128,7 @@ sed -i '11iLOCAL_OVERRIDES_PACKAGES := Aperture Camera Camera2 LegacyCamera Snap
fi; fi;
if enterAndClear "frameworks/base"; then if enterAndClear "frameworks/base"; then
git revert --no-edit d36faad3267522c6d3ff91ba9dcca8f6274bccd1; #Reverts "JobScheduler: Respect allow-in-power-save perm" in favor of below patch
git revert --no-edit 90d6826548189ca850d91692e71fcc1be426f453; #Reverts "Remove sensitive info from SUPL requests" in favor of below patch git revert --no-edit 90d6826548189ca850d91692e71fcc1be426f453; #Reverts "Remove sensitive info from SUPL requests" in favor of below patch
applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS)
applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS)

1
fix_permissions.sh
View File

@ -17,6 +17,7 @@ setRelaxed() {
} }
chmod -v 600 LICENSE* pending_commit.txt TODO; chmod -v 600 LICENSE* pending_commit.txt TODO;
setStrict Logs;
setStrict Manifests; setStrict Manifests;
setStrict Misc; setStrict Misc;
setStrict Patches/Common; setStrict Patches/Common;