Goldfish: Uprev camera provider to 2.6
Test: Manual using application
Bug: 148181647
Change-Id: I80a3e737b83f599154bb24d2e23e3f513a747498
diff --git a/manifest.camera.xml b/manifest.camera.xml
index 2f81c07..ff4dae3 100644
--- a/manifest.camera.xml
+++ b/manifest.camera.xml
@@ -2,11 +2,6 @@
<hal format="hidl">
<name>android.hardware.camera.provider</name>
<transport>hwbinder</transport>
- <version>2.4</version>
- <interface>
- <name>ICameraProvider</name>
- <instance>internal/0</instance>
- <instance>legacy/0</instance>
- </interface>
+ <fqname>@2.4::ICameraProvider/legacy/0</fqname>
</hal>
</manifest>
diff --git a/sepolicy/common/file_contexts b/sepolicy/common/file_contexts
index 048459c..115e3e9 100644
--- a/sepolicy/common/file_contexts
+++ b/sepolicy/common/file_contexts
@@ -39,7 +39,7 @@
/vendor/bin/hw/android\.hardware\.keymaster@4\.0-strongbox-service u:object_r:hal_keymaster_default_exec:s0
/vendor/bin/hw/android\.hardware\.power@1\.1-service.ranchu u:object_r:hal_power_default_exec:s0
/vendor/bin/hw/android\.hardware\.thermal@2\.0-service.mock u:object_r:hal_thermal_default_exec:s0
-/vendor/bin/hw/android\.hardware\.camera\.provider@2\.4-service-google u:object_r:hal_camera_default_exec:s0
+/vendor/bin/hw/android\.hardware\.camera\.provider@2\.6-service-google u:object_r:hal_camera_default_exec:s0
/vendor/bin/hw/android\.hardware\.authsecret@1\.0-service u:object_r:hal_authsecret_default_exec:s0
/vendor/bin/hw/android\.hardware\.input\.classifier@1\.0-service.default u:object_r:hal_input_classifier_default_exec:s0
/vendor/bin/hw/android\.hardware\.power\.stats@1\.0-service\.mock u:object_r:hal_power_stats_default_exec:s0
diff --git a/vendor.mk b/vendor.mk
index f7885a5..95ef5b2 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -154,9 +154,9 @@
camera.goldfish.jpeg \
camera.ranchu \
camera.ranchu.jpeg \
- android.hardware.camera.provider@2.4-service-google \
+ android.hardware.camera.provider@2.6-service-google \
libgooglecamerahwl_impl \
- android.hardware.camera.provider@2.4-impl-google
+ android.hardware.camera.provider@2.6-impl-google
DEVICE_MANIFEST_FILE += device/generic/goldfish/manifest.camera.xml
endif
