diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-01 14:20:09 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-01 14:20:09 +0000 |
commit | dfa73b159af000c2b4a9cec11e84ea86287604e1 (patch) | |
tree | 689d9336ba6bb8f55877f46c64ce7177287bda84 | |
parent | 820a70ab29191f68fa1f0b43781d03a58e12c8df (diff) | |
parent | c368aff2be2f0b8797ca1edf75605ce259bfa881 (diff) | |
download | base-dfa73b159af000c2b4a9cec11e84ea86287604e1.tar.gz |
Snap for 11390602 from c368aff2be2f0b8797ca1edf75605ce259bfa881 to mainline-documentsui-releaseaml_doc_341610010
Change-Id: Iaa1715e45787e1e7e57d9448a9c9d19830b39dfa
-rw-r--r-- | core/res/res/values-ar/strings.xml | 2 | ||||
-rw-r--r-- | core/res/res/values-fr/strings.xml | 2 | ||||
-rw-r--r-- | packages/SettingsLib/res/values-in/strings.xml | 2 | ||||
-rw-r--r-- | services/core/java/com/android/server/pm/InstallPackageHelper.java | 7 |
4 files changed, 8 insertions, 5 deletions
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index b15ff58bf2ab..9db8f63bcb34 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1361,7 +1361,7 @@ <string name="no_permissions" msgid="5729199278862516390">"لا أذونات مطلوبة"</string> <string name="perm_costs_money" msgid="749054595022779685">"قد يكلفك هذا مالاً."</string> <string name="dlg_ok" msgid="5103447663504839312">"حسنًا"</string> - <string name="usb_charging_notification_title" msgid="1674124518282666955">"جارٍ شحن هذا الجهاز عبر منفذ USB"</string> + <string name="usb_charging_notification_title" msgid="1674124518282666955">"جارٍ شحن هذا الجهاز عبر USB"</string> <string name="usb_supplying_notification_title" msgid="5378546632408101811">"جارٍ شحن الجهاز المتصل عبر USB"</string> <string name="usb_mtp_notification_title" msgid="1065989144124499810">"تمّ تفعيل نقل الملفات عبر USB"</string> <string name="usb_ptp_notification_title" msgid="5043437571863443281">"تمّ تفعيل PTP عبر USB"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index d0e0e37a2389..248fb698857c 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -315,7 +315,7 @@ <string name="permgroupdesc_readMediaAural" msgid="7565467343667089595">"accéder aux contenus musicaux et audio sur votre appareil"</string> <string name="permgrouplab_readMediaVisual" msgid="4724874717811908660">"Photos et vidéos"</string> <string name="permgroupdesc_readMediaVisual" msgid="4080463241903508688">"accéder aux photos et aux vidéos sur votre appareil"</string> - <string name="permgrouplab_microphone" msgid="2480597427667420076">"Microphone"</string> + <string name="permgrouplab_microphone" msgid="2480597427667420076">"Micro"</string> <string name="permgroupdesc_microphone" msgid="1047786732792487722">"enregistrer des fichiers audio"</string> <string name="permgrouplab_activityRecognition" msgid="3324466667921775766">"Activité physique"</string> <string name="permgroupdesc_activityRecognition" msgid="4725624819457670704">"accéder aux données d\'activité physique"</string> diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml index 47891caffa08..1198185546be 100644 --- a/packages/SettingsLib/res/values-in/strings.xml +++ b/packages/SettingsLib/res/values-in/strings.xml @@ -175,7 +175,7 @@ <string name="launch_defaults_none" msgid="8049374306261262709">"Tidak ada setelan default"</string> <string name="tts_settings" msgid="8130616705989351312">"Setelan text-to-speech"</string> <string name="tts_settings_title" msgid="7602210956640483039">"Output text-to-speech"</string> - <string name="tts_default_rate_title" msgid="3964187817364304022">"Kecepatan ucapan"</string> + <string name="tts_default_rate_title" msgid="3964187817364304022">"Kecepatan bicara"</string> <string name="tts_default_rate_summary" msgid="3781937042151716987">"Kecepatan teks diucapkan"</string> <string name="tts_default_pitch_title" msgid="6988592215554485479">"Tinggi nada"</string> <string name="tts_default_pitch_summary" msgid="9132719475281551884">"Memengaruhi nada ucapan yang disintesis"</string> diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index d0304b43215e..f26a9f8f3aed 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -4742,7 +4742,9 @@ final class InstallPackageHelper { private void assertPackageWithSharedUserIdIsPrivileged(AndroidPackage pkg) throws PackageManagerException { - if (!AndroidPackageUtils.isPrivileged(pkg) && (pkg.getSharedUserId() != null)) { + if (!AndroidPackageUtils.isPrivileged(pkg) + && (pkg.getSharedUserId() != null) + && !pkg.isLeavingSharedUser()) { SharedUserSetting sharedUserSetting = null; try { synchronized (mPm.mLock) { @@ -4783,7 +4785,8 @@ final class InstallPackageHelper { if (((scanFlags & SCAN_AS_PRIVILEGED) == 0) && !AndroidPackageUtils.isPrivileged(pkg) && (pkg.getSharedUserId() != null) - && !skipVendorPrivilegeScan) { + && !skipVendorPrivilegeScan + && !pkg.isLeavingSharedUser()) { SharedUserSetting sharedUserSetting = null; synchronized (mPm.mLock) { try { |