Snap for 7362794 from 757c83ed1ae73b86e80c3ddefe1cce6e678f2f78 to sc-v2-release
Change-Id: I608b1fec8f8ecc95ced56309040ecbd619265dde
This commit is contained in:
commit
80d03f4b8f
6 changed files with 22 additions and 2 deletions
Binary file not shown.
Binary file not shown.
|
@ -68,7 +68,7 @@ int main() {
|
||||||
|
|
||||||
addGs101CommonDataProviders(p);
|
addGs101CommonDataProviders(p);
|
||||||
addDisplay(p);
|
addDisplay(p);
|
||||||
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/3-0008/power_stats");
|
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats");
|
||||||
|
|
||||||
const std::string instance = std::string() + PowerStats::descriptor + "/default";
|
const std::string instance = std::string() + PowerStats::descriptor + "/default";
|
||||||
binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
|
binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
|
||||||
|
|
|
@ -110,7 +110,7 @@ int main() {
|
||||||
|
|
||||||
addGs101CommonDataProviders(p);
|
addGs101CommonDataProviders(p);
|
||||||
addDisplay(p);
|
addDisplay(p);
|
||||||
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/4-0008/power_stats");
|
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
|
||||||
addUwb(p);
|
addUwb(p);
|
||||||
|
|
||||||
const std::string instance = std::string() + PowerStats::descriptor + "/default";
|
const std::string instance = std::string() + PowerStats::descriptor + "/default";
|
||||||
|
|
|
@ -66,5 +66,10 @@
|
||||||
<!-- Camera 1 is the front camera on barbet -->
|
<!-- Camera 1 is the front camera on barbet -->
|
||||||
<string translatable="false" name="config_protectedCameraId">1</string>
|
<string translatable="false" name="config_protectedCameraId">1</string>
|
||||||
|
|
||||||
|
<!-- Comma-separated list of packages to exclude from camera protection. In our case,
|
||||||
|
ignore the gaze detection package -->
|
||||||
|
<string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string>
|
||||||
|
|
||||||
|
<bool name="config_enableDisplayCutoutProtection">true</bool>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,9 @@ LOCAL_MODULE_OWNER := samsung
|
||||||
LOCAL_MODULE_CLASS := APPS
|
LOCAL_MODULE_CLASS := APPS
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
||||||
LOCAL_CERTIFICATE := platform
|
LOCAL_CERTIFICATE := platform
|
||||||
|
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||||
|
LOCAL_LICENSE_CONDITIONS := notice
|
||||||
|
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
|
||||||
include $(BUILD_PREBUILT)
|
include $(BUILD_PREBUILT)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
@ -45,6 +48,9 @@ LOCAL_MODULE_OWNER := samsung
|
||||||
LOCAL_MODULE_CLASS := APPS
|
LOCAL_MODULE_CLASS := APPS
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
||||||
LOCAL_CERTIFICATE := platform
|
LOCAL_CERTIFICATE := platform
|
||||||
|
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||||
|
LOCAL_LICENSE_CONDITIONS := notice
|
||||||
|
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
|
||||||
include $(BUILD_PREBUILT)
|
include $(BUILD_PREBUILT)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
@ -58,6 +64,9 @@ LOCAL_MODULE_OWNER := samsung
|
||||||
LOCAL_MODULE_CLASS := APPS
|
LOCAL_MODULE_CLASS := APPS
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
||||||
LOCAL_CERTIFICATE := platform
|
LOCAL_CERTIFICATE := platform
|
||||||
|
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||||
|
LOCAL_LICENSE_CONDITIONS := notice
|
||||||
|
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
|
||||||
include $(BUILD_PREBUILT)
|
include $(BUILD_PREBUILT)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
@ -71,6 +80,9 @@ LOCAL_MODULE_OWNER := samsung
|
||||||
LOCAL_MODULE_CLASS := APPS
|
LOCAL_MODULE_CLASS := APPS
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
||||||
LOCAL_CERTIFICATE := platform
|
LOCAL_CERTIFICATE := platform
|
||||||
|
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||||
|
LOCAL_LICENSE_CONDITIONS := notice
|
||||||
|
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
|
||||||
include $(BUILD_PREBUILT)
|
include $(BUILD_PREBUILT)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
@ -83,6 +95,9 @@ LOCAL_MODULE_OWNER := samsung
|
||||||
LOCAL_MODULE_CLASS := APPS
|
LOCAL_MODULE_CLASS := APPS
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
||||||
LOCAL_CERTIFICATE := platform
|
LOCAL_CERTIFICATE := platform
|
||||||
|
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||||
|
LOCAL_LICENSE_CONDITIONS := notice
|
||||||
|
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
|
||||||
include $(BUILD_PREBUILT)
|
include $(BUILD_PREBUILT)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue