summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/TransactionState.h
diff options
context:
space:
mode:
author Chavi Weingarten <chaviw@google.com> 2023-04-14 18:50:53 +0000
committer Chavi Weingarten <chaviw@google.com> 2023-05-08 21:38:26 +0000
commitc78f53cd0e9ce68cc52a851584b6ce5b34baef7d (patch)
treed2712bcb15c44121d03e6c659ad321b676767f99 /services/surfaceflinger/TransactionState.h
parentb1e4e9fba5b211ffc9abc62cd80570e81ec2a73a (diff)
Cleaned up transaction sanitize calls
Exposed a way for a client to invoke sanitize with a uid and pid to ensure we don't remove states when the process that added it was privileged. Added a helper function to get the permission ints based on the String permission values so SF and clients can call the same API. In SF, call sanitize as soon as setTransactionState is called since that's the point where the Transaction has been passed over binder so we can identify the calling uid. This allows us to remove the permission values passed to applyTransactionState and unifies the places that were calling sanitize. Test: CredentialsTest Bug: 267794530 Change-Id: I30c1800f0fee43df1cee82464139db7b56a7d911
Diffstat (limited to 'services/surfaceflinger/TransactionState.h')
-rw-r--r--services/surfaceflinger/TransactionState.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/services/surfaceflinger/TransactionState.h b/services/surfaceflinger/TransactionState.h
index 35c8b6c647..62a7dfd0f1 100644
--- a/services/surfaceflinger/TransactionState.h
+++ b/services/surfaceflinger/TransactionState.h
@@ -54,7 +54,7 @@ struct TransactionState {
const Vector<DisplayState>& displayStates, uint32_t transactionFlags,
const sp<IBinder>& applyToken, const InputWindowCommands& inputWindowCommands,
int64_t desiredPresentTime, bool isAutoTimestamp,
- std::vector<uint64_t> uncacheBufferIds, int64_t postTime, uint32_t permissions,
+ std::vector<uint64_t> uncacheBufferIds, int64_t postTime,
bool hasListenerCallbacks, std::vector<ListenerCallbacks> listenerCallbacks,
int originPid, int originUid, uint64_t transactionId)
: frameTimelineInfo(frameTimelineInfo),
@@ -67,7 +67,6 @@ struct TransactionState {
isAutoTimestamp(isAutoTimestamp),
uncacheBufferIds(std::move(uncacheBufferIds)),
postTime(postTime),
- permissions(permissions),
hasListenerCallbacks(hasListenerCallbacks),
listenerCallbacks(listenerCallbacks),
originPid(originPid),
@@ -126,7 +125,6 @@ struct TransactionState {
bool isAutoTimestamp;
std::vector<uint64_t> uncacheBufferIds;
int64_t postTime;
- uint32_t permissions;
bool hasListenerCallbacks;
std::vector<ListenerCallbacks> listenerCallbacks;
int originPid;