summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PermissionController/res/layout/grant_permissions.xml2
-rw-r--r--PermissionController/res/layout/grant_permissions_material3.xml2
-rw-r--r--PermissionController/res/values/strings.xml3
-rw-r--r--PermissionController/role-controller/java/com/android/role/controller/model/Role.java2
-rw-r--r--SafetyCenter/Resources/shared_res/values-de/strings.xml2
5 files changed, 7 insertions, 4 deletions
diff --git a/PermissionController/res/layout/grant_permissions.xml b/PermissionController/res/layout/grant_permissions.xml
index 4b23dd959..f01f00c60 100644
--- a/PermissionController/res/layout/grant_permissions.xml
+++ b/PermissionController/res/layout/grant_permissions.xml
@@ -143,7 +143,7 @@
<com.android.permissioncontroller.permission.ui.widget.SecureButton
android:id="@+id/permission_allow_selected_button"
- android:text="@string/grant_dialog_button_allow_selected_photos"
+ android:text="@string/grant_dialog_button_allow_limited_access"
style="@style/PermissionGrantButtonAllowSelected" />
<com.android.permissioncontroller.permission.ui.widget.SecureButton
diff --git a/PermissionController/res/layout/grant_permissions_material3.xml b/PermissionController/res/layout/grant_permissions_material3.xml
index d405976cf..6b1ccb2a4 100644
--- a/PermissionController/res/layout/grant_permissions_material3.xml
+++ b/PermissionController/res/layout/grant_permissions_material3.xml
@@ -144,7 +144,7 @@
<com.android.permissioncontroller.permission.ui.widget.SecureButton
android:id="@+id/permission_allow_selected_button"
- android:text="@string/grant_dialog_button_allow_selected_photos"
+ android:text="@string/grant_dialog_button_allow_limited_access"
style="@style/PermissionGrantButtonAllowSelectedMaterial3" />
<com.android.permissioncontroller.permission.ui.widget.SecureButton
diff --git a/PermissionController/res/values/strings.xml b/PermissionController/res/values/strings.xml
index 8f56046e2..bfb6e09b5 100644
--- a/PermissionController/res/values/strings.xml
+++ b/PermissionController/res/values/strings.xml
@@ -73,6 +73,9 @@
<!-- Title for the dialog button to allow access to all of a resource always. [CHAR LIMIT=60] -->
<string name="grant_dialog_button_always_allow_all">Always allow all</string>
+ <!-- Title for the dialog button to allow limited access. [CHAR LIMIT=60] -->
+ <string name="grant_dialog_button_allow_limited_access">Allow limited access</string>
+
<!-- Title for the dialog button to allow access to select photos to be shared. [CHAR LIMIT=60] -->
<string name="grant_dialog_button_allow_selected_photos">Select photos and videos</string>
diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/Role.java b/PermissionController/role-controller/java/com/android/role/controller/model/Role.java
index aa6cba169..9ff16db0f 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/model/Role.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/model/Role.java
@@ -462,7 +462,7 @@ public class Role {
} else {
List<String> packageNames = new ArrayList<>();
for (String defaultHolder : defaultHolders.split(DEFAULT_HOLDER_SEPARATOR)) {
- String packageName = getQualifiedDefaultHolderPackageName(defaultHolders, context);
+ String packageName = getQualifiedDefaultHolderPackageName(defaultHolder, context);
if (packageName != null) {
packageNames.add(packageName);
}
diff --git a/SafetyCenter/Resources/shared_res/values-de/strings.xml b/SafetyCenter/Resources/shared_res/values-de/strings.xml
index a5b1758ad..0ff9ebfb8 100644
--- a/SafetyCenter/Resources/shared_res/values-de/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-de/strings.xml
@@ -43,7 +43,7 @@
<string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Einstellung konnte nicht überprüft werden}other{Einstellungen konnten nicht überprüft werden}}"</string>
<string name="work_profile_paused" msgid="7037400224040869079">"Arbeitsprofil pausiert"</string>
<string name="group_unknown_summary" msgid="6951386960814105641">"Noch keine Angaben vorhanden"</string>
- <string name="notification_channel_group_name" msgid="7155072032524876859">"Sicherheit &amp; Datenschutz"</string>
+ <string name="notification_channel_group_name" msgid="7155072032524876859">"Datenschutz &amp; Sicherheit"</string>
<string name="notification_channel_name_information" msgid="2966444432152990166">"Empfehlungen"</string>
<string name="notification_channel_name_recommendation" msgid="7847408286580217922">"Warnungen"</string>
<string name="notification_channel_name_critical_warning" msgid="5994320322108351769">"Wichtige Warnungen"</string>