commit 17f3d25884ed43f57c49c8066d771213a4527f87
author Raymond Chiu <chiur@google.com> Mon Feb 10 18:02:27 2020 -0800
committer Raymond Chiu <chiur@google.com> Mon Feb 10 18:02:27 2020 -0800
tree 1661b1faca40f4390728229b6468f39182469dc5
parent f3a06711376f8ffaf3a837381188c6cb37c46d30

Run setenforce 1 on test teardown

Cleanup after test to avoid changing test environment

Fixes: 148917835
Test: SurfaceFlingerTest sffakehwc_test
Change-Id: I5a61401d523302d77c6974befe8ff9844f853c8e

services/surfaceflinger/tests/SurfaceInterceptor_test.cpp

diff --git a/services/surfaceflinger/tests/SurfaceInterceptor_test.cpp b/services/surfaceflinger/tests/SurfaceInterceptor_test.cpp
index 0e7eba8..8d97f27 100644
--- a/services/surfaceflinger/tests/SurfaceInterceptor_test.cpp
+++ b/services/surfaceflinger/tests/SurfaceInterceptor_test.cpp
@@ -145,6 +145,7 @@
         mBGSurfaceControl.clear();
         mFGSurfaceControl.clear();
         mComposerClient.clear();
+        system("setenforce 1");
     }
 
     sp<SurfaceComposerClient> mComposerClient;

services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp

diff --git a/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp b/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp
index 2f89696..96a7541 100644
--- a/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp
+++ b/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp
@@ -183,6 +183,7 @@
     // Wait for mock call signaling teardown?
     property_set("debug.sf.nobootanimation", "0");
     property_set("debug.sf.hwc_service_name", "default");
+    system("setenforce 1");
     ALOGI("Test env tear down - done");
 }