Jeremy Goldman
11f91e47ea
Merge "Enhanced4gBasePreferenceControllerTest migrated to junit"
2020-12-14 02:58:24 +00:00
Jeremy Goldman
f36154fe6c
Merge "ActiveSubsciptionsListenerTest converted to junit"
2020-12-14 02:52:33 +00:00
Jeremy Goldman
f36d82f5fe
Merge "Settings JUnit test for PreferredNetworkModeContentObserverTest"
2020-12-14 02:52:16 +00:00
TreeHugger Robot
e1f15ccc1d
Merge "Add the mutability flag to BluetoothDevicesSlice."
2020-12-14 02:47:41 +00:00
TreeHugger Robot
6571548a37
Merge "[Provider Model] Fix the NetworkDashboardFragmentTest failed issue"
2020-12-13 15:18:40 +00:00
Bonian Chen
c3d818653a
Merge "Add test case for CrossSimCallingPreferenceControllerTest"
2020-12-12 11:31:16 +00:00
Jeremy Goldman
4348c2c826
Enhanced4gBasePreferenceControllerTest migrated to junit
...
Bug: 175389659
Test: atest -c Enhanced4gBasePreferenceControllerTest
Change-Id: I7ebcb303eb74168b81dd650fe78f3988647aa64d
2020-12-12 01:11:13 +08:00
Jeremy Goldman
bb811a5aff
ActiveSubsciptionsListenerTest converted to junit
...
note that this class contains a state machine of the subscription
information cache. The mock subscription manager must present
subscriptions in order for an update intent to result in a change
notifcation.
Bug: 175389659
Test: atest -c ActiveSubsciptionsListenerTest
Change-Id: I8cd2bd5d5b7b1539f421822ba77ed3d8e0ac493b
2020-12-11 16:23:40 +00:00
Jeremy Goldman
e18207b951
Settings JUnit test for PreferredNetworkModeContentObserverTest
...
Biggest difference here: the use of a MockContentProvider
Bug: 175389659
Test: atest -c PreferredNetworkModeContentObserverTest
Change-Id: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
2020-12-11 16:23:33 +00:00
Jeremy Goldman
1e87a55215
Add test case for CrossSimCallingPreferenceControllerTest
...
Test is currently failing due to no methods present. Since we want
the controller to be unavailable for now, I chose to write a method
verifying that state.
Bug: 174566774
Test: atest -c CrossSimCallingPreferenceControllerTest
Change-Id: Iced0ac7bbd3482907312182a632dcf3215c55391
2020-12-12 00:22:45 +08:00
Zim
abb239f4a4
Change transcoding default values
...
1. transcode_enabled: s/false/true/
2. transcode_default: s/false/true/
This is to maintain consistence with the MediaProvider defaults and it
only affects the 'checked' state when a user hasn't checked anything
Test: Manual
Bug: 175309276
Change-Id: Ic81490a944407e30f9cd207f64f2a0f5530a23d3
2020-12-11 15:48:21 +00:00
Zoey Chen
e05e21bfe7
Merge "[Provider Model] Should show "No SIM" if there is no SIM in the device."
2020-12-11 14:55:51 +00:00
Zoey Chen
44559badaf
[Provider Model] Should show "No SIM" if there is no SIM in the device.
...
Bug: 172053880
Test: atest NetworkProviderCallsSmsControllerTest#getSummary_noSim_returnNoSim
Change-Id: I31fd8b4b6928ef8aa7c45ac7651fa26e0b08446e
2020-12-11 20:29:13 +08:00
Robert Luo
b2cec8fd84
[automerger skipped] Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev am: 4dd011b3c7
-s ours am: 3107b30f49
-s ours
...
am skip reason: Change-Id I5abb471452ec92670d220b2472eadbe77e243653 with SHA-1 8da41d2eda
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13182886
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2a2e7c2861cef58411a3e9eb4053f7c44af2fc3
2020-12-11 11:04:37 +00:00
Robert Luo
42035bcf6f
[automerger skipped] Merge "Migrate media output switcher metrics - 3/n" into rvc-qpr-dev-plus-aosp am: a2e12619d5
-s ours
...
am skip reason: Change-Id I5abb471452ec92670d220b2472eadbe77e243653 with SHA-1 d7cfa55286
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13191558
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7b1c72d78fb7e5bf14143a0160bc2e6d1007b97e
2020-12-11 11:02:06 +00:00
Yi-Ling Chuang
32e7118161
Add the mutability flag to BluetoothDevicesSlice.
...
Starting Android S, all PendingIntent has to have a explicit mutability
flag set.
Fixes: 172207505
Fixes: 172811893
Test: Enable BluetoothDevicesSlice and play on it.
Play on the volume panel.
Change-Id: I618455de683d619fe300309e31864b3c64f12ad1
2020-12-11 15:32:23 +08:00
Robert Luo
3107b30f49
[automerger skipped] Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev am: 4dd011b3c7
-s ours
...
am skip reason: Change-Id I5abb471452ec92670d220b2472eadbe77e243653 with SHA-1 8da41d2eda
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13182886
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae60c309ec6cf303dc5554f6c9d82fc7f6b088ac
2020-12-11 07:13:10 +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
YUKAI HUNG
c0f50f59b3
Merge "Fix failure BatteryInfoTest after string is update"
2020-12-11 02:42:42 +00:00
Robert Luo
a2e12619d5
Merge "Migrate media output switcher metrics - 3/n" into rvc-qpr-dev-plus-aosp
2020-12-11 02:15:47 +00:00
TreeHugger Robot
cda9876fe8
Merge "Don't depend on shadow IRoleManager."
2020-12-11 01:54:12 +00:00
TreeHugger Robot
7c7dde7768
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e05f1a4bb7
-s ours am: 04e97d441d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13202479
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97fbf398ab14dd3a0d855afec6c8a2a6b39a8e78
2020-12-11 01:22:48 +00:00
ykhung
351ffbeac9
Fix failure BatteryInfoTest after string is update
...
Bug: 175277366
Test: make RunSettingsRoboTests -j40
Change-Id: I142ba70548c6dac9bfc33e0833c99da188817023
2020-12-11 09:16:19 +08:00
TreeHugger Robot
04e97d441d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e05f1a4bb7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13202479
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie055bb147e9bb33ddd6508aa69147b95ec49d932
2020-12-11 01:05:20 +00:00
TreeHugger Robot
36cf656242
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-11 00:29:28 +00:00
TreeHugger Robot
057c519b9b
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-11 00:12:32 +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
0a1f495351
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idb3bd59839bed13914239d40a63eb3f46ed1a69d
2020-12-10 13:46:02 -08:00
Bill Yi
a599079318
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id5f21e2a8868c4b8a4cd07763dad3098c8f0ab05
2020-12-10 12:57:44 -08: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
TreeHugger Robot
2441bfc019
Merge "Ignore the timeout test cases"
2020-12-10 13:46:51 +00:00
TreeHugger Robot
211908cf88
Merge "Ignore broken tests"
2020-12-10 13:39:50 +00:00
Weng Su
66869d2ff5
[Provider Model] Fix the NetworkDashboardFragmentTest failed issue
...
Since the getPreferenceScreenResId() is modified to return different resource ID when provider model enabled. So we need to update SEARCH_INDEX_DATA_PROVIDER class to match the same behavior.
Bug: 175290124
Test:
- Set Settings/System/Developer options/Feature
flags/settings_provider_model to true.
- atest -c NetworkDashboardFragmentTest
Change-Id: I05b0f830158429ddbbfba414cdb33a6df6a7465e
2020-12-10 13:29:49 +00:00
Tsung-Mao Fang
a6cd5b9cd4
Ignore the timeout test cases
...
Because some framework changes, two tests cause presubmit process can't
finish.
Ignore these two tests, and fix them as soon as possible.
Bug: 175076359
Test: Run robo test
Change-Id: I1ddb84500fb192329f4e36d440df796b9dd66bb0
2020-12-10 20:30:03 +08:00
Tsung-Mao Fang
5e4dac2e0a
Ignore broken tests
...
Ignore it now, and we will fix it as soon as possible.
Test: Run all robo tests
Bug: 175277366
Bug: 175276658
Bug: 175290003
Bug: 175277372
Change-Id: If6843fdf6212217342490f0787dd5f70f9df7adf
2020-12-10 20:25:36 +08:00
Ulyana Trafimovich
88074044c4
Merge "Add <uses-library> information." am: 4bb99a788a
am: b10b31bcad
am: 9ba309779b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I303a909ece0b32b7c3aadb7edd6b43cba2a2aa21
2020-12-10 11:53:43 +00:00
Ulyana Trafimovich
9ba309779b
Merge "Add <uses-library> information." am: 4bb99a788a
am: b10b31bcad
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d3304ca9208a84f1026c731e04a60298ed4efbd
2020-12-10 11:15:04 +00:00
Ulyana Trafimovich
b10b31bcad
Merge "Add <uses-library> information." am: 4bb99a788a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I86e3713c8ba955f4c655d3ea25f7c07b248ce3d8
2020-12-10 10:34:10 +00:00
Ulyana Trafimovich
4bb99a788a
Merge "Add <uses-library> information."
2020-12-10 10:19:15 +00:00
Manish Singh
7a418b240e
Merge "Remove transcoding for apps from Settings."
2020-12-10 07:50:17 +00:00
TreeHugger Robot
04322e2202
Merge "Add mutability flag to WifiSlice."
2020-12-10 06:37:36 +00:00
tim peng
cd7fda21a0
[automerger skipped] Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev am: 656867b4de
am: b36ec713ce
-s ours
...
am skip reason: Change-Id Idf6b07fb5918c487956fd1485d409c3161525f1b with SHA-1 9f66bd0be8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9db78419a22da6a76d1f1bd2808e85e16aa076d
2020-12-10 06:24:41 +00:00
tim peng
b36ec713ce
Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev am: 656867b4de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5e1054e999a39a7a91ad9fa04f874b12370b8a89
2020-12-10 05:53:28 +00: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
Xin Li
836df5eb3a
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5
-s ours am: ee06524dbe
-s ours am: fb437d54d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51ed09738078268db94c92729d9d448aefe037a1
2020-12-10 03:58:48 +00:00
Xin Li
fb437d54d9
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5
-s ours am: ee06524dbe
-s ours
...
am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b33cb519a95d18ba7d64d90db3b10e3a9afe211
2020-12-10 03:46:48 +00:00
Robert Luo
8da41d2eda
Migrate media output switcher metrics - 3/n
...
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.
Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
2020-12-10 11:10:45 +08:00
Xin Li
ee06524dbe
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5
-s ours
...
am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e2389a3b1ff505dc0a8cc84b1d9b21dd7f6c01b
2020-12-10 03:05:02 +00:00
Robert Luo
ce694271f2
Merge "Migrate media output switcher metrics - 3/n"
2020-12-10 02:36:59 +00:00
Xin Li
6e252c4cd5
Merge "DO NOT MERGE - Merge Android R QPR1"
2020-12-10 02:18:22 +00:00