cameraservice: re-map oom_adj scores and states of native vendor clients.
Override the oom_adj scores of vendor clients from to PERCEPTIBLE_APP_ADJ.
Override the process state of vendor clients to to PROCESS_STATE_PERSISTENT_UI.
This is in order for app processes to take priority over vendor clients.
For example, this could help in the case of the default camera app and
face auth contending for resources from the lock screen.
Bug: 132117718
Test: manual test on lockscreen, try to double press and open camera app
while a vendor client is connected to a contending camera device.
Change-Id: Ie5fabb59c876cb02eb706f3dda8f748c69e3c063
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
diff --git a/services/camera/libcameraservice/utils/ClientManager.h b/services/camera/libcameraservice/utils/ClientManager.h
index d7135f1..ec6f01c 100644
--- a/services/camera/libcameraservice/utils/ClientManager.h
+++ b/services/camera/libcameraservice/utils/ClientManager.h
@@ -33,12 +33,38 @@
class ClientPriority {
public:
- ClientPriority(int32_t score, int32_t state) :
- mScore(score), mState(state) {}
+ /**
+ * Choosing to set mIsVendorClient through a parameter instead of calling
+ * hardware::IPCThreadState::self()->isServingCall() to protect against the
+ * case where the construction is offloaded to another thread which isn't a
+ * hwbinder thread.
+ */
+ ClientPriority(int32_t score, int32_t state, bool isVendorClient) :
+ mScore(score), mState(state), mIsVendorClient(isVendorClient) { }
int32_t getScore() const { return mScore; }
int32_t getState() const { return mState; }
+ void setScore(int32_t score) {
+ // For vendor clients, the score is set once and for all during
+ // construction. Otherwise, it can get reset each time cameraserver
+ // queries ActivityManagerService for oom_adj scores / states .
+ if (!mIsVendorClient) {
+ mScore = score;
+ }
+ }
+
+ void setState(int32_t state) {
+ // For vendor clients, the score is set once and for all during
+ // construction. Otherwise, it can get reset each time cameraserver
+ // queries ActivityManagerService for oom_adj scores / states
+ // (ActivityManagerService returns a vendor process' state as
+ // PROCESS_STATE_NONEXISTENT.
+ if (!mIsVendorClient) {
+ mState = state;
+ }
+ }
+
bool operator==(const ClientPriority& rhs) const {
return (this->mScore == rhs.mScore) && (this->mState == rhs.mState);
}
@@ -66,6 +92,7 @@
private:
int32_t mScore;
int32_t mState;
+ bool mIsVendorClient = false;
};
// --------------------------------------------------------------------------------
@@ -82,9 +109,10 @@
class ClientDescriptor final {
public:
ClientDescriptor(const KEY& key, const VALUE& value, int32_t cost,
- const std::set<KEY>& conflictingKeys, int32_t score, int32_t ownerId, int32_t state);
+ const std::set<KEY>& conflictingKeys, int32_t score, int32_t ownerId, int32_t state,
+ bool isVendorClient);
ClientDescriptor(KEY&& key, VALUE&& value, int32_t cost, std::set<KEY>&& conflictingKeys,
- int32_t score, int32_t ownerId, int32_t state);
+ int32_t score, int32_t ownerId, int32_t state, bool isVendorClient);
~ClientDescriptor();
@@ -148,17 +176,19 @@
template<class KEY, class VALUE>
ClientDescriptor<KEY, VALUE>::ClientDescriptor(const KEY& key, const VALUE& value, int32_t cost,
- const std::set<KEY>& conflictingKeys, int32_t score, int32_t ownerId, int32_t state) :
+ const std::set<KEY>& conflictingKeys, int32_t score, int32_t ownerId, int32_t state,
+ bool isVendorClient) :
mKey{key}, mValue{value}, mCost{cost}, mConflicting{conflictingKeys},
- mPriority(score, state),
+ mPriority(score, state, isVendorClient),
mOwnerId{ownerId} {}
template<class KEY, class VALUE>
ClientDescriptor<KEY, VALUE>::ClientDescriptor(KEY&& key, VALUE&& value, int32_t cost,
- std::set<KEY>&& conflictingKeys, int32_t score, int32_t ownerId, int32_t state) :
+ std::set<KEY>&& conflictingKeys, int32_t score, int32_t ownerId, int32_t state,
+ bool isVendorClient) :
mKey{std::forward<KEY>(key)}, mValue{std::forward<VALUE>(value)}, mCost{cost},
mConflicting{std::forward<std::set<KEY>>(conflictingKeys)},
- mPriority(score, state), mOwnerId{ownerId} {}
+ mPriority(score, state, isVendorClient), mOwnerId{ownerId} {}
template<class KEY, class VALUE>
ClientDescriptor<KEY, VALUE>::~ClientDescriptor() {}
@@ -204,7 +234,13 @@
template<class KEY, class VALUE>
void ClientDescriptor<KEY, VALUE>::setPriority(const ClientPriority& priority) {
- mPriority = priority;
+ // We don't use the usual copy constructor here since we want to remember
+ // whether a client is a vendor client or not. This could have been wiped
+ // off in the incoming priority argument since an AIDL thread might have
+ // called hardware::IPCThreadState::self()->isServingCall() after refreshing
+ // priorities for old clients through ProcessInfoService::getProcessStatesScoresFromPids().
+ mPriority.setScore(priority.getScore());
+ mPriority.setState(priority.getState());
}
// --------------------------------------------------------------------------------