From e6d0c326c9bf2e18e31fb99c5ce529c595253c72 Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Mon, 15 Nov 2021 18:49:22 +0900
Subject: [PATCH] universal7885: CameraLightSensor: Add privapp permissions

* Logcat: Privileged permission android.permission.WRITE_SECURE_SETTINGS for package com.eurekateam.cameralightsensor (/system/priv-app/CameraLightSensor) not in privapp-permissions allowlist

* Turn off debug bool too

Change-Id: Ieae2542852568ceb40017db6a559ded185d582e3
Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
---
 .../apps/CameraLightSensor/Android.bp          |  8 ++++++++
 .../apps/CameraLightSensor/AndroidManifest.xml |  2 --
 ...telist_com.eurekateam.cameralightsensor.xml | 18 ++++++++++++++++++
 .../CameraLightSensorService.java              |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 universal7885-common/apps/CameraLightSensor/privapp_whitelist_com.eurekateam.cameralightsensor.xml

diff --git a/universal7885-common/apps/CameraLightSensor/Android.bp b/universal7885-common/apps/CameraLightSensor/Android.bp
index 9f4e546..6b28d05 100644
--- a/universal7885-common/apps/CameraLightSensor/Android.bp
+++ b/universal7885-common/apps/CameraLightSensor/Android.bp
@@ -7,4 +7,12 @@ android_app {
     privileged: true,
     certificate: "platform",
     static_libs: [ "androidx.core_core" ],
+    required: ["privapp_whitelist_com.eurekateam.cameralightsensor.xml"],
 }
+
+prebuilt_etc {
+    name: "privapp_whitelist_com.eurekateam.cameralightsensor.xml",
+    src: "privapp_whitelist_com.eurekateam.cameralightsensor.xml",
+    sub_dir: "permissions",
+}
+
diff --git a/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml b/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml
index d0165f0..0201b11 100755
--- a/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml
+++ b/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml
@@ -5,12 +5,10 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.CAMERA_OPEN_CLOSE_LISTENER"/>
-    <uses-feature android:name="android.hardware.microphone" />
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera2.full"/>
     <uses-feature android:name="android.hardware.camera.autofocus" />
diff --git a/universal7885-common/apps/CameraLightSensor/privapp_whitelist_com.eurekateam.cameralightsensor.xml b/universal7885-common/apps/CameraLightSensor/privapp_whitelist_com.eurekateam.cameralightsensor.xml
new file mode 100644
index 0000000..6c8e02e
--- /dev/null
+++ b/universal7885-common/apps/CameraLightSensor/privapp_whitelist_com.eurekateam.cameralightsensor.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 Eureka Team
+     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.
+-->
+<permissions>
+    <privapp-permissions package="com.eurekateam.cameralightsensor">
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+</permissions>
diff --git a/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/CameraLightSensorService.java b/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/CameraLightSensorService.java
index eeb74e5..f6bf9d0 100755
--- a/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/CameraLightSensorService.java
+++ b/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/CameraLightSensorService.java
@@ -43,7 +43,7 @@ import java.util.Collections;
 
 public class CameraLightSensorService extends Service {
     protected static final String TAG = CameraLightSensorService.class.getSimpleName();
-    static final boolean DEBUG = true;
+    static final boolean DEBUG = false;
     IntentFilter screenStateFilter;
     private Context mContext;
     public ContentResolver contentResolver;