Skip to content

Commit 07e7aaf

Browse files
committed
Only allow trusted overlays to specify FLAG_SLIPPERY
For all other requests, drop this flag. Test: atest FlagSlipperyTest Bug: 157929241 Change-Id: Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b Merged-In: Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b
1 parent bb3f22d commit 07e7aaf

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

services/core/java/com/android/server/wm/DisplayPolicy.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
6363
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
6464
import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
65+
import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY;
6566
import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION;
6667
import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
6768
import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;
@@ -833,6 +834,20 @@ private boolean hasStatusBarServicePermission(int pid, int uid) {
833834
== PackageManager.PERMISSION_GRANTED;
834835
}
835836

837+
/**
838+
* Only trusted overlays are allowed to use FLAG_SLIPPERY.
839+
*/
840+
static int sanitizeFlagSlippery(int flags, int privateFlags, String name) {
841+
if ((flags & FLAG_SLIPPERY) == 0) {
842+
return flags;
843+
}
844+
if ((privateFlags & PRIVATE_FLAG_TRUSTED_OVERLAY) != 0) {
845+
return flags;
846+
}
847+
Slog.w(TAG, "Removing FLAG_SLIPPERY for non-trusted overlay " + name);
848+
return flags & ~FLAG_SLIPPERY;
849+
}
850+
836851
/**
837852
* Sanitize the layout parameters coming from a client. Allows the policy
838853
* to do things like ensure that windows of a specific type can't take
@@ -916,6 +931,7 @@ public void adjustWindowParamsLw(WindowState win, WindowManager.LayoutParams att
916931
}
917932
break;
918933
}
934+
attrs.flags = sanitizeFlagSlippery(attrs.flags, attrs.privateFlags, win.getName());
919935
}
920936

921937
/**

services/core/java/com/android/server/wm/WindowManagerService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
5656
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
5757
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
58+
import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY;
5859
import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL;
5960
import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;
6061
import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW;
@@ -8086,8 +8087,9 @@ private void updateInputChannel(IBinder channelToken, int callingUid, int callin
80868087
h.token = channelToken;
80878088
h.name = name;
80888089

8089-
final int sanitizedFlags = flags & (LayoutParams.FLAG_NOT_TOUCHABLE
8090-
| LayoutParams.FLAG_SLIPPERY);
8090+
flags = DisplayPolicy.sanitizeFlagSlippery(flags, privateFlags, name);
8091+
8092+
final int sanitizedFlags = flags & (LayoutParams.FLAG_NOT_TOUCHABLE | FLAG_SLIPPERY);
80918093
h.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | sanitizedFlags;
80928094
h.layoutParamsType = type;
80938095
h.dispatchingTimeoutNanos = DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS;

0 commit comments

Comments
 (0)