Commit Graph

63599 Commits

Author SHA1 Message Date
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
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
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
Tim Peng
9ba74049fc Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice
Bug: 175124820
Test: make -j50 RunSettingsRoboTests
Merged-In: Ic37b37bdbe6de6bdbad741985d3a920334240d80
Change-Id: I49bc2f1fe903422e08ef3b98993f1b60df458d9c
2020-12-21 16:29:05 +08: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
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
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
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
Bill Yi
b4654c5ed2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If6a00d0339bbc6474ec6cdd0c730f0b864b2b701
2020-12-17 05:00:45 +00:00
Bill Yi
f6330f35c6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I36766724094cdd2b8525fac2177ff61545305a46
2020-12-17 04:32:39 +00:00
Bonian Chen
c2232020c4 [Settings] code refactor - rename isSubscriptionCanBeDisplayed
canSubscriptionBeDisplayed is more readable.

Reasonale:
When cherry-picking ag/12886476 into Android R branch (ag/13209427), a comment from code reviewer suggested this change.
Since ag/12886476 has been merged for a while, another patch for it is perferred option when comparing with reverting that CL and resubmit it.

Bug: 175830728
Change-Id: Ie91eb82504fd7cff6671803a2bc2560139690952
Test: build pass
Merged-In: Ie91eb82504fd7cff6671803a2bc2560139690952
2020-12-17 03:04:50 +00:00
Bonian Chen
150eb72a81 [Settings] Only display 1 SIM UI when multiple with same group UUID
Some carrier(s) expand their service through providing eSIM in companion
with pSIM. Group UUID is designed to group them together as a single
SIM.

Bug: 169455114
Bug: 175069803
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I0934a45a2917ab106627c733162efbee9a13f216
(cherry picked from commit a6b249d625)
Merged-In: I0934a45a2917ab106627c733162efbee9a13f216
2020-12-17 02:12:44 +00:00
Malcolm Chen
abd767ab1d Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-15 22:11:55 +00:00
Wesley.CW Wang
ee1d07d59b Update Battery Defender tips title
Bug: 175662315
Test: make SettingsRoboTests
Change-Id: I13ba773ea4402c5ae54260a8b8cbea4620eed535
2020-12-15 10:21:06 +00:00
Jiashen Wang
c1ed4d5485 Move eSIM reset before telephony manager reset in ResetNetworkConfirm
TelephonyManager#resetSettings triggers modem restart. It could cause
eSIM reset failure since Modem is not available. In order to resolve
this issue, we move eSIM reset befor telephony manager reset.
Bug: 175239934
Test: Manually tested

Change-Id: I44644c67577469898726ba07dcd6b68b3fb73b2a
2020-12-14 22:44:41 -08:00
Hugh Chen
b767df1a08 Add condition to check case of accessory combinations
Before this CL, we only compare whether the value of function is
equal to accessory to ensure usb is in accessory mode. But in some
cases there are different accessory combinations, like
"accessory,audio source". It will make the condition return false
when encountering accessory combinations.

This CL will check whether the function will include accessory mode
to fix this issue.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I7c80f02de5340799e292949608e19b86b187b982
Merged-In: I7c80f02de5340799e292949608e19b86b187b982
(cherry picked from commit 7d71081d45)
2020-12-14 07:32:41 +00:00
Hugh Chen
e8dc7bc283 Do nothing when choosing file transfer when in accessory mode
- Before this CL, the device will be disconnected and reconnected
  to accessory mode when choosing "File transfer/Android Auto" in
  accessory mode. Because the USB menu didn't check state of
  function, it should do nothing when choosing
  "File transfer/Android Auto" in accessory mode.

  This CL add condition to check state of function, it will do
  nothing when choosing "File transfer/Android Auto" in
  accessory mode.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
