Remove untargeted injection fallback for targeted injection
This fallback was added because some tests performed targeted injection into activities started by the shell. Since the known effected tests were fixed in ag/17691131, we can try removing the fallback to see if anything else breaks. Bug: 228161340 Test: atest WindowFocusTests Test: atest WindowInsetsControllerTests Change-Id: I22d05ddd18d961e3c5d6568b53231d7888ea09fd
This commit is contained in:
@@ -897,17 +897,6 @@ public class InputManagerService extends IInputManager.Stub
|
||||
throw new IllegalStateException("Injection should not result in TARGET_MISMATCH"
|
||||
+ " when it is not targeted into to a specific uid.");
|
||||
}
|
||||
// TODO(b/228161340): Remove the fallback of targeting injection into all windows
|
||||
// when the caller has the injection permission.
|
||||
// Explicitly maintain the same behavior as previous versions of Android, where
|
||||
// injection is allowed into all windows if the caller has the INJECT_EVENTS
|
||||
// permission, even if it is targeting a certain uid.
|
||||
if (checkCallingPermission(android.Manifest.permission.INJECT_EVENTS,
|
||||
"injectInputEvent-target-mismatch-fallback")) {
|
||||
Slog.w(TAG, "Targeted input event was not directed at a window owned by uid "
|
||||
+ targetUid + ". Falling back to injecting into all windows.");
|
||||
return injectInputEventToTarget(event, mode, Process.INVALID_UID);
|
||||
}
|
||||
throw new IllegalArgumentException(
|
||||
"Targeted input event injection from pid " + pid
|
||||
+ " was not directed at a window owned by uid "
|
||||
|
||||
Reference in New Issue
Block a user