commit 059b153d5f8c7a3247227830c3b564fad56440bf
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 15 08:36:12 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 15 08:36:12 2020 +0000
tree 93abafccb75c1bef3bc7cc20be68a717fec8915b
parent c9c9a268e6939e3295aceac33f203723aaeacc7a
parent 0ff8bc9d517927e25017800267c713c97a1c0889

Merge "Freeze SurfaceFlingerProperties API"

services/surfaceflinger/CompositionEngine/tests/CompositionEngineTest.cpp

diff --git a/services/surfaceflinger/CompositionEngine/tests/CompositionEngineTest.cpp b/services/surfaceflinger/CompositionEngine/tests/CompositionEngineTest.cpp
index d889d74..d5bf569 100644
--- a/services/surfaceflinger/CompositionEngine/tests/CompositionEngineTest.cpp
+++ b/services/surfaceflinger/CompositionEngine/tests/CompositionEngineTest.cpp
@@ -30,6 +30,7 @@
 namespace {
 
 using ::testing::_;
+using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::Ref;
 using ::testing::Return;

services/surfaceflinger/sysprop/SurfaceFlingerProperties.sysprop

diff --git a/services/surfaceflinger/sysprop/SurfaceFlingerProperties.sysprop b/services/surfaceflinger/sysprop/SurfaceFlingerProperties.sysprop
index 7b1f0fb..7666f7f 100644
--- a/services/surfaceflinger/sysprop/SurfaceFlingerProperties.sysprop
+++ b/services/surfaceflinger/sysprop/SurfaceFlingerProperties.sysprop
@@ -72,7 +72,7 @@
 prop {
     api_name: "max_graphics_width"
     type: Integer
-    scope: System
+    scope: Public
     access: Readonly
     prop_name: "ro.surface_flinger.max_graphics_width"
 }
@@ -82,7 +82,7 @@
 prop {
     api_name: "max_graphics_height"
     type: Integer
-    scope: System
+    scope: Public
     access: Readonly
     prop_name: "ro.surface_flinger.max_graphics_height"
 }