mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-23 22:49:28 -05:00
70 lines
2.9 KiB
Diff
70 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jing Ji <jji@google.com>
|
|
Date: Thu, 19 Oct 2023 14:22:58 -0700
|
|
Subject: [PATCH] DO NOT MERGE: Fix ActivityManager#killBackgroundProcesses
|
|
permissions
|
|
|
|
In the pevious CL, we incorrectly added the permission check in the
|
|
killBackgroundProcessesExcept. Now fix this issue.
|
|
|
|
Bug: 239423414
|
|
Bug: 223376078
|
|
Test: atest CtsAppTestCases:ActivityManagerTest
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:140fce861944419a375c669010c6c47cd7ff5b37)
|
|
Merged-In: I9471a77188ee63ec32cd0c81569193e4ccad885b
|
|
Change-Id: I9471a77188ee63ec32cd0c81569193e4ccad885b
|
|
---
|
|
.../server/am/ActivityManagerService.java | 32 +++++++++----------
|
|
1 file changed, 16 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
|
|
index 406e08009cb7..2e6e7fa15d0f 100644
|
|
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
|
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
|
@@ -5868,6 +5868,22 @@ public final class ActivityManagerService extends ActivityManagerNative
|
|
throw new SecurityException(msg);
|
|
}
|
|
|
|
+ final int callingUid = Binder.getCallingUid();
|
|
+ final int callingPid = Binder.getCallingPid();
|
|
+
|
|
+ ProcessRecord proc;
|
|
+ synchronized (mPidsSelfLocked) {
|
|
+ proc = mPidsSelfLocked.get(callingPid);
|
|
+ }
|
|
+ if (callingUid >= Process.FIRST_APPLICATION_UID
|
|
+ && (proc == null || !proc.info.isSystemApp())) {
|
|
+ final String msg = "Permission Denial: killAllBackgroundProcesses() from pid="
|
|
+ + callingPid + ", uid=" + callingUid + " is not allowed";
|
|
+ Slog.w(TAG, msg);
|
|
+ // Silently return to avoid existing apps from crashing.
|
|
+ return;
|
|
+ }
|
|
+
|
|
final long callingId = Binder.clearCallingIdentity();
|
|
try {
|
|
synchronized (this) {
|
|
@@ -5925,22 +5941,6 @@ public final class ActivityManagerService extends ActivityManagerNative
|
|
throw new SecurityException(msg);
|
|
}
|
|
|
|
- final int callingUid = Binder.getCallingUid();
|
|
- final int callingPid = Binder.getCallingPid();
|
|
-
|
|
- ProcessRecord proc;
|
|
- synchronized (mPidsSelfLocked) {
|
|
- proc = mPidsSelfLocked.get(callingPid);
|
|
- }
|
|
- if (callingUid >= Process.FIRST_APPLICATION_UID
|
|
- && (proc == null || !proc.info.isSystemApp())) {
|
|
- final String msg = "Permission Denial: killAllBackgroundProcesses() from pid="
|
|
- + callingPid + ", uid=" + callingUid + " is not allowed";
|
|
- Slog.w(TAG, msg);
|
|
- // Silently return to avoid existing apps from crashing.
|
|
- return;
|
|
- }
|
|
-
|
|
final long callingId = Binder.clearCallingIdentity();
|
|
try {
|
|
synchronized (this) {
|