diff options
| author | 2018-10-03 16:30:44 -0700 | |
|---|---|---|
| committer | 2018-11-27 12:39:33 -0800 | |
| commit | 5c8a026133d5bbcb6f416952937a7a810bccc8b1 (patch) | |
| tree | e1541cab029b32e38506ab24107ce80621edb4df /include/input | |
| parent | 1c4c5599696d049b112c40d629f8c74bb612b01f (diff) | |
Replace InputWindowInfo#inputChannel with an IBinder token.
The IBinder token is now being used as the UUID for InputWindows.
We can pass it around without the channel to avoid unnecessary FD
parcelling, duping, and other juggling.
Test: Existing tests pass.
Bug: 80101428
Bug: 113136004
Bug: 111440400
Change-Id: I8eba3fa05f249b7dfcb5c3d9817241cbfe9ab76c
Diffstat (limited to 'include/input')
| -rw-r--r-- | include/input/InputWindow.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/input/InputWindow.h b/include/input/InputWindow.h index 9e3d334f7f..6164aa6f09 100644 --- a/include/input/InputWindow.h +++ b/include/input/InputWindow.h @@ -117,7 +117,7 @@ struct InputWindowInfo { INPUT_FEATURE_DISABLE_USER_ACTIVITY = 0x00000004, }; - sp<InputChannel> inputChannel; + sp<IBinder> token; std::string name; int32_t layoutParamsFlags; int32_t layoutParamsType; @@ -174,14 +174,14 @@ public: return &mInfo; } - sp<InputChannel> getInputChannel() const; + sp<IBinder> getToken() const; inline std::string getName() const { - return mInfo.inputChannel ? mInfo.name : "<invalid>"; + return mInfo.token ? mInfo.name : "<invalid>"; } inline nsecs_t getDispatchingTimeout(nsecs_t defaultValue) const { - return mInfo.inputChannel? mInfo.dispatchingTimeout : defaultValue; + return mInfo.token ? mInfo.dispatchingTimeout : defaultValue; } /** |