TreeHugger Robot
42bc40a01d
Merge "Add missed layout_below property for priority section." am: 9a1a35d316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12961196
Change-Id: I4bcea374578541f906ccb6f7386c2b2dde6561ed
2020-11-05 03:10:11 +00:00
TreeHugger Robot
9a1a35d316
Merge "Add missed layout_below property for priority section."
2020-11-05 02:52:29 +00:00
Eugene Susla
f266bd3c30
Merge "Prevent non-system overlays from showing over notification listener consent dialog" am: 2fc8e09eca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12977990
Change-Id: Ieebdacdcf9397418072a19c78c33179bc81cfa21
2020-11-04 17:38:39 +00:00
Eugene Susla
2fc8e09eca
Merge "Prevent non-system overlays from showing over notification listener consent dialog"
2020-11-04 17:08:58 +00:00
TreeHugger Robot
7e944a6818
Merge "Use new strings for Wi-Fi hotspot toggle specific scenario" am: e7e0e5b831
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12965661
Change-Id: I818f8b75cd145db4ba448923d47d7bc3f0a807cd
2020-11-04 13:34:13 +00:00
TreeHugger Robot
e7e0e5b831
Merge "Use new strings for Wi-Fi hotspot toggle specific scenario"
2020-11-04 13:29:42 +00:00
Treehugger Robot
68588d7cdd
Merge "Fix crash on "Connection preferences"" am: b75c952800
am: 3cda0e9872
am: 32129f14f5
am: e0347c87fd
am: f8f8cc870f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1485157
Change-Id: I67c9d77815b2ff63e902d99aef958e4c179d0487
2020-11-04 10:12:30 +00:00
Treehugger Robot
f8f8cc870f
Merge "Fix crash on "Connection preferences"" am: b75c952800
am: 3cda0e9872
am: 32129f14f5
am: e0347c87fd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1485157
Change-Id: I447fd6bd9d9fd5bda6df97b01195adbf50caa6be
2020-11-04 09:59:42 +00:00
Hugh Chen
7d71081d45
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
2020-11-04 17:25:29 +08:00
Treehugger Robot
e0347c87fd
Merge "Fix crash on "Connection preferences"" am: b75c952800
am: 3cda0e9872
am: 32129f14f5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1485157
Change-Id: I46ad006bdb3700ac4cba29711db589e5afaca448
2020-11-04 09:18:32 +00:00
Treehugger Robot
32129f14f5
Merge "Fix crash on "Connection preferences"" am: b75c952800
am: 3cda0e9872
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1485157
Change-Id: Ia27ac5edeca976fbc0e34d60596566f4432e8f5c
2020-11-04 08:56:00 +00:00
Treehugger Robot
3cda0e9872
Merge "Fix crash on "Connection preferences"" am: b75c952800
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1485157
Change-Id: I329bb9cb76f9dddd02c3d339a7fc450f0e0b5698
2020-11-04 08:40:13 +00:00
TreeHugger Robot
c94278774d
Merge "Add the explicitly mutable flag for creating a PendingIntent" am: ffc490f83f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12974795
Change-Id: I3a1e969387008a0f55ddc95d303340b46870a7f7
2020-11-04 08:40:01 +00:00
TreeHugger Robot
ffc490f83f
Merge "Add the explicitly mutable flag for creating a PendingIntent"
2020-11-04 08:15:05 +00:00
Treehugger Robot
b75c952800
Merge "Fix crash on "Connection preferences""
2020-11-04 08:14:27 +00:00
TreeHugger Robot
29852abb20
Merge "[Testing] To migration NetworkScorerPickerPreferenceControllerTest" am: 855fc1ef61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12956715
Change-Id: I7ec39a56d296a32c467693c61e9925511f6ec2ce
2020-11-04 03:45:22 +00:00
TreeHugger Robot
01c6409987
Merge "Add the mutability flag to the pendingIntent." am: b1d340d007
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12974506
Change-Id: I5c160059abd6999a424874c559d7f7120211d6f8
2020-11-04 03:45:02 +00:00
TreeHugger Robot
855fc1ef61
Merge "[Testing] To migration NetworkScorerPickerPreferenceControllerTest"
2020-11-04 03:37:45 +00:00
TreeHugger Robot
b1d340d007
Merge "Add the mutability flag to the pendingIntent."
2020-11-04 03:11:41 +00:00
Hugh Chen
40d4e47b05
Add the explicitly mutable flag for creating a PendingIntent
...
- Android S+ to specify explicitly either FLAG_MUTABLE or FLAG_IMMUTABLE
when creating a PendingIntent.
- Suggest to use the FLAG_IMMUTABLE as default. Change it to
FLAG_MUTABLE while errors occur.
Fixes: 172207262
Fixes: 172207195
Fixes: 172205385
Fixes: 172204525
Fixes: 172205897
Test: build pass, manual test to paring blutooth device and doing
seamless transfer
Change-Id: Ic37b37bdbe6de6bdbad741985d3a920334240d80
2020-11-04 10:59:34 +08:00
Eugene Susla
85adbc4ba9
Prevent non-system overlays from showing over notification listener consent dialog
...
Bug: 170731783
Test: use a visible overlay, ensure it's gone when notification consent is open
Change-Id: I58e017982f385ffc0d0ba2174512490b1d83dd36
2020-11-03 14:24:35 -08:00
Jay Aliomer
4638f4f1fa
Merge "Use ColorMatrixColorFilter in batterymeterview" into rvc-qpr-dev am: a759432bac
am: 9afa792c12
am: d1b9b25295
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12940164
Change-Id: I1c08bee170f49cf5134d631d90588cc7bcb7f4b5
2020-11-03 21:27:51 +00:00
Jay Aliomer
d1b9b25295
Merge "Use ColorMatrixColorFilter in batterymeterview" into rvc-qpr-dev am: a759432bac
am: 9afa792c12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12940164
Change-Id: I538cf0108f522ee6aebe57cb7eb91b2feb754900
2020-11-03 21:02:20 +00:00
Jay Aliomer
9afa792c12
Merge "Use ColorMatrixColorFilter in batterymeterview" into rvc-qpr-dev am: a759432bac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12940164
Change-Id: I85a7473dc387759fab15956aba8a24233fe03861
2020-11-03 20:08:03 +00:00
Jay Aliomer
a759432bac
Merge "Use ColorMatrixColorFilter in batterymeterview" into rvc-qpr-dev
2020-11-03 19:40:22 +00:00
Chloris Kuo
2251b5f894
Merge "Add flag to reset notification channel importance" am: e9d524ffc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12901702
Change-Id: I035d6ccac125f745f1e1e9234639b229ea2ad7c1
2020-11-03 14:09:32 +00:00
Chloris Kuo
e9d524ffc6
Merge "Add flag to reset notification channel importance"
2020-11-03 14:07:45 +00:00
TreeHugger Robot
af7ad618cf
Merge "Add missing PI flag" am: c988aa848b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12968171
Change-Id: I268c8f9b6ff75135cfd82b0de92faed731bd0a9a
2020-11-03 12:57:07 +00:00
TreeHugger Robot
c988aa848b
Merge "Add missing PI flag"
2020-11-03 12:25:55 +00:00
Yi-Ling Chuang
ea92f4eb5e
Add the mutability flag to the pendingIntent.
...
Starting Android S, PendingIntent should have a explicit mutability flag
to avoid vulnerability.
Fixes: 172207853
Test: 1. Make AdaptiveSleepSlice available on the homepage and click on it.
2. Play with the volume panel.
Change-Id: I9cd428b17f44f5215d8c06331d12a17f997ca557
2020-11-03 17:44:56 +08:00
Weng Su
ae3ef639d9
Use new strings for Wi-Fi hotspot toggle specific scenario
...
- The SW (Swahili) language is used for a different noun class and is
inappropriate in the context.
- Need to separate different strings for specific situations.
- Use new strings from SettingsLib resource
Bug: 168801172
Bug: 168733667
Test: Manual test
Change-Id: I0e0a688f54ca2ee1b4cd5049c7e0f3ff3112b127
2020-11-03 09:26:40 +00:00
Zoey Chen
179a8b15b3
Merge "[Provider Model] Use new entry xml of Network & Internet" am: af8faaaa4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12938076
Change-Id: Ie4dc684adfcba523851e9481c127a7df8ccd65b8
2020-11-03 07:42:25 +00:00
TreeHugger Robot
02cce1867b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e268d89b26
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12972036
Change-Id: I4bd56130754cbc68bce33620f70b36276b72995b
2020-11-03 07:41:57 +00:00
Zoey Chen
af8faaaa4b
Merge "[Provider Model] Use new entry xml of Network & Internet"
2020-11-03 07:39:25 +00:00
TreeHugger Robot
e268d89b26
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-11-03 07:20:05 +00:00
TreeHugger Robot
0593c5b406
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 69bab04e93
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12971045
Change-Id: I533cdd664339562d211ec9417a39eee3b41e4e29
2020-11-03 07:13:21 +00:00
TreeHugger Robot
69bab04e93
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-11-03 06:31:15 +00:00
Mill Chen
9cbb4fa4e7
Specify explicitly FLAG_IMMUTABLE for PendingIntent
...
The existing pending intent in the BatteryTipUtils has been specified
FLAG_UPDATE_CURRENT. This change is to add explicitly FLAG_IMMUTABLE
to the pending intent.
Fixes: 171506726
Test: build pass, robotest
Change-Id: Ib82ddb45e05b492eef300f2ec064803d768419d0
2020-11-03 13:40:21 +08:00
Zoey Chen
6ca486620a
Merge "[Provider Model] New xml of Calls and SMS" am: d9a4ab246c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12956716
Change-Id: I30be927f82fafb1f33f657e4212ec8ca7646dcbf
2020-11-03 03:48:22 +00:00
Zoey Chen
d9a4ab246c
Merge "[Provider Model] New xml of Calls and SMS"
2020-11-03 03:30:42 +00:00
Hugh Chen
eda6d60e05
Fix crash on "Connection preferences"
...
This CL adds a null check condition to avoid crash for
some device not support PrintManager.
Bug: 159848003
Test: make -j42 SettingsGoogle
Change-Id: Ic6c4c17bb563458f4f5a61dc0d93ae22b05f8763
2020-11-03 11:02:38 +08:00
Treehugger Robot
1d5d35842d
[automerger skipped] Merge "backup settings: Update OWNERS." am: c7c020688d
am: f977a632b0
am: a8ccdd3ac0
am: 17c1db75da
-s ours am: 0254a6c38d
-s ours
...
am skip reason: Change-Id I2fdbf98a8326285ef41482cc207ed9aa94e9a0f4 with SHA-1 05783b4e6d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: Idf3adb4ab5ad5dbf3517820ae33d15d606672573
2020-11-03 00:13:50 +00:00
Bill Yi
b69426436f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5fb24a892c637b0876f663b222f3d442ae8130c
2020-11-02 16:11:06 -08:00
Treehugger Robot
0254a6c38d
[automerger skipped] Merge "backup settings: Update OWNERS." am: c7c020688d
am: f977a632b0
am: a8ccdd3ac0
am: 17c1db75da
-s ours
...
am skip reason: Change-Id I2fdbf98a8326285ef41482cc207ed9aa94e9a0f4 with SHA-1 05783b4e6d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: Ib4040c7f631edde3f4bc0279eb0cf36a1092ffaf
2020-11-02 23:56:20 +00:00
Bill Yi
b0e9e824cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia33d3635b7b77afd83fcdf7af436037340666b0f
2020-11-02 15:31:03 -08:00
Treehugger Robot
17c1db75da
Merge "backup settings: Update OWNERS." am: c7c020688d
am: f977a632b0
am: a8ccdd3ac0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: I61b0e195b971905db8bef4d561749ec2af8f0d27
2020-11-02 23:17:54 +00:00
Treehugger Robot
a8ccdd3ac0
Merge "backup settings: Update OWNERS." am: c7c020688d
am: f977a632b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: Ie5537f257c66639d4b5e534bbca0a1537c3c63e3
2020-11-02 23:03:50 +00:00
Treehugger Robot
f977a632b0
Merge "backup settings: Update OWNERS." am: c7c020688d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: I3074b0da6146f9cd5b5eeb4d4644c84c689f590d
2020-11-02 22:48:18 +00:00
Sarah Chin
7f2a6040ef
Update setCdmaRoaming/SubscriptionMode APIs
...
Test: atest TelephonyManagerTest
Test: make RunSettingsRoboTests
Bug: 171884158
Bug: 171883908
Change-Id: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
2020-11-02 14:39:55 -08:00
Treehugger Robot
c7c020688d
Merge "backup settings: Update OWNERS."
2020-11-02 21:55:49 +00:00