mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-08-03 20:04:21 -04:00
Updates, logging, and churn
also add an extra March ASB patch for 17.1 Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
ca93ef33ce
commit
750f244304
31 changed files with 13678 additions and 57 deletions
|
@ -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>
|
||||
Date: Fri, 2 Dec 2022 09:44:31 -0800
|
||||
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(-)
|
||||
|
||||
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
|
||||
+++ 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.
|
||||
allowed = true;
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
Date: Fri, 2 Dec 2022 09:44:31 -0800
|
||||
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(-)
|
||||
|
||||
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
|
||||
+++ 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.
|
||||
allowed = true;
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
Date: Sun, 26 Mar 2023 17:36:03 +0200
|
||||
Subject: [PATCH] Revert "[RESTRICT AUTOMERGE] Trim the activity info of
|
||||
|
@ -20,10 +20,10 @@ Merged-In: I078080b14b7cf7c6e605739f22f40f86802d3950
|
|||
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
|
||||
index 900b59e0a8a2d..1eb7455135c78 100644
|
||||
index 900b59e0a8a2..1eb7455135c7 100644
|
||||
--- a/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) {
|
||||
throw new IllegalArgumentException("Unable to find task ID " + mTaskId);
|
||||
}
|
||||
|
@ -34,10 +34,10 @@ index 900b59e0a8a2d..1eb7455135c78 100644
|
|||
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
|
||||
index 56367f42886d6..541a8bbc88656 100644
|
||||
index 56367f42886d..541a8bbc8865 100644
|
||||
--- a/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;
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,7 @@ index 56367f42886d6..541a8bbc88656 100644
|
|||
if (!getDetailedTasks) {
|
||||
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.
|
||||
*/
|
||||
|
@ -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
|
||||
index 3c2e36cf245de..81a85476c53a4 100644
|
||||
index 3c2e36cf245d..81a85476c53a 100644
|
||||
--- a/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();
|
||||
|
@ -76,7 +76,7 @@ index 3c2e36cf245de..81a85476c53a4 100644
|
|||
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}.
|
||||
*/
|
||||
|
@ -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
|
||||
index 9de4c8121e4d0..361f66e3106ae 100644
|
||||
index 9de4c8121e4d..361f66e3106a 100644
|
||||
--- a/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());
|
||||
}
|
||||
|
||||
|
|
82
Patches/LineageOS-17.1/android_frameworks_base/353117.patch
Normal file
82
Patches/LineageOS-17.1/android_frameworks_base/353117.patch
Normal 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 {
|
|
@ -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>
|
||||
Date: Thu, 7 Jul 2022 09:28:40 +0300
|
||||
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
|
||||
--- a/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);
|
||||
|
||||
|
@ -78,7 +78,7 @@ diff --git a/apex/jobscheduler/service/java/com/android/server/DeviceIdleControl
|
|||
index 84d05c8b4144..61f0ad028caf 100644
|
||||
--- a/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
|
||||
--- a/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:
|
||||
synchronized (mLock) {
|
||||
mDeviceIdleWhitelistAppIds =
|
||||
|
@ -109,7 +109,7 @@ index 79ef321eaf07..393726426afa 100644
|
|||
if (DEBUG) {
|
||||
Slog.d(TAG, "Got whitelist "
|
||||
+ 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);
|
||||
mLocalDeviceIdleController =
|
||||
LocalServices.getService(DeviceIdleInternal.class);
|
||||
|
@ -118,7 +118,7 @@ index 79ef321eaf07..393726426afa 100644
|
|||
mPowerSaveTempWhitelistAppIds =
|
||||
mLocalDeviceIdleController.getPowerSaveTempWhitelistAppIds();
|
||||
mDeviceIdleUpdateFunctor = new DeviceIdleUpdateFunctor();
|
||||
@@ -190,7 +190,7 @@ public void setUidActiveLocked(int uid, boolean active) {
|
||||
@@ -190,7 +190,7 @@ public final class DeviceIdleJobsController extends StateController {
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -9,10 +9,10 @@ Change-Id: I26dc2942736cf0cfe4e7b92ddfdd04b9d74dbae5
|
|||
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
|
||||
index c189641..980bed6 100644
|
||||
index 79ded8f..69a5252 100644
|
||||
--- a/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 device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
|
||||
SystemProperties.get(Constants.PROP_DEVICE));
|
||||
|
|
|
@ -296,7 +296,7 @@ index b9c4b5d..b94fff0 100644
|
|||
mClient.connect();
|
||||
int responseCode = mClient.getResponseCode();
|
||||
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
|
||||
+++ b/src/org/lineageos/updater/misc/Constants.java
|
||||
@@ -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_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
|
||||
index 980bed6..73985da 100644
|
||||
index 69a5252..2b42726 100644
|
||||
--- a/src/org/lineageos/updater/misc/Utils.java
|
||||
+++ b/src/org/lineageos/updater/misc/Utils.java
|
||||
@@ -44,6 +44,7 @@ import java.io.BufferedReader;
|
||||
|
@ -319,7 +319,7 @@ index 980bed6..73985da 100644
|
|||
import java.util.ArrayList;
|
||||
import java.util.Enumeration;
|
||||
import java.util.HashSet;
|
||||
@@ -150,11 +151,75 @@ public class Utils {
|
||||
@@ -149,11 +150,75 @@ public class Utils {
|
||||
return updates;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue