auto import from //depot/cupcake/@136594
diff --git a/include/ui/ICameraService.h b/include/ui/ICameraService.h
index dfd8923..c652c51 100644
--- a/include/ui/ICameraService.h
+++ b/include/ui/ICameraService.h
@@ -28,7 +28,7 @@
class ICameraService : public IInterface
{
-protected:
+public:
enum {
CONNECT = IBinder::FIRST_CALL_TRANSACTION,
};
diff --git a/include/utils/threads.h b/include/utils/threads.h
index 7dca810..8d8d46a 100644
--- a/include/utils/threads.h
+++ b/include/utils/threads.h
@@ -249,41 +249,6 @@
/*
- * Read/write lock. The resource can have multiple readers or one writer,
- * but can't be read and written at the same time.
- *
- * The same thread should not call a lock function while it already has
- * a lock. (Should be okay for multiple readers.)
- */
-class ReadWriteLock {
-public:
- ReadWriteLock()
- : mNumReaders(0), mNumWriters(0)
- {}
- ~ReadWriteLock() {}
-
- void lockForRead();
- bool tryLockForRead();
- void unlockForRead();
-
- void lockForWrite();
- bool tryLockForWrite();
- void unlockForWrite();
-
-private:
- int mNumReaders;
- int mNumWriters;
-
- Mutex mLock;
- Condition mReadWaiter;
- Condition mWriteWaiter;
-#if defined(PRINT_RENDER_TIMES)
- DurationTimer mDebugTimer;
-#endif
-};
-
-
-/*
* This is our spiffy thread object!
*/