commit dbb6dcfdde95318dc9b6090d70233d106c77ec92
author Ady Abraham <adyabr@google.com> Mon Dec 28 22:22:12 2020 +0000
committer Ady Abraham <adyabr@google.com> Mon Dec 28 14:31:21 2020 -0800
tree 38284e2b0a6e38da7607b42928ea1fe82b754da2
parent 13197182489ab3ed4ff4a57c685d40b35f0feaab

Revert "SurfaceFlinger: override frame rate for applications that use setFrameRate"

This reverts commit 2c6716b58f05c9de26868677001b901c5948afde.

Reason for revert: Causes a deadlock in SurfaceFlinger: b/176299745

Change-Id: I20402c3d97eb0fad4270e1fd2147ca66c4f6bc84

services/surfaceflinger/Layer.h

diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index d6023b6..bc581c2 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -883,7 +883,7 @@
      */
     bool hasInputInfo() const;
 
-    virtual uid_t getOwnerUid() const { return mOwnerUid; }
+    uid_t getOwnerUid() { return mOwnerUid; }
 
     pid_t getOwnerPid() { return mOwnerPid; }