Merged-In: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
(cherry picked from commit 3251a04ba3)
2020-12-14 06:59:06 +00:00
Hugh Chen
91ed63124c Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit.
- Before this CL, the usb receivers didn't check the extra information
  of the accessory. It causes the usb menu not to be aware that the
  usb port is switched to accessory mode.

  In this CL, the receivers will check whether the intent has an
  accessory extra. If the usb port is switched to accessory mode
  the usb menu will switch to "File Transfer/Android Auto".

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I0eca89a23670c674b74753fc526256cc1d52e759
Merged-In: I0eca89a23670c674b74753fc526256cc1d52e759
(cherry picked from commit af0a45bb7a)
2020-12-14 06:58:26 +00:00
Robert Luo
4dd011b3c7 Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev 2020-12-11 06:56:24 +00:00
TreeHugger Robot
e05f1a4bb7 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-11 00:11:36 +00:00
Bill Yi
a26056a6ef Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ica5c216524bf124fc447dd64e2b7ca36c244fb81
2020-12-10 12:10:19 -08:00
tim peng
656867b4de Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev 2020-12-10 05:30:42 +00:00
TreeHugger Robot
79bf00aac3 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 0b89867372
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadf73a6dac422ef24851c603a1e5cd1ab8c0dcf2
2020-12-09 14:31:38 +00:00
Jakub Pawlowski
ad9f74366f [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours am: d35af468b7 -s ours am: 24c8adbd0d -s ours am: c488511160 -s ours
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82517ee38de45ef7b2e2ea36d8efa3b6c7f106f6
2020-12-09 14:31:28 +00:00
TreeHugger Robot
0b89867372 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81cd1495fd0beb356554d5a86daa30214d0d27d0
2020-12-09 14:03:32 +00:00
Jakub Pawlowski
c488511160 [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours am: d35af468b7 -s ours am: 24c8adbd0d -s ours
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff5d3ed58db08fa24afb1deb482ac2e12e9f3a0f
2020-12-09 14:03:14 +00:00
TreeHugger Robot
f49e9d2196 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36f99bfb1e5eee253bb4ce030d7000cb40c2ff63
2020-12-09 13:49:10 +00:00
Jakub Pawlowski
24c8adbd0d [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours am: d35af468b7 -s ours
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e6c8911bbb7a22386468a0d077826151f7faceb
2020-12-09 13:48:57 +00:00
TreeHugger Robot
635029b87f Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad91ec439965d52c652f79ce4d6fe3b125631f79
2020-12-09 13:03:53 +00:00
Jakub Pawlowski
d35af468b7 [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I245a20b64373500c886a47d18da39500fd248c0f
2020-12-09 13:03:47 +00:00
TreeHugger Robot
cfdae774cd Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3605d2b4dbad8b7b4979b644c89352ee8449ba1
2020-12-09 12:17:08 +00:00
Jakub Pawlowski
b15b6450fa [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26950e18ca79bb70e0a91492997242934ec19641
2020-12-09 12:16:57 +00:00
TreeHugger Robot
2117006bc6 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d7dcaefd10f297c9e268d8f9d8bf666d98b08fd
2020-12-09 12:08:40 +00:00
TreeHugger Robot
504b96d76c Merge "Add bluetooth package to permission request intent" into oc-mr1-dev 2020-12-09 12:06:33 +00:00
Jakub Pawlowski
c721dc5bad Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I956e8906633af45f12617dabbec4e060c14502f2
2020-12-09 11:32:56 +00:00
Jakub Pawlowski
b29c036522 Prevent overlay drawing on top of Bluetooth activity dialog
Bug: 168504491
Merged-In: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
2020-12-09 08:00:22 +00:00
Robert Luo
2b6fd92de9 Migrate media output switcher metrics - 2/n
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.

Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
2020-12-09 15:42:56 +08:00
TreeHugger Robot
f7f1781146 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 am: db48b810b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42ad211ac7f3341c38d7b7f992b19e3ae52c9373
2020-12-09 00:32:11 +00:00
TreeHugger Robot
db48b810b6 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id38617a0c134feeb458a734a86c57360108fdd15
2020-12-09 00:16:09 +00:00
TreeHugger Robot
4c4f83eb21 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic39ad9f7212cdb757f79c61e23c84ac614e73fed
2020-12-08 23:58:02 +00:00
TreeHugger Robot
537c730ca2 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c3d91f901bc38554732ff2cc428232f117efea0
2020-12-08 23:27:51 +00:00
TreeHugger Robot
721f43dcdc Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev 2020-12-08 22:56:46 +00:00
tim peng
3cea72fb2b Merge changes from topic "media_output_dialog" into rvc-qpr-dev
* changes:
  Redirect to output switcher panel to the new dialog
  Update rule of launching media output dialog
  Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
  Add PairNewBluetoothReceiver to launch Bluetooth pairing page
2020-12-08 05:46:13 +00:00
tim peng
de2f2754d9 Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev 2020-12-08 00:55:21 +00:00
Xiao Ma
a63d8db293 Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev 2020-12-08 00:15:53 +00:00
TreeHugger Robot
d6d4c2ac64 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e am: 2aa9a43701 -s ours am: a9892de23f am: 85f6ce8e71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17f588dc8bcd527b9f43492bc6437ac3d7dbff7f
2020-12-07 20:54:43 +00:00