Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-16 11:24:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix an inconsistency

Browse Source 
As noted by @syphyr

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-08-09 16:15:25 -04:00
parent 877257692e
commit cd0ede5a0d
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Patches/LineageOS-14.1/android_frameworks_base/364029-backport.patch
View File

@ -33,7 +33,6 @@ 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 @@
@ -50,18 +49,9 @@ index 0f224dae3337..ef6ce2503061 100644
-->
<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..da42b976db9d 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -277,6 +277,7 @@ import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.content.res.Configuration.UI_MODE_TYPE_TELEVISION;
+import static android.os.Process.FIRST_APPLICATION_UID;
import static android.os.Process.PROC_CHAR;
import static android.os.Process.PROC_OUT_LONG;
import static android.os.Process.PROC_PARENS;
@@ -5819,8 +5820,20 @@ public final class ActivityManagerService extends ActivityManagerNative
@@ -5819,8 +5819,20 @@ public final class ActivityManagerService extends ActivityManagerNative
Slog.w(TAG, msg);
throw new SecurityException(msg);
}
@ -83,7 +73,7 @@ index 8f26804d51bd..da42b976db9d 100644
userId, true, ALLOW_FULL_ONLY, "killBackgroundProcesses", null);
long callingId = Binder.clearCallingIdentity();
try {
@@ -5832,7 +5845,7 @@ public final class ActivityManagerService extends ActivityManagerNative
@@ -5832,7 +5844,7 @@ public final class ActivityManagerService extends ActivityManagerNative
pm.getPackageUid(packageName, MATCH_DEBUG_TRIAGED_MISSING, userId));
} catch (RemoteException e) {
}
@ -92,7 +82,7 @@ index 8f26804d51bd..da42b976db9d 100644
Slog.w(TAG, "Invalid packageName: " + packageName);
return;
}
@@ -5912,6 +5925,22 @@ public final class ActivityManagerService extends ActivityManagerNative
@@ -5912,6 +5924,22 @@ public final class ActivityManagerService extends ActivityManagerNative
throw new SecurityException(msg);
}
@ -103,7 +93,7 @@ index 8f26804d51bd..da42b976db9d 100644
+ synchronized (mPidsSelfLocked) {
+ proc = mPidsSelfLocked.get(callingPid);
+ }
+ if (callingUid >= FIRST_APPLICATION_UID
+ 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";