Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit cee91376 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-16.0.0_r3' into staging/lineage-23.0_merge-android-security-16.0.0_r3 

Android security 16.0.0 release 3

* tag 'android-security-16.0.0_r3':
  Import translations. DO NOT MERGE ANYWHERE
  Backport BT pairing dialog changes
  [nfc] Fix string injection in default payment app selector
  Add check to prevent privilege escalation from trampoline added in change Ie469c47005afb941f5646a2f790736362c23c697.
  Hide sensistive content from locked profiles
  Prevent SettingsSliceProvider from accessing unused packages
  Ignore face settings extras when called by an external package.
  startActivityForResult with earlier new Intent
  Hide notification content in history
  Use correct API to get calling package name in CredentialStorage
  Drop PendingIntent extras from external packages during enrollment.
  Do not enable the Content Protection toggle for non-admin users.
  Add ComponentName explicitly to make sure arbitary intents aren't launched from Settings.
  AppRestrictions - use vetted component
  Add battery health tip

Change-Id: Ifbcbfcc5e95e3b69085c9c7f795914ec21b4d0a9
parents cccc2e98 7e676366

res/layout/bluetooth_pin_confirm.xml

+41 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


<ScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_height="match_parent"

    android:layout_width="match_parent"

    android:paddingTop="@dimen/bluetooth_dialog_padding_top">
@@ -29,6 +30,18 @@ 
        android:layout_width="match_parent"

        android:orientation="vertical">



        <TextView

            android:id="@+id/pairing_confirmation_hint"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/bluetooth_dialog_padding"

            android:layout_marginBottom="12dp"

            android:layout_marginStart="@dimen/bluetooth_dialog_padding"

            android:layout_marginEnd="@dimen/bluetooth_dialog_padding"

            android:gravity="center_vertical"

            android:visibility="gone"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" />



        <TextView

            android:id="@+id/pairing_caption"

            android:layout_width="wrap_content"
@@ -110,6 +123,33 @@ 
                android:contentDescription="@string/bluetooth_pairing_phonebook_toggle_text"

                android:switchMinWidth="48dp" />

        </LinearLayout>

    </LinearLayout>



        <androidx.constraintlayout.widget.ConstraintLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="16dp"

            android:layout_marginStart="@dimen/bluetooth_dialog_padding"

            android:layout_marginEnd="@dimen/bluetooth_dialog_padding">

            <Button

                android:id="@+id/negative_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:visibility="gone"

                android:text="@string/bluetooth_pairing_decline"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                style="@style/ActionPrimaryButton"/>

            <Button

                android:id="@+id/positive_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:visibility="gone"

                android:text="@string/bluetooth_pairing_accept"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                style="@style/ActionPrimaryButton"/>

        </androidx.constraintlayout.widget.ConstraintLayout>

    </LinearLayout>

</ScrollView>

res/layout/bluetooth_pin_entry.xml

+26 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


<ScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_height="match_parent"

    android:layout_width="match_parent">
@@ -86,6 +87,30 @@ 
            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"

            android:textColor="?android:attr/textColorSecondary"/>



        <androidx.constraintlayout.widget.ConstraintLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="16dp"

            android:layout_marginStart="@dimen/bluetooth_pairing_padding"

            android:layout_marginEnd="@dimen/bluetooth_pairing_padding">

            <Button

                android:id="@+id/negative_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@android:string/cancel"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                style="@style/ActionPrimaryButton"/>

            <Button

                android:id="@+id/positive_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@android:string/ok"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                style="@style/ActionPrimaryButton"/>

        </androidx.constraintlayout.widget.ConstraintLayout>

    </LinearLayout>



</ScrollView>

res/values-af/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -928,6 +928,8 @@ 
    <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Laat toegang tot jou kontakte en oproepgeskiedenis toe"</string>

    <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Gee ook toegang tot kontakte en oproepgeskiedenis"</string>

    <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Inligting sal vir oproepaankondigings en meer gebruik word"</string>

    <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Gaan saambindkodes na"</string>

    <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Kyk of hierdie kode ooreenstem met die een op <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nJy moet hierdie kode om veiligheidsredes nêrens invoer nie."</string>

    <string name="bluetooth_error_title" msgid="2284738188253690278"></string>

    <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Kon nie aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koppel nie."</string>

    <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Beskikbare toestelle"</string>

res/values-am/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -928,6 +928,8 @@ 
    <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"የእርስዎን የእውቂያዎች እና የጥሪ ታሪክ መዳረሻ ይፍቀዱ"</string>

    <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"እንዲሁም ለዕውቂያዎች እና ለጥሪ ታሪክ መዳረሻ ይፍቀዱ"</string>

    <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"መረጃው ለደውል ማስታወቂያዎች እና ለሌሎችም ጥቅም ላይ ይውላል"</string>

    <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"የማጣመሪያ ኮዶችን በመፈተሽ ላይ"</string>

    <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ይህ ኮድ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ላይ ካለው ጋር እንደሚዛመድ ይፈትሹ።\n\nለእርስዎ ደህንነት ሲባል ይህን ኮድ የትም ቦታ አያስገቡ።"</string>

    <string name="bluetooth_error_title" msgid="2284738188253690278"></string>

    <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"ወደ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ማገናኘት አልተቻለም።"</string>

    <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"የሚገኙ መሣሪያዎች"</string>

res/values-ar/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -928,6 +928,8 @@ 
    <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"السماح بالوصول إلى جهات الاتصال وسجلّ المكالمات"</string>

    <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"السماح أيضًا بالوصول إلى جهات الاتصال وسجلّ المكالمات"</string>

    <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"سيتم استخدام المعلومات في إشعارات المكالمات وغير ذلك"</string>

    <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"التحقُّق من رموز الإقران"</string>

    <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"يُرجى التأكُّد من تطابُق هذا الرمز مع الرمز المعروض على \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\".\n\nللحفاظ على أمانك، يجب عدم إدخال هذا الرمز في أي مكان."</string>

    <string name="bluetooth_error_title" msgid="2284738188253690278"></string>

    <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"تعذر الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>

    <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"الأجهزة المتاحة"</string>