commit fea9576f3b6b86d7f503c8e940da5337838c29a1
author Chih-Hung Hsieh <chh@google.com> Mon Aug 01 21:13:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 01 21:13:49 2016 +0000
tree f7cb03b8b816052066053e7ca59ad1bbd0648ec0
parent 64c0bafc4e20939df6b5917d0cc240a46320faca
parent db596417d33c7c10d3d6ecf58bdfd6c2784ee448

Merge "Fix clang-tidy performance warnings in opengl." am: d101620ef6
am: db596417d3

Change-Id: I3da6e7e21fb7bad59d083d9eaab7e26a226f85fd

camera/EmulatedCameraHotplugThread.cpp

diff --git a/camera/EmulatedCameraHotplugThread.cpp b/camera/EmulatedCameraHotplugThread.cpp
index bc629c1..de94429 100644
--- a/camera/EmulatedCameraHotplugThread.cpp
+++ b/camera/EmulatedCameraHotplugThread.cpp
@@ -247,7 +247,7 @@
     return true;
 }
 
-int EmulatedCameraHotplugThread::getCameraId(String8 filePath) const {
+int EmulatedCameraHotplugThread::getCameraId(const String8& filePath) const {
     Vector<int>::const_iterator it, end;
     it = mSubscribedCameraIds.begin();
     end = mSubscribedCameraIds.end();
@@ -335,7 +335,7 @@
     return true;
 }
 
-int EmulatedCameraHotplugThread::readFile(String8 filePath) const {
+int EmulatedCameraHotplugThread::readFile(const String8& filePath) const {
 
     int fd = TEMP_FAILURE_RETRY(
                 open(filePath.string(), O_RDONLY, /*mode*/0));

camera/EmulatedCameraHotplugThread.h

diff --git a/camera/EmulatedCameraHotplugThread.h b/camera/EmulatedCameraHotplugThread.h
index 3e26e71..d286ff6 100644
--- a/camera/EmulatedCameraHotplugThread.h
+++ b/camera/EmulatedCameraHotplugThread.h
@@ -53,11 +53,11 @@
     bool removeWatch(int cameraId);
     SubscriberInfo* getSubscriberInfo(int cameraId);
 
-    int getCameraId(String8 filePath) const;
+    int getCameraId(const String8& filePath) const;
     int getCameraId(int wd) const;
 
     String8 getFilePath(int cameraId) const;
-    int readFile(String8 filePath) const;
+    int readFile(const String8& filePath) const;
 
     bool createFileIfNotExists(int cameraId) const;