Sync up to v304
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
From 862798495297d8cb0d02951d533644929570ae1f Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Wed, 31 Mar 2021 23:36:03 +0200
|
||||
Subject: [PATCH 14/14] Remove Samsung system permission on sensors
|
||||
|
||||
---
|
||||
libs/sensor/Sensor.cpp | 1 +
|
||||
libs/sensor/include/sensor/Sensor.h | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp
|
||||
index 9d817ae0b..aeae0589d 100644
|
||||
--- a/libs/sensor/Sensor.cpp
|
||||
+++ b/libs/sensor/Sensor.cpp
|
||||
@@ -405,6 +405,7 @@ const String8& Sensor::getStringType() const {
|
||||
}
|
||||
|
||||
const String8& Sensor::getRequiredPermission() const {
|
||||
+ if (mRequiredPermission == "com.samsung.permission.SSENSOR") return mFakeRequiredPermission;
|
||||
return mRequiredPermission;
|
||||
}
|
||||
|
||||
diff --git a/libs/sensor/include/sensor/Sensor.h b/libs/sensor/include/sensor/Sensor.h
|
||||
index 324d44310..2d4446767 100644
|
||||
--- a/libs/sensor/include/sensor/Sensor.h
|
||||
+++ b/libs/sensor/include/sensor/Sensor.h
|
||||
@@ -125,6 +125,7 @@ private:
|
||||
uint32_t mFifoMaxEventCount;
|
||||
String8 mStringType;
|
||||
String8 mRequiredPermission;
|
||||
+ String8 mFakeRequiredPermission;
|
||||
bool mRequiredPermissionRuntime = false;
|
||||
int32_t mRequiredAppOp;
|
||||
int32_t mMaxDelay;
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user