Merge "Adding feature flag to enable new external proximity sensor API" into main
diff --git a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java
index aa80612..5cfbf26 100644
--- a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java
+++ b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java
@@ -86,6 +86,10 @@
Flags.FLAG_BRIGHTNESS_INT_RANGE_USER_PERCEPTION,
Flags::brightnessIntRangeUserPerception);
+ private final FlagState mVsyncProximityVote = new FlagState(
+ Flags.FLAG_ENABLE_EXTERNAL_VSYNC_PROXIMITY_VOTE,
+ Flags::enableExternalVsyncProximityVote);
+
/** Returns whether connected display management is enabled or not. */
public boolean isConnectedDisplayManagementEnabled() {
return mConnectedDisplayManagementFlagState.isEnabled();
@@ -170,6 +174,10 @@
return mBrightnessIntRangeUserPerceptionFlagState.isEnabled();
}
+ public boolean isExternalVsyncProximityVoteEnabled() {
+ return mVsyncProximityVote.isEnabled();
+ }
+
/**
* dumps all flagstates
* @param pw printWriter
@@ -188,6 +196,7 @@
pw.println(" " + mPowerThrottlingClamperFlagState);
pw.println(" " + mSmallAreaDetectionFlagState);
pw.println(" " + mBrightnessIntRangeUserPerceptionFlagState);
+ pw.println(" " + mVsyncProximityVote);
}
private static class FlagState {
diff --git a/services/core/java/com/android/server/display/feature/display_flags.aconfig b/services/core/java/com/android/server/display/feature/display_flags.aconfig
index e28b415..d95bdae 100644
--- a/services/core/java/com/android/server/display/feature/display_flags.aconfig
+++ b/services/core/java/com/android/server/display/feature/display_flags.aconfig
@@ -112,3 +112,11 @@
bug: "183655602"
is_fixed_read_only: true
}
+
+flag {
+ name: "enable_external_vsync_proximity_vote"
+ namespace: "display_manager"
+ description: "Feature flag for external vsync proximity vote"
+ bug: "284866750"
+ is_fixed_read_only: true
+}