From 48d06fac940e6f28d599eb7fbf05c2cce41ecb30 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 10:35:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/AndroidManifest.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/keyCabinet-android/app/src/main/AndroidManifest.xml b/keyCabinet-android/app/src/main/AndroidManifest.xml
index 24ba31a..31877b1 100644
--- a/keyCabinet-android/app/src/main/AndroidManifest.xml
+++ b/keyCabinet-android/app/src/main/AndroidManifest.xml
@@ -44,7 +44,8 @@
android:exported="false" />
<activity
android:name="com.doumee.keyCabinet.ui.face.FaceActivity"
- android:exported="false" />
+ android:exported="false"
+ android:windowSoftInputMode="stateAlwaysHidden|adjustPan"/>
<activity
android:name="com.doumee.keyCabinet.ui.main.MainActivity"
android:exported="true"
@@ -93,7 +94,10 @@
android:name="org.apache.http.legacy"
android:required="false" />
</application>
-
+ <uses-permission android:name="android.permission.ACCESS_SURERUSER" />
+ <uses-permission android:name="android.permission.USB_PERMISSION"/>
+ <uses-feature android:name="android.hardware.usb.host"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-feature android:name="android.hardware.nfc" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -116,6 +120,7 @@
<uses-permission
android:name="android.permission.INTERACT_ACROSS_USERS"
tools:ignore="ProtectedPermissions" />
+
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
<uses-permission
android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
--
Gitblit v1.9.3