Commit Graph

71890 Commits

Author SHA1 Message Date
TreeHugger Robot
c5f7e582b4 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4601e6a2be1265e01baea5e73f34d7989d6fcad
2021-01-07 01:56:43 +00:00
Hugh Chen
57358903b3 [automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94614a9cac3555ec44d6cfef6e7af4a6b24f6272
2021-01-07 01:55:50 +00:00
Hugh Chen
d6bc0a328f [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e109407102ce058e806f3a239882dc8abaa36a7
2021-01-07 01:55:49 +00:00
TreeHugger Robot
1a6a1b12ef Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev 2021-01-07 01:27:50 +00:00
Hugh Chen
4b22b601f7 RESTRICT AUTOMERGE Update String am: 085f70d48d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e8afa7b93740d3653a8a6cfb476ac69023ae41b
2021-01-06 23:32:41 +00:00
Hugh Chen
c17ec818af 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
2021-01-06 23:32:22 +00:00
Stephane Lee
b9b67ee815 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 b60870cb7d)
2021-01-06 21:59:42 +00:00
Benjamin Franz
92480fc15d Update constructor usage for CompatibilityChangeInfo
As we're introducing an overridable flag on CompatibilityChangeInfo, the
constructor takes an additional argument that needs to be reflected in
these tests.

Bug: 174043039
Test: atest SettingsRoboTests
Change-Id: Ib5528ded408cb7807e2e3a90e1f99ee1775d566d
2021-01-06 15:12:50 +00:00
Treehugger Robot
e632315dc8 Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" am: d3d0962cd1 am: 8677c6a4b7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66d08a63a109ef4e4a14c266773266b216b17f5b
2021-01-06 05:19:19 +00:00
Treehugger Robot
8677c6a4b7 Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" am: d3d0962cd1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4f151b07b92e0c55a53b38216024858b9fd68ce
2021-01-06 04:57:58 +00:00
Treehugger Robot
d3d0962cd1 Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" 2021-01-06 04:24:25 +00:00
Jason Jeremy Iman
620158be52 [adb-wireless] Allow ADB-over-WiFi when WiFi is not default
When other network types with higher priority than wifi is
connected alongside wifi, turning on ADB over wifi is not
possible.

This is happening due to `isWifiConnected()` only checks
if wifi is the default network and not if wifi is connected.

Often times multiple networks such as ethernet is used in
conjuction with wifi, making ADB over wifi not working with
the setup.

Fix by returning if any available network is a WiFi network.

Bug: 173466085
Test: Tested on eve Chrome OS ARCVM, ADB WiFi can be toggled when
      WiFi is not the default network.

Change-Id: I8474a4e8b37a4af0031e1462645509f1e634e9a8
2021-01-06 11:00:03 +09:00
TreeHugger Robot
8e18b5b69d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d2a2867d85 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
2021-01-03 05:24:18 +00:00
Bill Yi
7c77e36579 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 783c18d8a6 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife1751f97a9e4a80f9af2981ae626382bcb2aca3
2021-01-03 05:24:11 +00:00
TreeHugger Robot
d2a2867d85 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-01-03 05:10:18 +00:00
Bill Yi
88409f1af9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I838570051ce2aab9c2b98fb2bf738a06b7687893
2021-01-02 22:27:59 +00:00
Bill Yi
783c18d8a6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibc84cbad5cb80898de5f771c8e1defd43122d694
2021-01-02 21:59:25 +00:00
TreeHugger Robot
156857c2e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c045ccdc5a -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74a9fab4956fed3f808d28e110c300de403bdb2c
2021-01-02 18:21:51 +00:00
TreeHugger Robot
c045ccdc5a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-01-02 18:05:17 +00:00
Bill Yi
6c25b86023 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee457eea5 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff609972087838e5cbdd1f01b64598456edc2e4f
2021-01-02 04:29:13 +00:00
Treehugger Robot
b441429a8f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce -s ours am: aae7ce1b1c -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c5788675875037a68a77308b1bb61eea802e32d
2021-01-02 04:21:27 +00:00
Treehugger Robot
a6ed699018 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c -s ours am: ed32f93dbd -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie98a3ecc9281eca2f3631fe6a779bf8fd8a313a0
2021-01-02 04:21:22 +00:00
Treehugger Robot
aae7ce1b1c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64108906b14421f342bb5418d800a4b639a43708
2021-01-02 03:33:25 +00:00
Treehugger Robot
ed32f93dbd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a22c4edab65206bd4441d791c19fda687276057
2021-01-02 03:33:06 +00:00
Treehugger Robot
30364048ce Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-02 03:14:44 +00:00
Treehugger Robot
f89dd1307c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-02 03:14:05 +00:00
Bill Yi
502f111677 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie47dac2298ca18d01ea7d1319eab3a9dd221d191
2021-01-01 18:34:16 -08:00
Bill Yi
dee457eea5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I32232511655da9fe89308d73e084412957f3d03d
2021-01-01 17:46:51 -08:00
Bill Yi
3e0563138f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I31a8c787f06f10c5c985268ea2652dff6d3161ff
2021-01-01 22:26:03 +00:00
Bill Yi
028d6f33b5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib1f949c9281dc4a209ff3ccd84f74423fd92ebb6
2021-01-01 21:57:18 +00:00
Hugh Chen
085f70d48d RESTRICT AUTOMERGE Update String
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:35:03 -08:00
Hugh Chen
8ecca02ece 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
2020-12-30 18:34:43 -08:00
Hugh Chen
19aeca103d RESTRICT AUTOMERGE Update String
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:34:05 -08:00
Hugh Chen
bbe765f992 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
2020-12-30 18:33:52 -08:00
Hugh Chen
ccbe74f555 RESTRICT AUTOMERGE Update String
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:33:12 -08:00
Hugh Chen
01a50db645 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
2020-12-30 18:32:58 -08:00
Hugh Chen
48ec74592d RESTRICT AUTOMERGE Update String
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:31:39 -08:00
Hugh Chen
9037e43fa8 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
2020-12-30 18:31:22 -08:00
Amber Ogata
25ff810ef9 Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45 am: ac0f1fc20c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib87255a28d45127a68eea13b217e169fcfbba0cd
2020-12-29 18:05:57 +00:00
Amber Ogata
ac0f1fc20c Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I424f31e085814e4afd0b92d3295d25301febf5ca
2020-12-29 17:29:57 +00:00
Amber Ogata
4de1ae6a45 Merge "Add intent filter to open premium sms setting." 2020-12-29 17:01:04 +00:00
Treehugger Robot
8dc014e909 Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6 am: defe0a6b9f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia74c0bea83aa76c4b8aa453a190bebe8041eafed
2020-12-29 09:27:29 +00:00
Treehugger Robot
defe0a6b9f Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e57028b2b4cabaa7bd9aaac6a134b54af5b3116
2020-12-29 08:57:36 +00:00
Treehugger Robot
a1716edbb6 Merge "hardwareinfo: Hide hardware revision if empty" 2020-12-29 08:21:35 +00:00
Treehugger Robot
cc162a2cfa Merge "Settings observer fail to unregister." am: b92cb6678c am: 6873e19485
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3d1bb6248061f8e566d6db457ee1ad81e4be116
2020-12-29 06:08:37 +00:00
Treehugger Robot
6873e19485 Merge "Settings observer fail to unregister." am: b92cb6678c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f67c00a5fbb23594a527d0a8d77b9617b635a18
2020-12-29 05:38:14 +00:00
Treehugger Robot
b92cb6678c Merge "Settings observer fail to unregister." 2020-12-29 05:26:12 +00:00
Amber Ogata
9d5de29fcc Add intent filter to open premium sms setting.
Test: adb shell am start -a android.settings.PREMIUM_SMS_SETTINGS -d package: com.android.settings
Bug: b/175911991
Change-Id: I1b48494d8d388ad52c5966dbd1e89b1a6f9c6785
2020-12-29 01:19:58 +00:00
Chiachang Wang
e3b7c01f9a Merge "Update getMobileProvisioningUrl to telephony surface" am: 6aef579198 am: 85b853725d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I530eff9d77629af47e4f8da2ad660aab7f3431f3
2020-12-29 01:01:04 +00:00
Chiachang Wang
85b853725d Merge "Update getMobileProvisioningUrl to telephony surface" am: 6aef579198
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26de8a5227ecaa4ede80a9154ffa5078b4fb293e
2020-12-29 00:47:18 +00:00