Commit Graph

71852 Commits

Author SHA1 Message Date
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
Chiachang Wang
6aef579198 Merge "Update getMobileProvisioningUrl to telephony surface" 2020-12-29 00:24:12 +00:00
andrew.gong
bf477db855 Settings observer fail to unregister.
Zen mode change will call displayPreference() and create a new SettingsObserver, then the old Observer object will have no opportunity to be unregistered. After too much new SettingsObserver creatd in Monkey test, memory might leak.

Bug 176206489

Change-Id: I3bccec281da492299bbf755f86df7844a31223c5
2020-12-24 15:57:09 +08:00
Hugh Chen
5af18b2733 Fix robotests failure in connectivity settings
Bug: 174212358
Test: make -j42 RunSettingsRoboTests
Change-Id: I50baeb18b00f16808dc958d77251a01ba991adf6
(cherry picked from commit e61a5e3bc7)
2020-12-23 10:57:10 -08:00
Remi NGUYEN VAN
82b5aac768 Merge "Replace isWeaklyValidatedHostname with guava" am: 5cadac06b9 am: 1a57bfefb2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d47ad22bfa3c226a6a61cb953aac104dabf4ccf
2020-12-23 02:07:04 +00:00
Chiachang Wang
195a75e47e Update getMobileProvisioningUrl to telephony surface
ConnectivityService is going to become mainline and can not
access hidden APIs. The mobile provisioning url is used by
telephony and it will use the hidden xml parsing APIs. It also
would make more sense to have the parsing inside telephony code.
Thus, move getMobileProvisioningUrl parsing to telephony surface
from ConnectivitySerivce and update the corresponding callers.

Bug: 175177794
Test: m and verify the url could be read successfully from the
      telephony surface
Change-Id: Ie8b46bc9b652f926277b10e36a86adba4dbd0121
2020-12-23 02:06:24 +00:00
Remi NGUYEN VAN
1a57bfefb2 Merge "Replace isWeaklyValidatedHostname with guava" am: 5cadac06b9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fcb69612607a4375695664062f0bd891fc927ce
2020-12-23 01:37:12 +00:00
Remi NGUYEN VAN
5cadac06b9 Merge "Replace isWeaklyValidatedHostname with guava" 2020-12-23 01:19:27 +00:00
Bill Yi
94db77cc3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c1be5d54b -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d03bf1c97923feb3f150dbfdcdd92d36f61ece3
2020-12-22 19:09:02 +00:00
Bill Yi
0c1be5d54b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I85cdb72acedfc12b1536df9210643999e043a096
2020-12-22 08:48:39 -08:00
Allen Su
034b2236dd Merge "Change carrier config" am: ba38382627 am: 3d9ede1815
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I521b6e79f50ac9b7a6b5ecb72a6e4d8ad0a580dc
2020-12-22 01:35:07 +00:00
Allen Su
3d9ede1815 Merge "Change carrier config" am: ba38382627
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ffdb49ee1dde44fd272632086c75963dffaed27
2020-12-22 01:04:35 +00:00
Allen Su
ba38382627 Merge "Change carrier config" 2020-12-22 00:26:52 +00:00
Treehugger Robot
d957a89de0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d0be7ca05 -s ours am: 892c868c32 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37322ca133d1d962d783781425f0b7296183151c
2020-12-20 19:25:30 +00:00
Treehugger Robot
bfdcddcf09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084 -s ours am: b5a0cf9253 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iced1762798a3b2ed8f994e4bab4379b353ae877b
2020-12-20 19:24:54 +00:00
Treehugger Robot
892c868c32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d0be7ca05 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica30d902800493f8a4f5d36365de2d4dca8e77b7
2020-12-20 19:11:29 +00:00
Treehugger Robot
b5a0cf9253 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17af19488236d2b4376dc523c06c5ea27c67b616
2020-12-20 19:07:31 +00:00
Treehugger Robot
3d0be7ca05 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-20 18:43:29 +00:00
Treehugger Robot
5ae81b2084 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-20 18:38:59 +00:00
Bill Yi
cb8819b42f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If6d96e565647fb0bbbc643834aebb719fbc2d843
2020-12-20 12:41:07 +00:00
Bill Yi
c741c74967 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia7493562157c18c8a1ad4295d310a33400d90b20
2020-12-20 12:14:03 +00:00
TreeHugger Robot
66cab67fd9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fbe124ac1d -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefbabc4c1b931ebc3e6402481dd970707e6905d1
2020-12-19 16:52:51 +00:00
TreeHugger Robot
fbe124ac1d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-19 16:30:13 +00:00
Bill Yi
86fcddb29b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2a52c07fe48323256cc95a05226098db1e6ae2fa
2020-12-19 06:15:53 +00:00
Tim Peng
d9312ce40c Add the explicitly mutable flag for creating a PendingIntent am: fbd36bc62b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13185577

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I378d49a95c30cdc330f0f05e89921a968cc86302
2020-12-18 14:56:50 +00:00
Tim Peng
fbd36bc62b Add the explicitly mutable flag for creating a PendingIntent
Bug: 174047735
Test: make -j50 RunSettingsRoboTests
Merged-In: Ic37b37bdbe6de6bdbad741985d3a920334240d80
Change-Id: Id4a3c67025a06b63628298f4af28fbf5db45a566
2020-12-18 07:38:18 +00:00
Jiashen Wang
ac636e9678 Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev am: 60de630fee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13226296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa4ad8d86ec4abe910b5eff52e406df0ec302766
2020-12-17 18:19:16 +00:00
Jiashen Wang
60de630fee Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev 2020-12-17 17:44:31 +00:00
Bonian Chen
bb5688ea22 Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev am: 0968b8603e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I104ea3e6ace5e0d3fbe80d62e835d2fa986b852b
2020-12-17 15:52:05 +00:00
Bonian Chen
4ea9c2d6a5 [Settings] Only display 1 SIM UI when multiple with same group UUID am: 150eb72a81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13209427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide453d4b8f1a2b40057804fa1bb47705c05dbf86
2020-12-17 15:52:03 +00:00
TreeHugger Robot
b9d36a61e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bd246b61d2 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6707ebc2929d9f865e365e0658282782f1dec98
2020-12-17 15:51:35 +00:00
TreeHugger Robot
d93b288441 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d006eb8d9d -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92c208031dd426533e2193e52cfc1ee7dd1a8733
2020-12-17 15:50:45 +00:00
Bonian Chen
0968b8603e 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
2020-12-17 15:27:46 +00:00
TreeHugger Robot
bd246b61d2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-17 15:12:31 +00:00
TreeHugger Robot
d006eb8d9d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-17 14:58:08 +00:00