From 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 10 十二月 2025 14:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
keyCabinet-android/app/src/main/AndroidManifest.xml | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/keyCabinet-android/app/src/main/AndroidManifest.xml b/keyCabinet-android/app/src/main/AndroidManifest.xml
index 4658735..ee474d0 100644
--- a/keyCabinet-android/app/src/main/AndroidManifest.xml
+++ b/keyCabinet-android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,16 @@
android:usesCleartextTraffic="true"
tools:replace="android:allowBackup">
<activity
+ android:name=".ui.keyCabinet.ChoseFunActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.keyCabinet.ZWLRActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.keyCabinet.ZWListActivity"
+ android:exported="true" >
+ </activity>
+ <activity
android:name=".ui.face.ChoseActivationActivity"
android:exported="false" />
<activity
@@ -69,16 +79,9 @@
<meta-data
android:name="com.google.android.gms.vision.DEPENDENCIES"
android:value="face" />
-
- <provider
- android:name="androidx.core.content.FileProvider"
- android:authorities="com.doumee.keyCabinet.fileProvider"
- android:exported="false"
- android:grantUriPermissions="true">
- <meta-data
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/provider_paths" />
- </provider>
+ <meta-data
+ android:name="android:requestLegacyExternalStorage"
+ android:value="true" />
<!--
<receiver
android:name="com.doumee.keyCabinet.ui.service.BootCompleteReceiver"
@@ -95,17 +98,29 @@
<service android:name="com.doumee.keyCabinet.ui.service.HeartbeatService" />
<service android:name="com.doumee.keyCabinet.ui.service.FaceUpdateService" />
-->
- <meta-data
- android:name="android:requestLegacyExternalStorage"
- android:value="true" />
+ <provider
+ android:name="androidx.core.content.FileProvider"
+ android:authorities="com.doumee.keyCabinet.fileProvider"
+ android:exported="false"
+ android:grantUriPermissions="true">
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/provider_paths" />
+ </provider>
<uses-library
android:name="org.apache.http.legacy"
android:required="false" />
</application>
- <uses-feature android:name="android.hardware.usb.host" />
+ <uses-feature android:name="android.hardware.usb.host"
+ android:sharedUserId="android.uid.system"/>
+ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
+ tools:ignore="ProtectedPermissions" />
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.READ_OWNER_DATA" />
+ <uses-permission android:name="android.permission.WRITE_OWNER_DATA" />
<uses-feature android:name="android.hardware.nfc" />
<uses-permission android:name="android.permission.ACCESS_SURERUSER" />
- <uses-permission android:name="android.permission.USB_PERMISSION" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
@@ -116,7 +131,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission
android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"
@@ -134,7 +149,7 @@
<uses-permission
android:name="android.permission.WRITE_SETTINGS"
tools:ignore="ProtectedPermissions" />
- <uses-permission android:name="android.permission.ACCESS_USB_PERMISSION"/>
+ <uses-permission android:name="android.permission.ACCESS_USB_PERMISSION" />
<uses-permission android:name="android.permission.NFC" />
--
Gitblit v1.9.3