Move android::hidl to android::hardware.
Also moved Status and PersistableBundle out of their
respective 'binder' and 'os' namespaces.
Bug: 30507513
Change-Id: I8822070049a9c1b1b89753aaeb148b05b2aa851d
diff --git a/Binder.cpp b/Binder.cpp
index d0a09f8..1471c9c 100644
--- a/Binder.cpp
+++ b/Binder.cpp
@@ -25,7 +25,7 @@
#include <stdio.h>
namespace android {
-namespace hidl {
+namespace hardware {
// ---------------------------------------------------------------------------
@@ -273,5 +273,5 @@
// ---------------------------------------------------------------------------
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
diff --git a/BpBinder.cpp b/BpBinder.cpp
index ff7a572..25e9010 100644
--- a/BpBinder.cpp
+++ b/BpBinder.cpp
@@ -28,7 +28,7 @@
//#define ALOGV(...) fprintf(stderr, __VA_ARGS__)
namespace android {
-namespace hidl {
+namespace hardware {
// ---------------------------------------------------------------------------
@@ -362,5 +362,5 @@
// ---------------------------------------------------------------------------
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
diff --git a/BufferedTextOutput.cpp b/BufferedTextOutput.cpp
index 5cd62a3..b49f4b4 100644
--- a/BufferedTextOutput.cpp
+++ b/BufferedTextOutput.cpp
@@ -31,7 +31,7 @@
// ---------------------------------------------------------------------------
namespace android {
-namespace hidl {
+namespace hardware {
struct BufferedTextOutput::BufferState : public RefBase
{
@@ -280,5 +280,5 @@
return mGlobalState;
}
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
diff --git a/Debug.cpp b/Debug.cpp
index 8175fef..ea7e9b7 100644
--- a/Debug.cpp
+++ b/Debug.cpp
@@ -23,7 +23,7 @@
#include <ctype.h>
namespace android {
-namespace hidl {
+namespace hardware {
// ---------------------------------------------------------------------
@@ -295,6 +295,6 @@
}
}
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
diff --git a/IInterface.cpp b/IInterface.cpp
index c52e8e0..b22879d 100644
--- a/IInterface.cpp
+++ b/IInterface.cpp
@@ -19,7 +19,7 @@
#include <hwbinder/IInterface.h>
namespace android {
-namespace hidl {
+namespace hardware {
// ---------------------------------------------------------------------------
@@ -47,5 +47,5 @@
// ---------------------------------------------------------------------------
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
diff --git a/IPCThreadState.cpp b/IPCThreadState.cpp
index 6e759ad..4b56fce 100644
--- a/IPCThreadState.cpp
+++ b/IPCThreadState.cpp
@@ -63,7 +63,7 @@
// ---------------------------------------------------------------------------
namespace android {
-namespace hidl {
+namespace hardware {
static const char* getReturnString(size_t idx);
static const void* printReturnCommand(TextOutput& out, const void* _cmd);
@@ -1234,5 +1234,5 @@
state->mOut.writePointer((uintptr_t)data);
}
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
diff --git a/IServiceManager.cpp b/IServiceManager.cpp
index b74bc90..5830c19 100644
--- a/IServiceManager.cpp
+++ b/IServiceManager.cpp
@@ -27,10 +27,10 @@
#include <unistd.h>
-using android::hidl::hidl_version;
+using android::hardware::hidl_version;
namespace android {
-namespace hidl {
+namespace hardware {
sp<IServiceManager> defaultServiceManager()
{
@@ -113,7 +113,7 @@
}
};
-IMPLEMENT_HWBINDER_META_INTERFACE(ServiceManager, "android.os.IServiceManager");
+IMPLEMENT_HWBINDER_META_INTERFACE(ServiceManager, "android.hardware.IServiceManager");
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
diff --git a/Parcel.cpp b/Parcel.cpp
index 2ff5e03..66762e9 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -84,7 +84,7 @@
};
namespace android {
-namespace hidl {
+namespace hardware {
static pthread_mutex_t gParcelGlobalAllocSizeLock = PTHREAD_MUTEX_INITIALIZER;
static size_t gParcelGlobalAllocSize = 0;
@@ -1457,7 +1457,7 @@
status_t Parcel::writeNoException()
{
- binder::Status status;
+ Status status;
return status.writeToParcel(this);
}
@@ -2059,7 +2059,7 @@
int32_t Parcel::readExceptionCode() const
{
- binder::Status status;
+ Status status;
status.readFromParcel(*this);
return status.exceptionCode();
}
@@ -2811,5 +2811,5 @@
mMutable = false;
}
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
diff --git a/PersistableBundle.cpp b/PersistableBundle.cpp
index 507679e..4146759 100644
--- a/PersistableBundle.cpp
+++ b/PersistableBundle.cpp
@@ -28,7 +28,6 @@
using android::BAD_TYPE;
using android::BAD_VALUE;
using android::NO_ERROR;
-using android::hidl::Parcel;
using android::sp;
using android::status_t;
using android::UNEXPECTED_NULL;
@@ -77,8 +76,7 @@
} // namespace
namespace android {
-namespace hidl {
-namespace os {
+namespace hardware {
#define RETURN_IF_FAILED(calledOnce) \
{ \
@@ -486,6 +484,5 @@
return NO_ERROR;
}
-} // namespace os
-} // namespace hidl
+} // namespace hardware
} // namespace android
diff --git a/ProcessState.cpp b/ProcessState.cpp
index 99a1c93..e656dc0 100644
--- a/ProcessState.cpp
+++ b/ProcessState.cpp
@@ -48,7 +48,7 @@
// -------------------------------------------------------------------------
namespace android {
-namespace hidl {
+namespace hardware {
class PoolThread : public Thread
{
@@ -376,5 +376,5 @@
mDriverFD = -1;
}
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
diff --git a/Static.cpp b/Static.cpp
index dfc6083..bd8216b 100644
--- a/Static.cpp
+++ b/Static.cpp
@@ -24,7 +24,7 @@
#include <utils/Log.h>
namespace android {
-namespace hidl {
+namespace hardware {
// ------------ Text output streams
@@ -96,5 +96,5 @@
Mutex gDefaultServiceManagerLock;
sp<IServiceManager> gDefaultServiceManager;
-} // namespace hidl
+} // namespace hardware
} // namespace android
diff --git a/Status.cpp b/Status.cpp
index 1d30050..fe4fcbf 100644
--- a/Status.cpp
+++ b/Status.cpp
@@ -17,8 +17,7 @@
#include <hwbinder/Status.h>
namespace android {
-namespace hidl {
-namespace binder {
+namespace hardware {
Status Status::ok() {
return Status();
@@ -164,6 +163,5 @@
return stream;
}
-} // namespace binder
-} // namespace hidl
+} // namespace hardware
} // namespace android
diff --git a/TextOutput.cpp b/TextOutput.cpp
index 6a38b60..b3f78bc 100644
--- a/TextOutput.cpp
+++ b/TextOutput.cpp
@@ -26,7 +26,7 @@
#include <string.h>
namespace android {
-namespace hidl {
+namespace hardware {
// ---------------------------------------------------------------------------
@@ -167,5 +167,5 @@
return to;
}
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
diff --git a/include/hwbinder/Binder.h b/include/hwbinder/Binder.h
index 4e7e458..34fa85c 100644
--- a/include/hwbinder/Binder.h
+++ b/include/hwbinder/Binder.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_BINDER_H
-#define ANDROID_HIDL_BINDER_H
+#ifndef ANDROID_HARDWARE_BINDER_H
+#define ANDROID_HARDWARE_BINDER_H
#include <atomic>
#include <stdint.h>
@@ -23,7 +23,7 @@
// ---------------------------------------------------------------------------
namespace android {
-namespace hidl {
+namespace hardware {
class BBinder : public IBinder
{
@@ -101,9 +101,9 @@
std::atomic<int32_t> mState;
};
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
// ---------------------------------------------------------------------------
-#endif // ANDROID_HIDL_BINDER_H
+#endif // ANDROID_HARDWARE_BINDER_H
diff --git a/include/hwbinder/BinderService.h b/include/hwbinder/BinderService.h
index 11de982..160c5a7 100644
--- a/include/hwbinder/BinderService.h
+++ b/include/hwbinder/BinderService.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_BINDER_SERVICE_H
-#define ANDROID_HIDL_BINDER_SERVICE_H
+#ifndef ANDROID_HARDWARE_BINDER_SERVICE_H
+#define ANDROID_HARDWARE_BINDER_SERVICE_H
#include <stdint.h>
@@ -29,7 +29,7 @@
// ---------------------------------------------------------------------------
namespace android {
-namespace hidl {
+namespace hardware {
template<typename SERVICE>
class BinderService
@@ -60,7 +60,7 @@
}
};
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
// ---------------------------------------------------------------------------
-#endif // ANDROID_HIDL_BINDER_SERVICE_H
+#endif // ANDROID_HARDWARE_BINDER_SERVICE_H
diff --git a/include/hwbinder/BpBinder.h b/include/hwbinder/BpBinder.h
index c79fde4..ccd1f0d 100644
--- a/include/hwbinder/BpBinder.h
+++ b/include/hwbinder/BpBinder.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_BPBINDER_H
-#define ANDROID_HIDL_BPBINDER_H
+#ifndef ANDROID_HARDWARE_BPBINDER_H
+#define ANDROID_HARDWARE_BPBINDER_H
#include <hwbinder/IBinder.h>
#include <utils/KeyedVector.h>
@@ -23,7 +23,7 @@
// ---------------------------------------------------------------------------
namespace android {
-namespace hidl {
+namespace hardware {
class BpBinder : public IBinder
{
@@ -119,9 +119,9 @@
mutable String16 mDescriptorCache;
};
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
// ---------------------------------------------------------------------------
-#endif // ANDROID_HIDL_BPBINDER_H
+#endif // ANDROID_HARDWARE_BPBINDER_H
diff --git a/include/hwbinder/BufferedTextOutput.h b/include/hwbinder/BufferedTextOutput.h
index 2ae5c29..73ba6e0 100644
--- a/include/hwbinder/BufferedTextOutput.h
+++ b/include/hwbinder/BufferedTextOutput.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_BUFFEREDTEXTOUTPUT_H
-#define ANDROID_HIDL_BUFFEREDTEXTOUTPUT_H
+#ifndef ANDROID_HARDWARE_BUFFEREDTEXTOUTPUT_H
+#define ANDROID_HARDWARE_BUFFEREDTEXTOUTPUT_H
#include <hwbinder/TextOutput.h>
#include <utils/threads.h>
@@ -23,7 +23,7 @@
// ---------------------------------------------------------------------------
namespace android {
-namespace hidl {
+namespace hardware {
class BufferedTextOutput : public TextOutput
{
@@ -63,7 +63,7 @@
};
// ---------------------------------------------------------------------------
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
-#endif // ANDROID_HIDL_BUFFEREDTEXTOUTPUT_H
+#endif // ANDROID_HARDWARE_BUFFEREDTEXTOUTPUT_H
diff --git a/include/hwbinder/Debug.h b/include/hwbinder/Debug.h
index 1704daa..2848d5d 100644
--- a/include/hwbinder/Debug.h
+++ b/include/hwbinder/Debug.h
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_BINDER_DEBUG_H
-#define ANDROID_HIDL_BINDER_DEBUG_H
+#ifndef ANDROID_HARDWARE_BINDER_DEBUG_H
+#define ANDROID_HARDWARE_BINDER_DEBUG_H
#include <stdint.h>
#include <sys/types.h>
namespace android {
-namespace hidl {
+namespace hardware {
// ---------------------------------------------------------------------------
#ifdef __cplusplus
@@ -45,7 +45,7 @@
#endif
// ---------------------------------------------------------------------------
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
-#endif // ANDROID_HIDL_BINDER_DEBUG_H
+#endif // ANDROID_HARDWARE_BINDER_DEBUG_H
diff --git a/include/hwbinder/Hidl.h b/include/hwbinder/Hidl.h
index 30a4e47..69f42a5 100644
--- a/include/hwbinder/Hidl.h
+++ b/include/hwbinder/Hidl.h
@@ -15,28 +15,28 @@
*/
//
-#ifndef ANDROID_HIDL_HIDL_H
-#define ANDROID_HIDL_HIDL_H
+#ifndef ANDROID_HARDWARE_HIDL_H
+#define ANDROID_HARDWARE_HIDL_H
#include <cutils/ashmem.h>
#include <sys/mman.h>
namespace android {
-namespace hidl {
+namespace hardware {
// ----------------------------------------------------------------------
// Version functions
// TODO probably nicer to make this a struct
typedef uint32_t hidl_version;
-inline android::hidl::hidl_version make_hidl_version(uint16_t major, uint16_t minor) {
+inline android::hardware::hidl_version make_hidl_version(uint16_t major, uint16_t minor) {
return (uint32_t) major << 16 | minor;
}
-inline uint16_t get_major_hidl_version(android::hidl::hidl_version version) {
+inline uint16_t get_major_hidl_version(android::hardware::hidl_version version) {
return version >> 16;
}
-inline uint16_t get_minor_hidl_version(android::hidl::hidl_version version) {
+inline uint16_t get_minor_hidl_version(android::hardware::hidl_version version) {
return version & 0x0000FFFF;
}
@@ -77,7 +77,7 @@
return 0;
}
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
-#endif // ANDROID_HIDL_HIDL_H
+#endif // ANDROID_HARDWARE_HIDL_H
diff --git a/include/hwbinder/IBinder.h b/include/hwbinder/IBinder.h
index 367594c..b424042 100644
--- a/include/hwbinder/IBinder.h
+++ b/include/hwbinder/IBinder.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_IBINDER_H
-#define ANDROID_HIDL_IBINDER_H
+#ifndef ANDROID_HARDWARE_IBINDER_H
+#define ANDROID_HARDWARE_IBINDER_H
#include <functional>
@@ -34,7 +34,7 @@
// ---------------------------------------------------------------------------
namespace android {
-namespace hidl {
+namespace hardware {
class BBinder;
class BpBinder;
@@ -156,9 +156,9 @@
private:
};
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
// ---------------------------------------------------------------------------
-#endif // ANDROID_HIDL_IBINDER_H
+#endif // ANDROID_HARDWARE_IBINDER_H
diff --git a/include/hwbinder/IInterface.h b/include/hwbinder/IInterface.h
index ff7bd02..77679a4 100644
--- a/include/hwbinder/IInterface.h
+++ b/include/hwbinder/IInterface.h
@@ -15,13 +15,13 @@
*/
//
-#ifndef ANDROID_HIDL_IINTERFACE_H
-#define ANDROID_HIDL_IINTERFACE_H
+#ifndef ANDROID_HARDWARE_IINTERFACE_H
+#define ANDROID_HARDWARE_IINTERFACE_H
#include <hwbinder/Binder.h>
namespace android {
-namespace hidl {
+namespace hardware {
// ----------------------------------------------------------------------
class IInterface : public virtual RefBase
@@ -74,7 +74,7 @@
#define DECLARE_HWBINDER_META_INTERFACE(INTERFACE) \
static const android::String16 descriptor; \
static android::sp<I##INTERFACE> asInterface( \
- const android::sp<android::hidl::IBinder>& obj); \
+ const android::sp<android::hardware::IBinder>& obj); \
virtual const android::String16& getInterfaceDescriptor() const; \
I##INTERFACE(); \
virtual ~I##INTERFACE(); \
@@ -87,7 +87,7 @@
return I##INTERFACE::descriptor; \
} \
android::sp<I##INTERFACE> I##INTERFACE::asInterface( \
- const android::sp<android::hidl::IBinder>& obj) \
+ const android::sp<android::hardware::IBinder>& obj) \
{ \
android::sp<I##INTERFACE> intr; \
if (obj != NULL) { \
@@ -145,7 +145,7 @@
// ----------------------------------------------------------------------
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
-#endif // ANDROID_HIDL_IINTERFACE_H
+#endif // ANDROID_HARDWARE_IINTERFACE_H
diff --git a/include/hwbinder/IPCThreadState.h b/include/hwbinder/IPCThreadState.h
index 59cc09d..ef01805 100644
--- a/include/hwbinder/IPCThreadState.h
+++ b/include/hwbinder/IPCThreadState.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_IPC_THREAD_STATE_H
-#define ANDROID_HIDL_IPC_THREAD_STATE_H
+#ifndef ANDROID_HARDWARE_IPC_THREAD_STATE_H
+#define ANDROID_HARDWARE_IPC_THREAD_STATE_H
#include <utils/Errors.h>
#include <hwbinder/Parcel.h>
@@ -28,7 +28,7 @@
// ---------------------------------------------------------------------------
namespace android {
-namespace hidl {
+namespace hardware {
class IPCThreadState
{
@@ -132,9 +132,9 @@
sp<BBinder> mContextObject;
};
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
// ---------------------------------------------------------------------------
-#endif // ANDROID_HIDL_IPC_THREAD_STATE_H
+#endif // ANDROID_HARDWARE_IPC_THREAD_STATE_H
diff --git a/include/hwbinder/IServiceManager.h b/include/hwbinder/IServiceManager.h
index 7f154e5..08e84f4 100644
--- a/include/hwbinder/IServiceManager.h
+++ b/include/hwbinder/IServiceManager.h
@@ -15,15 +15,15 @@
*/
//
-#ifndef ANDROID_HIDL_ISERVICE_MANAGER_H
-#define ANDROID_HIDL_ISERVICE_MANAGER_H
+#ifndef ANDROID_HARDWARE_ISERVICE_MANAGER_H
+#define ANDROID_HARDWARE_ISERVICE_MANAGER_H
#include <hwbinder/IInterface.h>
#include <hwbinder/Hidl.h>
#include <utils/String16.h>
namespace android {
-namespace hidl {
+namespace hardware {
// ----------------------------------------------------------------------
class IServiceManager : public IInterface
@@ -36,14 +36,14 @@
* if it doesn't yet exist.
*/
virtual sp<IBinder> getService( const String16& name,
- const android::hidl::hidl_version version
+ const android::hardware::hidl_version version
) const = 0;
/**
* Retrieve an existing service, non-blocking.
*/
virtual sp<IBinder> checkService( const String16& name,
- const android::hidl::hidl_version version
+ const android::hardware::hidl_version version
) const = 0;
/**
@@ -51,7 +51,7 @@
*/
virtual status_t addService( const String16& name,
const sp<IBinder>& service,
- const android::hidl::hidl_version version,
+ const android::hardware::hidl_version version,
bool allowIsolated = false) = 0;
enum {
@@ -65,7 +65,7 @@
sp<IServiceManager> defaultServiceManager();
template<typename INTERFACE>
-status_t getService(const String16& name, android::hidl::hidl_version version,
+status_t getService(const String16& name, android::hardware::hidl_version version,
sp<INTERFACE>* outService)
{
const sp<IServiceManager> sm = defaultServiceManager();
@@ -76,8 +76,8 @@
return NAME_NOT_FOUND;
}
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
-#endif // ANDROID_HIDL_ISERVICE_MANAGER_H
+#endif // ANDROID_HARDWARE_ISERVICE_MANAGER_H
diff --git a/include/hwbinder/Parcel.h b/include/hwbinder/Parcel.h
index fbf5e9b..f1957c2 100644
--- a/include/hwbinder/Parcel.h
+++ b/include/hwbinder/Parcel.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_PARCEL_H
-#define ANDROID_HIDL_PARCEL_H
+#ifndef ANDROID_HARDWARE_PARCEL_H
+#define ANDROID_HARDWARE_PARCEL_H
#include <string>
#include <vector>
@@ -36,7 +36,7 @@
// ---------------------------------------------------------------------------
namespace android {
class String8;
-namespace hidl {
+namespace hardware {
template <typename T> class Flattenable;
template <typename T> class LightFlattenable;
@@ -819,9 +819,9 @@
status_t unflatten_binder(const sp<ProcessState>& proc,
const flat_binder_object& flat, wp<IBinder>* out);
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
// ---------------------------------------------------------------------------
-#endif // ANDROID_HIDL_PARCEL_H
+#endif // ANDROID_HARDWARE_PARCEL_H
diff --git a/include/hwbinder/Parcelable.h b/include/hwbinder/Parcelable.h
index b75a2b0..48daabe 100644
--- a/include/hwbinder/Parcelable.h
+++ b/include/hwbinder/Parcelable.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_PARCELABLE_H
-#define ANDROID_HIDL_PARCELABLE_H
+#ifndef ANDROID_HARDWARE_PARCELABLE_H
+#define ANDROID_HARDWARE_PARCELABLE_H
#include <vector>
@@ -23,7 +23,7 @@
#include <utils/String16.h>
namespace android {
-namespace hidl {
+namespace hardware {
class Parcel;
@@ -47,7 +47,7 @@
virtual status_t readFromParcel(const Parcel* parcel) = 0;
}; // class Parcelable
-} // namespace hidl
+} // namespace hardware
} // namespace android
-#endif // ANDROID_HIDL_PARCELABLE_H
+#endif // ANDROID_HARDWARE_PARCELABLE_H
diff --git a/include/hwbinder/PersistableBundle.h b/include/hwbinder/PersistableBundle.h
index 2428568..facb933 100644
--- a/include/hwbinder/PersistableBundle.h
+++ b/include/hwbinder/PersistableBundle.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_PERSISTABLE_BUNDLE_H
-#define ANDROID_HIDL_PERSISTABLE_BUNDLE_H
+#ifndef ANDROID_HARDWARE_PERSISTABLE_BUNDLE_H
+#define ANDROID_HARDWARE_PERSISTABLE_BUNDLE_H
#include <map>
#include <set>
@@ -26,8 +26,7 @@
#include <utils/StrongPointer.h>
namespace android {
-namespace hidl {
-namespace os {
+namespace hardware {
/*
* C++ implementation of PersistableBundle, a mapping from String values to
@@ -125,8 +124,7 @@
std::map<String16, PersistableBundle> mPersistableBundleMap;
};
-} // namespace os
-} // namespace hidl
+} // namespace hardware
} // namespace android
#endif // ANDROID_PERSISTABLE_BUNDLE_H
diff --git a/include/hwbinder/ProcessState.h b/include/hwbinder/ProcessState.h
index 86af7b0..11e5123 100644
--- a/include/hwbinder/ProcessState.h
+++ b/include/hwbinder/ProcessState.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_PROCESS_STATE_H
-#define ANDROID_HIDL_PROCESS_STATE_H
+#ifndef ANDROID_HARDWARE_PROCESS_STATE_H
+#define ANDROID_HARDWARE_PROCESS_STATE_H
#include <hwbinder/IBinder.h>
#include <utils/KeyedVector.h>
@@ -28,7 +28,7 @@
// ---------------------------------------------------------------------------
namespace android {
-namespace hidl {
+namespace hardware {
class IPCThreadState;
@@ -112,9 +112,9 @@
volatile int32_t mThreadPoolSeq;
};
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
// ---------------------------------------------------------------------------
-#endif // ANDROID_HIDL_PROCESS_STATE_H
+#endif // ANDROID_HARDWARE_PROCESS_STATE_H
diff --git a/include/hwbinder/Static.h b/include/hwbinder/Static.h
index 22707e9..6dcf76f 100644
--- a/include/hwbinder/Static.h
+++ b/include/hwbinder/Static.h
@@ -24,7 +24,7 @@
#include <hwbinder/IServiceManager.h>
namespace android {
-namespace hidl {
+namespace hardware {
// For TextStream.cpp
extern Vector<int32_t> gTextBuffers;
@@ -37,5 +37,5 @@
extern Mutex gDefaultServiceManagerLock;
extern sp<IServiceManager> gDefaultServiceManager;
-} // namespace hidl
+} // namespace hardware
} // namespace android
diff --git a/include/hwbinder/Status.h b/include/hwbinder/Status.h
index 2f98bbc..f373599 100644
--- a/include/hwbinder/Status.h
+++ b/include/hwbinder/Status.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_BINDER_STATUS_H
-#define ANDROID_HIDL_BINDER_STATUS_H
+#ifndef ANDROID_HARDWARE_BINDER_STATUS_H
+#define ANDROID_HARDWARE_BINDER_STATUS_H
#include <cstdint>
#include <sstream>
@@ -24,8 +24,7 @@
#include <utils/String8.h>
namespace android {
-namespace hidl {
-namespace binder {
+namespace hardware {
// An object similar in function to a status_t except that it understands
// how exceptions are encoded in the prefix of a Parcel. Used like:
@@ -146,8 +145,7 @@
// For gtest output logging
std::stringstream& operator<< (std::stringstream& stream, const Status& s);
-} // namespace binder
-} // namespace hidl
+} // namespace hardware
} // namespace android
-#endif // ANDROID_HIDL_BINDER_STATUS_H
+#endif // ANDROID_HARDWARE_BINDER_STATUS_H
diff --git a/include/hwbinder/TextOutput.h b/include/hwbinder/TextOutput.h
index 7273a32..d24e325 100644
--- a/include/hwbinder/TextOutput.h
+++ b/include/hwbinder/TextOutput.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_TEXTOUTPUT_H
-#define ANDROID_HIDL_TEXTOUTPUT_H
+#ifndef ANDROID_HARDWARE_TEXTOUTPUT_H
+#define ANDROID_HARDWARE_TEXTOUTPUT_H
#include <utils/Errors.h>
@@ -26,7 +26,7 @@
namespace android {
class String8;
class String16;
-namespace hidl {
+namespace hardware {
class TextOutput
{
@@ -190,7 +190,7 @@
inline bool HexDump::carrayStyle() const { return mCArrayStyle; }
// ---------------------------------------------------------------------------
-}; // namespace hidl
+}; // namespace hardware
}; // namespace android
-#endif // ANDROID_HIDL_TEXTOUTPUT_H
+#endif // ANDROID_HARDWARE_TEXTOUTPUT_H
diff --git a/include/hwbinder/binder_kernel.h b/include/hwbinder/binder_kernel.h
index 0b28412..9bf0ad4 100644
--- a/include/hwbinder/binder_kernel.h
+++ b/include/hwbinder/binder_kernel.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HIDL_BINDER_KERNEL_H
-#define ANDROID_HIDL_BINDER_KERNEL_H
+#ifndef ANDROID_HARDWARE_BINDER_KERNEL_H
+#define ANDROID_HARDWARE_BINDER_KERNEL_H
#include <linux/android/binder.h>
@@ -97,4 +97,4 @@
BC_REPLY_SG = _IOW('c', 18, struct binder_transaction_data_sg),
};
-#endif // ANDROID_HIDL_BINDER_KERNEL_H
+#endif // ANDROID_HARDWARE_BINDER_KERNEL_H
