diff options
| author | Christopher Wiley <wiley@google.com> | 2016-04-13 15:19:30 -0700 |
|---|---|---|
| committer | Christopher Wiley <wiley@google.com> | 2016-04-13 15:19:30 -0700 |
| commit | 9aa94ce9ee7680ca776483a5215b7d74bedc38f7 (patch) | |
| tree | 7dec2d1d966498d86a5d10d2f021b49aa9bff5c6 | |
| parent | 4d0acca2374437bab19e6640ff7141fbc557723d (diff) | |
| download | common-9aa94ce9ee7680ca776483a5215b7d74bedc38f7.tar.gz | |
Stop using android namespace
This polutes the global namespace and causes problems when libchrome
and libbase bring ::base and ::android::base into view.
Bug: 28117776
Change-Id: I146f696b0329e79a07abd2c383cfb5bbed4717ba
Test: Compiles
| -rw-r--r-- | brillo_camera/main.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/brillo_camera/main.cpp b/brillo_camera/main.cpp index 244c7e9..6d5a3f8 100644 --- a/brillo_camera/main.cpp +++ b/brillo_camera/main.cpp @@ -42,7 +42,21 @@ #include <utils/String8.h> #include <utils/StrongPointer.h> -using namespace android; +using android::BnCameraDeviceCallbacks; +using android::BufferQueue; +using android::CameraMetadata; +using android::CaptureRequest; +using android::CaptureResultExtras; +using android::CpuConsumer; +using android::ICameraDeviceCallbacks; +using android::ICameraDeviceUser; +using android::ICameraService; +using android::IGraphicBufferConsumer; +using android::IGraphicBufferProducer; +using android::OK; +using android::String16; +using android::Surface; +using android::sp; namespace { |