livedisplay: Avoid using::xxxx in header files

* This just makes it confusing where the original definition was, since
  the using::xxxx is transitive for any headers and files that include a
  header with the original definition.

Change-Id: Ib157c98bb140dd701c60ac524a18b07985c81906

7 files changed, 47 insertions, 48 deletions

diff --git a/livedisplay/1.0/default/impl/SDM.cpp b/livedisplay/1.0/default/impl/SDM.cpp
index da7a404..987b7c5 100644
--- a/livedisplay/1.0/default/impl/SDM.cpp
+++ b/livedisplay/1.0/default/impl/SDM.cpp
@@ -88,6 +88,8 @@ namespace implementation {
 
 using ::android::BAD_VALUE;
 using ::android::OK;
+using ::android::sp;
+using ::android::status_t;
 
 status_t SDM::initialize() {
     status_t rc = NO_INIT;
diff --git a/livedisplay/1.0/default/include/Color.h b/livedisplay/1.0/default/include/Color.h
index f862ff1..e6fca65 100644
--- a/livedisplay/1.0/default/include/Color.h
+++ b/livedisplay/1.0/default/include/Color.h
@@ -30,11 +30,9 @@ namespace livedisplay {
 namespace V1_0 {
 namespace implementation {
 
-using ::android::Mutex;
 using ::android::hardware::Return;
 using ::android::hardware::Void;
 using ::android::hardware::hidl_vec;
-using ::android::sp;
 
 using ::vendor::lineage::livedisplay::V1_0::IColor;
 
@@ -42,7 +40,7 @@ class ColorBackend;
 
 class Color : public IColor {
   public:
-    static sp<Color> getInstance();
+    static android::sp<Color> getInstance();
 
     Return<Features> getSupportedFeatures() override;
 
@@ -78,7 +76,7 @@ class Color : public IColor {
     void reset();
 
     Color();
-    static sp<Color> sInstance;
+    static android::sp<Color> sInstance;
 
     uint32_t mFeatures;
     bool mConnected;
@@ -93,7 +91,7 @@ class Color : public IColor {
     };
 
     std::unique_ptr<ColorBackend> mBackend;
-    Mutex mLock;
+    android::Mutex mLock;
 };
 
 }  // namespace implementation
diff --git a/livedisplay/1.0/default/include/ColorBackend.h b/livedisplay/1.0/default/include/ColorBackend.h
index 48c0b6b..4abd11b 100644
--- a/livedisplay/1.0/default/include/ColorBackend.h
+++ b/livedisplay/1.0/default/include/ColorBackend.h
@@ -27,33 +27,30 @@ namespace livedisplay {
 namespace V1_0 {
 namespace implementation {
 
-using ::android::sp;
-using ::android::status_t;
-
 class ColorBackend {
   public:
-    virtual status_t setAdaptiveBacklightEnabled(bool enabled) = 0;
+    virtual android::status_t setAdaptiveBacklightEnabled(bool enabled) = 0;
     virtual bool isAdaptiveBacklightEnabled() = 0;
 
-    virtual status_t setOutdoorModeEnabled(bool enabled) = 0;
+    virtual android::status_t setOutdoorModeEnabled(bool enabled) = 0;
     virtual bool isOutdoorModeEnabled() = 0;
 
-    virtual status_t getColorBalanceRange(Range& range) = 0;
-    virtual status_t setColorBalance(int32_t balance) = 0;
+    virtual android::status_t getColorBalanceRange(Range& range) = 0;
+    virtual android::status_t setColorBalance(int32_t balance) = 0;
     virtual int32_t getColorBalance() = 0;
 
-    virtual status_t getDisplayModes(std::vector<sp<disp_mode>>& profiles) = 0;
-    virtual status_t setDisplayMode(int32_t modeID, bool makeDefault) = 0;
-    virtual sp<disp_mode> getCurrentDisplayMode() = 0;
-    virtual sp<disp_mode> getDefaultDisplayMode() = 0;
+    virtual android::status_t getDisplayModes(std::vector<android::sp<disp_mode>>& profiles) = 0;
+    virtual android::status_t setDisplayMode(int32_t modeID, bool makeDefault) = 0;
+    virtual android::sp<disp_mode> getCurrentDisplayMode() = 0;
+    virtual android::sp<disp_mode> getDefaultDisplayMode() = 0;
 
-    virtual status_t getPictureAdjustmentRanges(HSICRanges& ranges) = 0;
-    virtual status_t getPictureAdjustment(HSIC& hsic) = 0;
+    virtual android::status_t getPictureAdjustmentRanges(HSICRanges& ranges) = 0;
+    virtual android::status_t getPictureAdjustment(HSIC& hsic) = 0;
     virtual HSIC getDefaultPictureAdjustment() = 0;
-    virtual status_t setPictureAdjustment(const HSIC& hsic) = 0;
+    virtual android::status_t setPictureAdjustment(const HSIC& hsic) = 0;
 
-    virtual status_t initialize() = 0;
-    virtual status_t deinitialize() = 0;
+    virtual android::status_t initialize() = 0;
+    virtual android::status_t deinitialize() = 0;
     virtual bool hasFeature(Feature feature) = 0;
 
     virtual ~ColorBackend() {
diff --git a/livedisplay/1.0/default/include/Utils.h b/livedisplay/1.0/default/include/Utils.h
index 497de7d..5da0b13 100644
--- a/livedisplay/1.0/default/include/Utils.h
+++ b/livedisplay/1.0/default/include/Utils.h
@@ -20,8 +20,6 @@
 
 #include <utils/Errors.h>
 
-using ::android::status_t;
-
 namespace vendor {
 namespace lineage {
 namespace livedisplay {
@@ -30,19 +28,19 @@ namespace implementation {
 
 class Utils {
   public:
-    static status_t readInt(const char* node, int32_t* value);
+    static android::status_t readInt(const char* node, int32_t* value);
 
-    static status_t writeInt(const char* node, int32_t value);
+    static android::status_t writeInt(const char* node, int32_t value);
 
-    static status_t sendDPPSCommand(char* buf, size_t len);
+    static android::status_t sendDPPSCommand(char* buf, size_t len);
 
-    static status_t writeLocalModeId(int32_t id);
+    static android::status_t writeLocalModeId(int32_t id);
 
-    static status_t readLocalModeId(int32_t* id);
+    static android::status_t readLocalModeId(int32_t* id);
 
-    static status_t writeInitialModeId(int32_t id);
+    static android::status_t writeInitialModeId(int32_t id);
 
-    static status_t readInitialModeId(int32_t* id);
+    static android::status_t readInitialModeId(int32_t* id);
 };
 
 }  // namespace implementation
diff --git a/livedisplay/1.0/default/include/impl/SDM.h b/livedisplay/1.0/default/include/impl/SDM.h
index 84fe880..7d7bfd0 100644
--- a/livedisplay/1.0/default/include/impl/SDM.h
+++ b/livedisplay/1.0/default/include/impl/SDM.h
@@ -35,49 +35,49 @@ using ::vendor::lineage::livedisplay::V1_0::IColor;
 
 class SDM : public ColorBackend {
   public:
-    virtual status_t getDisplayModes(std::vector<sp<disp_mode>>& profiles) override;
-    virtual sp<disp_mode> getCurrentDisplayMode() override;
-    virtual sp<disp_mode> getDefaultDisplayMode() override;
-    virtual status_t setDisplayMode(int32_t modeID, bool makeDefault) override;
+    virtual android::status_t getDisplayModes(std::vector<android::sp<disp_mode>>& profiles) override;
+    virtual android::sp<disp_mode> getCurrentDisplayMode() override;
+    virtual android::sp<disp_mode> getDefaultDisplayMode() override;
+    virtual android::status_t setDisplayMode(int32_t modeID, bool makeDefault) override;
 
-    virtual status_t setAdaptiveBacklightEnabled(bool enabled) override;
+    virtual android::status_t setAdaptiveBacklightEnabled(bool enabled) override;
     virtual bool isAdaptiveBacklightEnabled() override;
 
-    virtual status_t setOutdoorModeEnabled(bool /* enabled */) override {
+    virtual android::status_t setOutdoorModeEnabled(bool /* enabled */) override {
         return NO_INIT;
     }
     virtual bool isOutdoorModeEnabled() override {
         return false;
     }
 
-    virtual status_t getColorBalanceRange(Range& /* range */) override {
+    virtual android::status_t getColorBalanceRange(Range& /* range */) override {
         return NO_INIT;
     }
     virtual int32_t getColorBalance() override {
         return 0;
     }
-    virtual status_t setColorBalance(int32_t /* balance */) override {
+    virtual android::status_t setColorBalance(int32_t /* balance */) override {
         return NO_INIT;
     }
 
-    virtual status_t getPictureAdjustmentRanges(HSICRanges& ranges) override;
-    virtual status_t setPictureAdjustment(const HSIC& hsic) override;
-    virtual status_t getPictureAdjustment(HSIC& hsic) override;
+    virtual android::status_t getPictureAdjustmentRanges(HSICRanges& ranges) override;
+    virtual android::status_t setPictureAdjustment(const HSIC& hsic) override;
+    virtual android::status_t getPictureAdjustment(HSIC& hsic) override;
     virtual HSIC getDefaultPictureAdjustment() override;
 
     virtual bool hasFeature(Feature f);
-    virtual status_t initialize();
-    virtual status_t deinitialize();
+    virtual android::status_t initialize();
+    virtual android::status_t deinitialize();
 
   private:
-    status_t saveInitialDisplayMode();
+    android::status_t saveInitialDisplayMode();
     uint32_t getNumDisplayModes();
     uint32_t getNumSDMDisplayModes();
 
-    sp<disp_mode> getDisplayModeById(int32_t id);
-    status_t setModeState(sp<disp_mode> mode, bool state);
-    sp<disp_mode> getLocalSRGBMode();
-    sp<disp_mode> getLocalDCIP3Mode();
+    android::sp<disp_mode> getDisplayModeById(int32_t id);
+    android::status_t setModeState(android::sp<disp_mode> mode, bool state);
+    android::sp<disp_mode> getLocalSRGBMode();
+    android::sp<disp_mode> getLocalDCIP3Mode();
 
     uint64_t mHandle;
     bool mFOSSEnabled;
diff --git a/livedisplay/1.0/default/src/Color.cpp b/livedisplay/1.0/default/src/Color.cpp
index b1cca9e..6f2e6b5 100644
--- a/livedisplay/1.0/default/src/Color.cpp
+++ b/livedisplay/1.0/default/src/Color.cpp
@@ -54,8 +54,11 @@ namespace livedisplay {
 namespace V1_0 {
 namespace implementation {
 
+using ::android::Mutex;
 using ::android::NO_INIT;
 using ::android::OK;
+using ::android::sp;
+using ::android::status_t;
 
 sp<Color> Color::sInstance = nullptr;
 
diff --git a/livedisplay/1.0/default/src/Utils.cpp b/livedisplay/1.0/default/src/Utils.cpp
index 683b667..bb14a68 100644
--- a/livedisplay/1.0/default/src/Utils.cpp
+++ b/livedisplay/1.0/default/src/Utils.cpp
@@ -41,6 +41,7 @@ namespace implementation {
 
 using ::android::NO_INIT;
 using ::android::OK;
+using ::android::status_t;
 
 status_t Utils::readInt(const char* node, int32_t* value) {
     std::string buf;