Merge "Make sure only the system uses BIND_ALMOST_PERCEPTIBLE." into tm-dev

2022-03-24 10:19:15 +00:00
parent d4db41ad03 57c34cb2cb
commit d336b9ba57
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -2789,6 +2789,11 @@ public final class ActiveServices {
                            + ") set BIND_ALLOW_INSTANT when binding service " + service);
        }

+        if ((flags & Context.BIND_ALMOST_PERCEPTIBLE) != 0 && !isCallerSystem) {
+            throw new SecurityException("Non-system caller (pid=" + callingPid
+                    + ") set BIND_ALMOST_PERCEPTIBLE when binding service " + service);
+        }
+
        if ((flags & Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS) != 0) {
            mAm.enforceCallingPermission(
                    android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND,