summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--PermissionController/jarjar-rules.txt4
-rw-r--r--PermissionController/res/values-af/strings.xml14
-rw-r--r--PermissionController/res/values-eu/strings.xml4
-rw-r--r--PermissionController/res/values-vi/strings.xml2
-rw-r--r--PermissionController/res/xml/roles.xml8
-rw-r--r--PermissionController/role-controller/Android.bp1
-rw-r--r--PermissionController/role-controller/java/com/android/role/controller/model/Role.java15
-rw-r--r--SafetyCenter/Resources/res/values-bn-v35/strings.xml4
-rw-r--r--SafetyCenter/Resources/res/values-lo-v35/strings.xml4
-rw-r--r--SafetyCenter/Resources/res/values-ta-v35/strings.xml4
-rw-r--r--service/jarjar-rules.txt4
-rw-r--r--tests/cts/permissionpolicy/res/raw/android_manifest.xml15
12 files changed, 60 insertions, 19 deletions
diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt
index 05fe2a148..74303a439 100644
--- a/PermissionController/jarjar-rules.txt
+++ b/PermissionController/jarjar-rules.txt
@@ -2,6 +2,10 @@
# RoleParser.applyJarjarTransform(), by adding NO_IFTTT=reason to your commit
# message.
# LINT.IfChange
+rule android.app.admin.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0
+rule android.app.admin.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0
+rule android.app.admin.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0
+rule android.app.admin.flags.Flags com.android.permissioncontroller.jarjar.@0
rule android.app.appfunctions.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0
rule android.app.appfunctions.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0
rule android.app.appfunctions.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0
diff --git a/PermissionController/res/values-af/strings.xml b/PermissionController/res/values-af/strings.xml
index 356afd953..728ef11ef 100644
--- a/PermissionController/res/values-af/strings.xml
+++ b/PermissionController/res/values-af/strings.xml
@@ -288,17 +288,17 @@
<string name="auto_revoke_preference_summary" msgid="5517958331781391481">"Toestemmings is verwyder om jou privaatheid te beskerm"</string>
<string name="background_location_access_reminder_notification_title" msgid="1140797924301941262">"<xliff:g id="APP_NAME">%s</xliff:g> het jou ligging op die agtergrond gekry"</string>
<string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Hierdie program het altyd toegang tot jou ligging. Tik om te verander."</string>
- <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Gaan program met toegang tot jou kennisgewings na"</string>
+ <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Gaan app met toegang tot jou kennisgewings na"</string>
<string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> kan inhoud in jou kennisgewings toemaak, daarop reageer en toegang daartoe kry"</string>
- <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Hierdie program kan inhoud in jou kennisgewings toemaak, daarop reageer en toegang daartoe kry. Sommige programme het hierdie toegang nodig om te werk soos hulle moet."</string>
+ <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Hierdie app kan inhoud in jou kennisgewings toemaak, daarop reageer en toegang daartoe kry. Sommige apps het hierdie toegang nodig om te werk soos hulle moet."</string>
<string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Verwyder toegang"</string>
<string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Sien meer opsies"</string>
<string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Toegang is verwyder"</string>
- <string name="accessibility_access_reminder_notification_title" msgid="2971317234668807566">"Gaan program met volle toesteltoegang na"</string>
+ <string name="accessibility_access_reminder_notification_title" msgid="2971317234668807566">"Gaan app met volle toesteltoegang na"</string>
<string name="accessibility_access_reminder_notification_content" msgid="7389454158175306720">"<xliff:g id="APP_NAME">%s</xliff:g> kan jou skerm sien en handelinge op jou toestel uitvoer. Toeganklikheidprogramme het hierdie soort toegang nodig om te werk soos hulle moet."</string>
- <string name="accessibility_access_warning_card_content" msgid="4370327190293217358">"Hierdie program kan jou skerm sien en handelinge op jou toestel uitvoer. Toeganklikheidprogramme het hierdie soort toegang nodig om te werk soos hulle moet, maar gaan die program na en maak seker dat jy dit kan vertrou."</string>
+ <string name="accessibility_access_warning_card_content" msgid="4370327190293217358">"Hierdie app kan jou skerm sien en handelinge op jou toestel uitvoer. Toeganklikheidapps het hierdie soort toegang nodig om te werk soos hulle moet, maar gaan die app na en maak seker dat jy dit kan vertrou."</string>
<string name="accessibility_remove_access_button_label" msgid="44145801526711640">"Verwyder toegang"</string>
- <string name="accessibility_show_all_apps_button_label" msgid="960067249326392280">"Bekyk program met volle toegang"</string>
+ <string name="accessibility_show_all_apps_button_label" msgid="960067249326392280">"Bekyk apps met volle toegang"</string>
<string name="accessibility_remove_access_success_label" msgid="4380995302917014670">"Toegang is verwyder"</string>
<string name="safety_center_notification_app_label" msgid="2457720616141926534">"Android-stelsel"</string>
<string name="auto_revoke_after_notification_title" msgid="5417761027669887431">"Programtoestemmings is verwyder om privaatheid te beskerm"</string>
@@ -618,8 +618,8 @@
<string name="media_confirm_dialog_message_q_to_s_aural_deny" msgid="6832087393653561911">"Hierdie program steun nie die jongste weergawe van Android nie. As hierdie program nie toegang tot musiek- en oudiolêers het nie, sal dit ook nie toegelaat word om toegang tot foto\'s en video\'s te kry nie."</string>
<string name="media_confirm_dialog_message_q_to_s_visual_allow" msgid="3504335060843147760">"Hierdie program steun nie die jongste weergawe van Android nie. As hierdie program toegang tot foto\'s en video\'s het, sal dit ook toegelaat word toegang tot musiek-, oudio- en ander lêers te kry."</string>
<string name="media_confirm_dialog_message_q_to_s_visual_deny" msgid="2145973462806481992">"Hierdie program steun nie die jongste weergawe van Android nie. As hierdie program nie toegang tot musiek- en oudiolêers het nie, sal dit ook nie toegelaat word om toegang tot foto\'s en video\'s te kry nie."</string>
- <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"Gaan program met agtergrondliggingtoegang na"</string>
- <string name="safety_center_background_location_access_reminder_notification_content" msgid="4066560182507301022">"<xliff:g id="APP_NAME">%s</xliff:g> het altyd toegang tot jou ligging, selfs wanneer die program toe is"</string>
+ <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"Gaan app met agtergrondliggingtoegang na"</string>
+ <string name="safety_center_background_location_access_reminder_notification_content" msgid="4066560182507301022">"<xliff:g id="APP_NAME">%s</xliff:g> het altyd toegang tot jou ligging, selfs wanneer die app toe is"</string>
<string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"Gaan app met agtergrondliggingtoegang na"</string>
<string name="safety_center_background_location_access_reminder_summary" msgid="7431657777510537658">"Hierdie app het altyd toegang tot jou ligging, selfs wanneer dit toe is.\n\nSekere veiligheid- en noodapps moet op die agtergrond toegang tot jou ligging hê om te kan werk soos hulle moet."</string>
<string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"Toegang is verander"</string>
diff --git a/PermissionController/res/values-eu/strings.xml b/PermissionController/res/values-eu/strings.xml
index 139f41668..6e9242d35 100644
--- a/PermissionController/res/values-eu/strings.xml
+++ b/PermissionController/res/values-eu/strings.xml
@@ -78,7 +78,7 @@
<string name="never_ask_again" msgid="4728762438198560329">"Ez galdetu berriro"</string>
<string name="no_permissions" msgid="3881676756371148563">"Ez dago baimenik"</string>
<string name="additional_permissions" msgid="5801285469338873430">"Baimen gehigarriak"</string>
- <string name="app_permissions_info_button_label" msgid="7633312050729974623">"Ireki aplikazioaren informazioa"</string>
+ <string name="app_permissions_info_button_label" msgid="7633312050729974623">"Ireki aplikazioari buruzko informazioa"</string>
<string name="additional_permissions_more" msgid="5681220714755304407">"{count,plural, =1{Beste #}other{Beste #}}"</string>
<string name="old_sdk_deny_warning" msgid="2382236998845153919">"Android-en bertsio zaharrago baterako diseinatuta dago aplikazio hau. Baimena ukatzen baduzu, agian aurrerantzean ez du behar bezala funtzionatuko."</string>
<string name="storage_supergroup_warning_allow" msgid="103093462784523190">"Android-en bertsio zaharrago baterako dago diseinatuta aplikazio hau. Baimena ematen baduzu, biltegi osoa erabiltzeko baimena emango da (argazkiak, musika, audioa eta bestelako fitxategiak atzitzekoa barne)."</string>
@@ -263,7 +263,7 @@
<string name="hours" msgid="7302866489666950038">"{count,plural, =1{# ordu}other{# ordu}}"</string>
<string name="minutes" msgid="4868414855445375753">"{count,plural, =1{# minutu}other{# minutu}}"</string>
<string name="seconds" msgid="5893958182059842734">"{count,plural, =1{# segundo}other{# segundo}}"</string>
- <string name="permission_reminders" msgid="6528257957664832636">"Baimenen abisuak"</string>
+ <string name="permission_reminders" msgid="6528257957664832636">"Baimenen gogorarazpenak"</string>
<string name="auto_revoke_permission_reminder_notification_title_one" msgid="6690347469376854137">"Erabiltzen ez den 1 aplikazio"</string>
<string name="auto_revoke_permission_reminder_notification_title_many" msgid="6062217713645069960">"Erabiltzen ez diren <xliff:g id="NUMBER_OF_APPS">%s</xliff:g> aplikazio"</string>
<string name="auto_revoke_permission_reminder_notification_content" msgid="4492228990462107487">"Baimenak kendu egin dira zure pribatutasuna babesteko. Sakatu berrikusteko."</string>
diff --git a/PermissionController/res/values-vi/strings.xml b/PermissionController/res/values-vi/strings.xml
index 252b4029a..b9a077e77 100644
--- a/PermissionController/res/values-vi/strings.xml
+++ b/PermissionController/res/values-vi/strings.xml
@@ -509,7 +509,7 @@
<string name="permgroupbackgroundrequest_microphone" msgid="8874462606796368183">"Cho phép &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ghi âm?"</string>
<string name="permgroupbackgroundrequest_device_aware_microphone" msgid="3321823187623762958">"Cho phép &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ghi âm trên &lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;?"</string>
<string name="permgroupbackgroundrequestdetail_microphone" msgid="553702902263681838">"Ứng dụng này có thể muốn ghi âm mọi lúc, ngay cả khi bạn không dùng ứng dụng. "<annotation id="link">"Cho phép trong phần cài đặt."</annotation></string>
- <string name="permgroupupgraderequest_microphone" msgid="1362781696161233341">"Thay đổi quyền sử dụng micrô của &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
+ <string name="permgroupupgraderequest_microphone" msgid="1362781696161233341">"Thay đổi quyền truy cập micrô của &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
<string name="permgroupupgraderequest_device_aware_microphone" msgid="8722411173971679806">"Thay đổi quyền truy cập vào micrô của &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; trên &lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;?"</string>
<string name="permgroupupgraderequestdetail_microphone" msgid="2870497719571464239">"Ứng dụng này muốn ghi âm mọi lúc, ngay cả khi bạn không dùng ứng dụng. "<annotation id="link">"Cho phép trong phần cài đặt."</annotation></string>
<string name="permgrouprequest_activityRecognition" msgid="5415121592794230330">"Cho phép &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; truy cập vào dữ liệu hoạt động thể chất?"</string>
diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml
index f5dba3432..23f5d8344 100644
--- a/PermissionController/res/xml/roles.xml
+++ b/PermissionController/res/xml/roles.xml
@@ -720,6 +720,10 @@
featureFlag="android.app.appfunctions.flags.Flags.enableAppFunctionManager" />
<permission name="android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED"
featureFlag="android.app.appfunctions.flags.Flags.enableAppFunctionManager" />
+ <permission name="android.permission.COPY_ACCOUNTS"
+ featureFlag="android.app.admin.flags.Flags.splitCreateManagedProfileEnabled" />
+ <permission name="android.permission.REMOVE_ACCOUNTS"
+ featureFlag="android.app.admin.flags.Flags.splitCreateManagedProfileEnabled" />
</permissions>
</role>
@@ -1484,6 +1488,10 @@
<permission name="android.permission.MANAGE_DEVICE_POLICY_DISPLAY" minSdkVersion="35" />
<permission name="android.permission.MANAGE_DEVICE_POLICY_LOCALE" minSdkVersion="35" />
<permission name="android.permission.MANAGE_DEVICE_POLICY_SMS" minSdkVersion="35" />
+ <permission name="android.permission.COPY_ACCOUNTS"
+ featureFlag="android.app.admin.flags.Flags.splitCreateManagedProfileEnabled" />
+ <permission name="android.permission.REMOVE_ACCOUNTS"
+ featureFlag="android.app.admin.flags.Flags.splitCreateManagedProfileEnabled" />
</permissions>
</role>
diff --git a/PermissionController/role-controller/Android.bp b/PermissionController/role-controller/Android.bp
index 9eacf975f..9f217660a 100644
--- a/PermissionController/role-controller/Android.bp
+++ b/PermissionController/role-controller/Android.bp
@@ -37,6 +37,7 @@ java_library {
"android.content.pm.flags-aconfig-java-export",
"android.permission.flags-aconfig-java-export",
"android.os.flags-aconfig-java-export",
+ "device_policy_aconfig_flags_java_export",
],
apex_available: [
"com.android.permission",
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 9895f8533..c551c37dc 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
@@ -472,10 +472,19 @@ public class Role {
if (!isAvailableByFeatureFlagAndSdkVersion()) {
return false;
}
- // TODO(b/376133070): ensure that cross-user role is only available if also available for
- // the profile-group's full user
if (mBehavior != null) {
- return mBehavior.isAvailableAsUser(this, user, context);
+ boolean isAvailableAsUser = mBehavior.isAvailableAsUser(this, user, context);
+ // Ensure that cross-user role is only available if also available for
+ // the profile-group's full user
+ if (isAvailableAsUser && getExclusivity() == EXCLUSIVITY_PROFILE_GROUP) {
+ UserHandle profileParent = UserUtils.getProfileParentOrSelf(user, context);
+ if (!Objects.equals(profileParent, user)
+ && !mBehavior.isAvailableAsUser(this, profileParent, context)) {
+ throw new IllegalArgumentException("Role is not available for profile parent: "
+ + profileParent.getIdentifier());
+ }
+ }
+ return isAvailableAsUser;
}
return true;
}
diff --git a/SafetyCenter/Resources/res/values-bn-v35/strings.xml b/SafetyCenter/Resources/res/values-bn-v35/strings.xml
index 644f8fa18..0837061ed 100644
--- a/SafetyCenter/Resources/res/values-bn-v35/strings.xml
+++ b/SafetyCenter/Resources/res/values-bn-v35/strings.xml
@@ -24,7 +24,7 @@
<string name="privacy_sources_title" msgid="309304028326660956">"গোপনীয়তা নিয়ন্ত্রণ"</string>
<string name="privacy_sources_summary" msgid="2165270848857537278">"অনুমতি, কন্ট্রোল"</string>
<string name="privacy_additional_title" msgid="4239060639056083649"></string>
- <string name="private_space_title" msgid="6158245041481535879">"ব্যক্তিগত স্পেস"</string>
+ <string name="private_space_title" msgid="6158245041481535879">"প্রাইভেট স্পেস"</string>
<string name="private_space_summary" msgid="529869826714610294">"\'ব্যক্তিগত স্পেস\' সেট-আপ ও আরও অনেক কিছু করুন"</string>
- <string name="private_space_search_terms" msgid="4820808478299116258">"ব্যক্তিগত স্পেস"</string>
+ <string name="private_space_search_terms" msgid="4820808478299116258">"প্রাইভেট স্পেস"</string>
</resources>
diff --git a/SafetyCenter/Resources/res/values-lo-v35/strings.xml b/SafetyCenter/Resources/res/values-lo-v35/strings.xml
index 606339144..4d04dc07a 100644
--- a/SafetyCenter/Resources/res/values-lo-v35/strings.xml
+++ b/SafetyCenter/Resources/res/values-lo-v35/strings.xml
@@ -24,7 +24,7 @@
<string name="privacy_sources_title" msgid="309304028326660956">"ການຄວບຄຸມຄວາມເປັນສ່ວນຕົວ"</string>
<string name="privacy_sources_summary" msgid="2165270848857537278">"ການອະນຸຍາດ, ການຄວບຄຸມ"</string>
<string name="privacy_additional_title" msgid="4239060639056083649"></string>
- <string name="private_space_title" msgid="6158245041481535879">"ພື້ນທີ່ສ່ວນຕົວ"</string>
+ <string name="private_space_title" msgid="6158245041481535879">"ພື້ນທີ່ສ່ວນບຸກຄົນ"</string>
<string name="private_space_summary" msgid="529869826714610294">"ຕັ້ງຄ່າພື້ນທີ່ສ່ວນຕົວ ແລະ ອື່ນໆ"</string>
- <string name="private_space_search_terms" msgid="4820808478299116258">"ພື້ນທີ່ສ່ວນຕົວ"</string>
+ <string name="private_space_search_terms" msgid="4820808478299116258">"ພື້ນທີ່ສ່ວນບຸກຄົນ"</string>
</resources>
diff --git a/SafetyCenter/Resources/res/values-ta-v35/strings.xml b/SafetyCenter/Resources/res/values-ta-v35/strings.xml
index 8eb41ce20..0dd2252fd 100644
--- a/SafetyCenter/Resources/res/values-ta-v35/strings.xml
+++ b/SafetyCenter/Resources/res/values-ta-v35/strings.xml
@@ -24,7 +24,7 @@
<string name="privacy_sources_title" msgid="309304028326660956">"தனியுரிமைக் கட்டுப்பாடுகள்"</string>
<string name="privacy_sources_summary" msgid="2165270848857537278">"அனுமதிகள், கட்டுப்பாடுகள்"</string>
<string name="privacy_additional_title" msgid="4239060639056083649"></string>
- <string name="private_space_title" msgid="6158245041481535879">"தனிப்பட்ட சேமிப்பிடம்"</string>
+ <string name="private_space_title" msgid="6158245041481535879">"ரகசிய இடம்"</string>
<string name="private_space_summary" msgid="529869826714610294">"தனிப்பட்ட சேமிப்பிடத்தை அமைக்கலாம் மற்றும் பலவற்றைச் செய்யலாம்"</string>
- <string name="private_space_search_terms" msgid="4820808478299116258">"தனிப்பட்ட சேமிப்பிடம்"</string>
+ <string name="private_space_search_terms" msgid="4820808478299116258">"ரகசிய இடம்"</string>
</resources>
diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt
index ef6971b11..d9833ca56 100644
--- a/service/jarjar-rules.txt
+++ b/service/jarjar-rules.txt
@@ -2,6 +2,10 @@
# RoleParser.applyJarjarTransform(), by adding NO_IFTTT=reason to your commit
# message.
# LINT.IfChange
+rule android.app.admin.flags.*FeatureFlags* com.android.permission.jarjar.@0
+rule android.app.admin.flags.FeatureFlags* com.android.permission.jarjar.@0
+rule android.app.admin.flags.FeatureFlags com.android.permission.jarjar.@0
+rule android.app.admin.flags.Flags com.android.permission.jarjar.@0
rule android.app.appfunctions.flags.*FeatureFlags* com.android.permission.jarjar.@0
rule android.app.appfunctions.flags.FeatureFlags* com.android.permission.jarjar.@0
rule android.app.appfunctions.flags.FeatureFlags com.android.permission.jarjar.@0
diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
index 5df9c944e..1e92e51d5 100644
--- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml
+++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
@@ -2083,6 +2083,21 @@
<permission android:name="android.permission.CONTROL_AUTOMOTIVE_GNSS"
android:protectionLevel="signature|privileged" />
+ <!-- @SystemApi @hide Allows an application to bind to a
+ android.service.PopulationDensityProviderService for the purpose of
+ querying population density. This prevents arbitrary clients connecting
+ to the service. The system server checks that the provider's intent
+ service explicitly sets this permission via the android:permission
+ attribute of the service.
+ This is only expected to be possessed by the system server outside of
+ tests.
+ @FlaggedApi(android.location.flags.Flags.FLAG_POPULATION_DENSITY_PROVIDER)
+ <p>Protection level: signature
+ -->
+ <permission android:name="android.permission.BIND_POPULATION_DENSITY_PROVIDER_SERVICE"
+ android:featureFlag="android.location.flags.population_density_provider"
+ android:protectionLevel="signature" />
+
<!-- ======================================= -->
<!-- Permissions for accessing networks -->
<!-- ======================================= -->
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-21 23:06:13 +0000