VRR: Use appId to replace uid mapping
Uid is combination of user id and app id. Because the allowlist
is recored by pkg for each users. We could ignore the user id part
and it also could solve the issue we didn't update the mapping
when user added case.
Bug: 298722189
Test: atest SmallAreaDetectionAllowMappingsTest
Test: atest SmallAreaDetectionControllerTest
Test: Add new user and open Youtube short to check refresh rate
Change-Id: Ic80be38ebc19938bc061bf6121c68efc4ff9ac4c
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 4db960e..d23b9e6 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -2768,16 +2768,16 @@
return statusTFromBinderStatus(status);
}
-status_t SurfaceComposerClient::updateSmallAreaDetection(std::vector<int32_t>& uids,
+status_t SurfaceComposerClient::updateSmallAreaDetection(std::vector<int32_t>& appIds,
std::vector<float>& thresholds) {
binder::Status status =
- ComposerServiceAIDL::getComposerService()->updateSmallAreaDetection(uids, thresholds);
+ ComposerServiceAIDL::getComposerService()->updateSmallAreaDetection(appIds, thresholds);
return statusTFromBinderStatus(status);
}
-status_t SurfaceComposerClient::setSmallAreaDetectionThreshold(uid_t uid, float threshold) {
+status_t SurfaceComposerClient::setSmallAreaDetectionThreshold(int32_t appId, float threshold) {
binder::Status status =
- ComposerServiceAIDL::getComposerService()->setSmallAreaDetectionThreshold(uid,
+ ComposerServiceAIDL::getComposerService()->setSmallAreaDetectionThreshold(appId,
threshold);
return statusTFromBinderStatus(status);
}
diff --git a/libs/gui/aidl/android/gui/ISurfaceComposer.aidl b/libs/gui/aidl/android/gui/ISurfaceComposer.aidl
index 1c604a1..2c8b4b8 100644
--- a/libs/gui/aidl/android/gui/ISurfaceComposer.aidl
+++ b/libs/gui/aidl/android/gui/ISurfaceComposer.aidl
@@ -479,14 +479,14 @@
*/
void setOverrideFrameRate(int uid, float frameRate);
- oneway void updateSmallAreaDetection(in int[] uids, in float[] thresholds);
+ oneway void updateSmallAreaDetection(in int[] appIds, in float[] thresholds);
/**
- * Set the small area detection threshold for a specified uid by SmallAreaDetectionController.
- * Passing the threshold and uid to SurfaceFlinger to update the uid-threshold mapping
+ * Set the small area detection threshold for a specified appId by SmallAreaDetectionController.
+ * Passing the threshold and appId to SurfaceFlinger to update the appId-threshold mapping
* in the scheduler.
*/
- oneway void setSmallAreaDetectionThreshold(int uid, float threshold);
+ oneway void setSmallAreaDetectionThreshold(int appId, float threshold);
/**
* Enables or disables the frame rate overlay in the top left corner.
diff --git a/libs/gui/include/gui/SurfaceComposerClient.h b/libs/gui/include/gui/SurfaceComposerClient.h
index 6fef5d2..cb48807 100644
--- a/libs/gui/include/gui/SurfaceComposerClient.h
+++ b/libs/gui/include/gui/SurfaceComposerClient.h
@@ -203,15 +203,15 @@
// by GameManager.
static status_t setOverrideFrameRate(uid_t uid, float frameRate);
- // Update the small area detection whole uid-threshold mappings by same size uid and threshold
- // vector.
+ // Update the small area detection whole appId-threshold mappings by same size appId and
+ // threshold vector.
// Ref:setSmallAreaDetectionThreshold.
- static status_t updateSmallAreaDetection(std::vector<int32_t>& uids,
+ static status_t updateSmallAreaDetection(std::vector<int32_t>& appIds,
std::vector<float>& thresholds);
- // Sets the small area detection threshold to particular apps (uid). Passing value 0 means
+ // Sets the small area detection threshold to particular apps (appId). Passing value 0 means
// to disable small area detection to the app.
- static status_t setSmallAreaDetectionThreshold(uid_t uid, float threshold);
+ static status_t setSmallAreaDetectionThreshold(int32_t appId, float threshold);
// Switches on/off Auto Low Latency Mode on the connected display. This should only be
// called if the connected display supports Auto Low Latency Mode as reported by
diff --git a/libs/gui/tests/Surface_test.cpp b/libs/gui/tests/Surface_test.cpp
index daed764..edd95ba 100644
--- a/libs/gui/tests/Surface_test.cpp
+++ b/libs/gui/tests/Surface_test.cpp
@@ -999,12 +999,12 @@
binder::Status scheduleCommit() override { return binder::Status::ok(); }
- binder::Status updateSmallAreaDetection(const std::vector<int32_t>& /*uids*/,
+ binder::Status updateSmallAreaDetection(const std::vector<int32_t>& /*appIds*/,
const std::vector<float>& /*thresholds*/) {
return binder::Status::ok();
}
- binder::Status setSmallAreaDetectionThreshold(int32_t /*uid*/, float /*threshold*/) {
+ binder::Status setSmallAreaDetectionThreshold(int32_t /*appId*/, float /*threshold*/) {
return binder::Status::ok();
}