diff options
| author | Siarhei Vishniakou <svv@google.com> | 2018-07-06 11:50:18 +0100 |
|---|---|---|
| committer | Siarhei Vishniakou <svv@google.com> | 2018-07-11 09:56:43 +0100 |
| commit | 8027876f9f6d97aad280cd0f0da7739c46a314b6 (patch) | |
| tree | 1dcfc46703e30fb2fa7dc4ed03f622855fac75ea /libs/input | |
| parent | 89b325a9b9127a43a96be1df1992a84404217d23 (diff) | |
Refactor String8 to std::string calls
DisplayViewport::uniqueId is now std::string, so change the calls
appropriately. Do some additional cleanups and conversions.
This almost completely removes the dependency on String8.
Test: build only
Bug: 111108021
Change-Id: Ibbb6ca59e9061954d4a5fb930ef03d42cb0230db
Diffstat (limited to 'libs/input')
| -rw-r--r-- | libs/input/Android.bp | 3 | ||||
| -rw-r--r-- | libs/input/PointerController.h | 1 | ||||
| -rw-r--r-- | libs/input/SpriteController.cpp | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/libs/input/Android.bp b/libs/input/Android.bp index 67682a06cb6a..c5a6ec590d30 100644 --- a/libs/input/Android.bp +++ b/libs/input/Android.bp @@ -36,9 +36,8 @@ cc_library_shared { cflags: [ "-Wall", + "-Wextra", "-Werror", - "-Wunused", - "-Wunreachable-code", ], } diff --git a/libs/input/PointerController.h b/libs/input/PointerController.h index 4794f3da824c..eb3469e0b3f0 100644 --- a/libs/input/PointerController.h +++ b/libs/input/PointerController.h @@ -28,7 +28,6 @@ #include <utils/BitSet.h> #include <utils/RefBase.h> #include <utils/Looper.h> -#include <utils/String8.h> #include <gui/DisplayEventReceiver.h> namespace android { diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp index 173cd507d943..eb2bc98ec9e9 100644 --- a/libs/input/SpriteController.cpp +++ b/libs/input/SpriteController.cpp @@ -23,14 +23,10 @@ #include <utils/String8.h> #include <gui/Surface.h> -// ToDo: Fix code to be warning free -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" #include <SkBitmap.h> #include <SkCanvas.h> #include <SkColor.h> #include <SkPaint.h> -#pragma GCC diagnostic pop #include <android/native_window.h> |