commit 5735a328e01329d7e7c24a668fa88f9bc8e124d7
author Prabir Pradhan <prabirmsp@google.com> Mon Apr 11 17:23:34 2022 +0000
committer Prabir Pradhan <prabirmsp@google.com> Thu Apr 28 14:40:55 2022 +0000
tree b62fc7410a18f5fca98a5ccdf4f5ae5c2c1514d3
parent cdc6585e6e326e41f720338ba385691ab3a7d30b

Reland: Change input injection security model

This reverts commit 4df80f58c42d56facdc79ffa5bcba041300784e9.

Changes from revert: None

Bug: 207667844
Bug: 194952792
Test: TBD
Change-Id: I1bf9bd08fa9974ec54bbdddb27892afdda407331

services/inputflinger/dispatcher/InjectionState.cpp

diff --git a/services/inputflinger/dispatcher/InjectionState.cpp b/services/inputflinger/dispatcher/InjectionState.cpp
index c8024a6..c2d3ad6 100644
--- a/services/inputflinger/dispatcher/InjectionState.cpp
+++ b/services/inputflinger/dispatcher/InjectionState.cpp
@@ -20,10 +20,9 @@
 
 namespace android::inputdispatcher {
 
-InjectionState::InjectionState(int32_t injectorPid, int32_t injectorUid)
+InjectionState::InjectionState(const std::optional<int32_t>& targetUid)
       : refCount(1),
-        injectorPid(injectorPid),
-        injectorUid(injectorUid),
+        targetUid(targetUid),
         injectionResult(android::os::InputEventInjectionResult::PENDING),
         injectionIsAsync(false),
         pendingForegroundDispatches(0) {}