commit 8b8dc0b668f5385584d1e176e146f700e41274ea
author Dominik Laskowski <domlaskowski@google.com> Sat Jan 26 22:23:10 2019 -0800
committer Dominik Laskowski <domlaskowski@google.com> Tue Jan 29 14:11:01 2019 -0800
tree 29ae99684e3b7f6fcde28c7ddbe7d95631cbbfcf
parent a29fa8700fc275801bfc4a4ba1a24e106fff7bed

evs: Use getInternalDisplayToken API

Bug: 116025192
Test: Build
Change-Id: I84440183b8b87c16773b0230da2c600ef6ee07de

evs/app/WindowSurface.cpp

diff --git a/evs/app/WindowSurface.cpp b/evs/app/WindowSurface.cpp
index 04e7ac4..dbd245b 100644
--- a/evs/app/WindowSurface.cpp
+++ b/evs/app/WindowSurface.cpp
@@ -34,8 +34,12 @@
     }
 
     // Get main display parameters.
-    sp<IBinder> mainDpy = SurfaceComposerClient::getBuiltInDisplay(
-            ISurfaceComposer::eDisplayIdMain);
+    sp<IBinder> mainDpy = SurfaceComposerClient::getInternalDisplayToken();
+    if (mainDpy == nullptr) {
+        fprintf(stderr, "ERROR: no internal display\n");
+        return;
+    }
+
     DisplayInfo mainDpyInfo;
     err = SurfaceComposerClient::getDisplayInfo(mainDpy, &mainDpyInfo);
     if (err != NO_ERROR) {

evs/sampleDriver/GlWrapper.cpp

diff --git a/evs/sampleDriver/GlWrapper.cpp b/evs/sampleDriver/GlWrapper.cpp
index fbd36a2..84e06df 100644
--- a/evs/sampleDriver/GlWrapper.cpp
+++ b/evs/sampleDriver/GlWrapper.cpp
@@ -207,8 +207,12 @@
     }
 
     // Get main display parameters.
-    sp <IBinder> mainDpy = SurfaceComposerClient::getBuiltInDisplay(
-            ISurfaceComposer::eDisplayIdMain);
+    sp<IBinder> mainDpy = SurfaceComposerClient::getInternalDisplayToken();
+    if (mainDpy == nullptr) {
+        ALOGE("ERROR: no internal display");
+        return false;
+    }
+
     DisplayInfo mainDpyInfo;
     err = SurfaceComposerClient::getDisplayInfo(mainDpy, &mainDpyInfo);
     if (err != NO_ERROR) {