diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 19:21:00 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 19:21:00 +0200 |
| commit | eca582052ef000897f69d6d0bdd96c7a8aa59cda (patch) | |
| tree | 7472d8773c4bb9321fdd41d0aef057e30045e557 /include | |
| parent | 26718276fd99ef60d9646d79467d2bb3f2db5549 (diff) | |
| parent | dc7805b0c79d056385a076422894425984af2aa0 (diff) | |
| download | frameworks_av-eca582052ef000897f69d6d0bdd96c7a8aa59cda.zip frameworks_av-eca582052ef000897f69d6d0bdd96c7a8aa59cda.tar.gz frameworks_av-eca582052ef000897f69d6d0bdd96c7a8aa59cda.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_av into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/CameraBase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/camera/CameraBase.h b/include/camera/CameraBase.h index 1b93157..4c849de 100644 --- a/include/camera/CameraBase.h +++ b/include/camera/CameraBase.h @@ -101,7 +101,7 @@ protected: virtual void binderDied(const wp<IBinder>& who); // helper function to obtain camera service handle - static const sp<ICameraService>& getCameraService(); + static const sp<ICameraService> getCameraService(); sp<TCamUser> mCamera; status_t mStatus; |