packages-apps-Settings

Fork

RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275410

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96867a323781675c52bf875c2221c348baca6b83

Add adaptive charging to the top level settings menu

Bug: 172009945
Test: Trigger adaptive charging and verify string in menu
Change-Id: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
Merged-In: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
(cherry picked from commit b60870cb7ded393cd4bd7edd22e0c6fc2ce0b4bd)

Snap for 7060259 from c045ccdc5ad916dad02603f41873f5e4922bc390 to rvc-d2-release

Change-Id: Ie6cb1ae680a1559c764b0e9b181fc3f59d2eb154

Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ie47dac2298ca18d01ea7d1319eab3a9dd221d191

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I32232511655da9fe89308d73e084412957f3d03d

RESTRICT AUTOMERGE Update String

Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f

RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message

Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633

RESTRICT AUTOMERGE Update String

Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f

RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message

Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633

RESTRICT AUTOMERGE Update String

Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f

RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message

Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633

RESTRICT AUTOMERGE Update String

Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f

RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message

Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633

Snap for 7048988 from 0c1be5d54be5b1562ca7bd00053c192fe997c655 to rvc-d2-release

Change-Id: I3d1ad034825253afc7abb6e705cbf9b88d11e8bb

Fix robotests failure in connectivity settings

Bug: 174212358
Test: make -j42 RunSettingsRoboTests
Change-Id: I50baeb18b00f16808dc958d77251a01ba991adf6
(cherry picked from commit e61a5e3bc7e1e79bead1413319db3c356795626f)

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I85cdb72acedfc12b1536df9210643999e043a096

Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice

Bug: 175124820
Test: make -j50 RunSettingsRoboTests
Merged-In: Ic37b37bdbe6de6bdbad741985d3a920334240d80
Change-Id: I49bc2f1fe903422e08ef3b98993f1b60df458d9c

Snap for 7042724 from fbe124ac1dadc3d1919532cd81e60c0fd3fb12b4 to rvc-d2-release

Change-Id: I4931c18706b7f25aed5ae71ef11e62953b62f5fe

Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I2a52c07fe48323256cc95a05226098db1e6ae2fa

Snap for 7041858 from fbd36bc62ba3c8dc5d3810672e731ecec161dd51 to rvc-d2-release

Change-Id: I4a4e8b6609a2ab3b208cde0aaf6b7f54c7870e36

Add the explicitly mutable flag for creating a PendingIntent

Bug: 174047735
Test: make -j50 RunSettingsRoboTests
Merged-In: Ic37b37bdbe6de6bdbad741985d3a920334240d80
Change-Id: Id4a3c67025a06b63628298f4af28fbf5db45a566

Snap for 7040187 from 60de630feef2e6e249da3133b934329586f8d20b to rvc-d2-release

Change-Id: Ie757eafe96bdd3b78589fa94124f69471a31a15b

Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev

Snap for 7039265 from bd246b61d22c4ae56c2e32651ea119b4ab1c9e63 to rvc-d2-release

Change-Id: Ica870eb03b77442c5f3462cb8b7565db2a21db30

Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev

* changes:
[Settings] code refactor - rename isSubscriptionCanBeDisplayed
[Settings] Only display 1 SIM UI when multiple with same group UUID

Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev

Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: If6a00d0339bbc6474ec6cdd0c730f0b864b2b701