Snap for 11973804 from fa04bfea52cffdf10dbea7a4e2966ebf3c2998a6 to 24Q3-release

Change-Id: Ieffaf76e97b026e0b6a0d26786afac89e47501ed

camera2/extensions/eyesFreeVidSample/Android.bp

diff --git a/camera2/extensions/eyesFreeVidSample/Android.bp b/camera2/extensions/eyesFreeVidSample/Android.bp
index 3d9567e..d555190 100644
--- a/camera2/extensions/eyesFreeVidSample/Android.bp
+++ b/camera2/extensions/eyesFreeVidSample/Android.bp
@@ -20,8 +20,19 @@
     name: "EyesFreeVidService",
     srcs: ["src/**/*.java"],
     static_libs: [
-        "androidx.annotation_annotation"
+        "androidx.annotation_annotation",
     ],
     platform_apis: true,
-    system_ext_specific: true
+    system_ext_specific: true,
+    required: ["privapp-permissions-efv.xml"],
+    privileged: true,
+    certificate: "platform",
+}
+
+prebuilt_etc {
+    name: "privapp-permissions-efv.xml",
+    system_ext_specific: true,
+    sub_dir: "permissions",
+    src: "privapp-permissions-efv.xml",
+    filename_from_src: true,
 }

camera2/extensions/eyesFreeVidSample/AndroidManifest.xml

diff --git a/camera2/extensions/eyesFreeVidSample/AndroidManifest.xml b/camera2/extensions/eyesFreeVidSample/AndroidManifest.xml
index 1e53b09..6cf1d91 100644
--- a/camera2/extensions/eyesFreeVidSample/AndroidManifest.xml
+++ b/camera2/extensions/eyesFreeVidSample/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.camera.extensions.impl.service">
 
+    <uses-permission android:name="android.permission.SYSTEM_CAMERA" />
+    <uses-permission android:name="android.permission.CAMERA" />
+
     <application
         android:defaultToDeviceProtectedStorage="true"
         android:forceQueryable="true"

camera2/extensions/eyesFreeVidSample/privapp-permissions-efv.xml

diff --git a/camera2/extensions/eyesFreeVidSample/privapp-permissions-efv.xml b/camera2/extensions/eyesFreeVidSample/privapp-permissions-efv.xml
new file mode 100644
index 0000000..87a5bd6
--- /dev/null
+++ b/camera2/extensions/eyesFreeVidSample/privapp-permissions-efv.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<!--
+This XML file declares which signature|privileged permissions should be granted to privileged
+applications that come with the platform
+-->
+<permissions>
+    <privapp-permissions package="android.camera.extensions.impl.service">
+        <permission name="android.permission.SYSTEM_CAMERA"/>
+    </privapp-permissions>
+</permissions>
\ No newline at end of file