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

Commit a775324f authored by Andrew Scull's avatar Andrew Scull Committed by Android (Google) Code Review
Browse files

Merge "Allow the phone app to update safety center" into main

parents f6b1b0e3 85f3b428

core/res/res/values/strings.xml

+21 −0
Original line number Diff line number Diff line
@@ -396,6 +396,27 @@ 
    <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->

    <string name="cfTemplateRegisteredTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: Not forwarded</string>



    <!-- Title of the cellular network security safety center source's status. -->

    <string name="scCellularNetworkSecurityTitle">Cellular network security</string>

    <!-- Summary of the cellular network security safety center source's status. -->

    <string name="scCellularNetworkSecuritySummary">Review settings</string>

    <!-- Title of the safety center issue and notification when the phone's identifier is shared over the network. -->

    <string name="scIdentifierDisclosureIssueTitle">Device identifier accessed</string>

    <!-- Summary of the safety center issue and notification when the phone's identifier is shared over the network. -->

    <string name="scIdentifierDisclosureIssueSummary">A network on the <xliff:g id="disclosure_network">%4$s</xliff:g> connection recorded your device\'s unique identifier (IMSI) <xliff:g id="disclosure_count">%1$d</xliff:g> times in the period between <xliff:g id="disclosure_window_start_time">%2$tr</xliff:g> and <xliff:g id="disclosure_window_end_time">%3$tr</xliff:g>.</string>

    <!-- Title of the safety center issue and notification when the phone restores an encrypted connection to the network. -->

    <string name="scNullCipherIssueEncryptedTitle">Encrypted connection to <xliff:g id="network_name">%1$s</xliff:g></string>

    <!-- Summary of the safety center issue and notification when the phone restores an encrypted connection to the network. -->

    <string name="scNullCipherIssueEncryptedSummary">You\'re now connected to a more secure cellular network.</string>

    <!-- Title of the safety center issue and notification when a connected network is not using encryption. -->

    <string name="scNullCipherIssueNonEncryptedTitle">Non-encrypted connection to <xliff:g id="network_name">%1$s</xliff:g></string>

    <!-- Summary of the safety center issue and notification when a connected network is not using encryption.  -->

    <string name="scNullCipherIssueNonEncryptedSummary">You\'re connected to a non-encrypted cellular network. Your calls, messages, and data are vulnerable to interception.</string>

    <!-- Label for the button that links to the cellular network security settings. -->

    <string name="scNullCipherIssueActionSettings">Cellular security settings</string>

    <!-- Label for the button that link to education resourcess about cellular network security settings. -->

    <string name="scNullCipherIssueActionLearnMore">Learn more</string>



    <!-- android.net.http Error strings --> <skip />

    <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->

    <string name="fcComplete">Feature code complete.</string>

core/res/res/values/symbols.xml

+10 −0
Original line number Diff line number Diff line
@@ -954,6 +954,16 @@ 
  <java-symbol type="string" name="roamingText8" />

  <java-symbol type="string" name="roamingText9" />

  <java-symbol type="string" name="roamingTextSearching" />

  <java-symbol type="string" name="scCellularNetworkSecuritySummary" />

  <java-symbol type="string" name="scCellularNetworkSecurityTitle" />

  <java-symbol type="string" name="scIdentifierDisclosureIssueSummary" />

  <java-symbol type="string" name="scIdentifierDisclosureIssueTitle" />

  <java-symbol type="string" name="scNullCipherIssueActionLearnMore" />

  <java-symbol type="string" name="scNullCipherIssueActionSettings" />

  <java-symbol type="string" name="scNullCipherIssueEncryptedSummary" />

  <java-symbol type="string" name="scNullCipherIssueEncryptedTitle" />

  <java-symbol type="string" name="scNullCipherIssueNonEncryptedSummary" />

  <java-symbol type="string" name="scNullCipherIssueNonEncryptedTitle" />

  <java-symbol type="string" name="selected" />

  <java-symbol type="string" name="sendText" />

  <java-symbol type="string" name="sending" />

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ applications that come with the platform 
        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>

        <permission name="android.permission.UWB_PRIVILEGED"/>

        <permission name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER"/>

        <permission name="android.permission.SEND_SAFETY_CENTER_UPDATE" />

    </privapp-permissions>



    <privapp-permissions package="com.android.providers.calendar">