Jay Aliomer
bc1d235392
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92
am: 2f9e6f6ba3
...
Change-Id: I65a6524f259ae3cdbdaa9d11f8f86bcf5b065b68
2020-05-28 23:50:58 +00:00
Jay Aliomer
73a818e99f
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92
am: e931c35f4d
...
Change-Id: I2f3937ea0edfa14470bbf9dd4d7d147bf39cd8d6
2020-05-28 23:38:34 +00:00
TreeHugger Robot
83be1b647b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie33f766bfdd35e198bafed6eeaee788c21f861aa
2020-05-28 23:38:18 +00:00
Jay Aliomer
e931c35f4d
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92
...
Change-Id: Ibf41defa2849b26c934dd3b72d30117993d696f2
2020-05-28 23:37:48 +00:00
Jay Aliomer
2f9e6f6ba3
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92
...
Change-Id: I1b5f3194e8a9df86aacc359322792c0e0561f9b2
2020-05-28 23:37:07 +00:00
TreeHugger Robot
3304eb3fb6
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-28 22:52:24 +00:00
Jay Aliomer
fb6711ae92
Merge "Incorrect localization of dark theme custom time" into rvc-dev
2020-05-28 22:21:21 +00:00
TreeHugger Robot
4bd0678f8d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64
-s ours am: 171694b82e
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I0e9923c6059bb8d6a6b7b2f04c357d2ca74dcbe8
2020-05-28 20:25:29 +00:00
TreeHugger Robot
7b20181315
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64
-s ours am: d33f82d74d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibbec16d34d5cc96164b9de16b43270566fe347f5
2020-05-28 20:25:17 +00:00
TreeHugger Robot
d33f82d74d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3a54ebb46410c308d3a4bb0fbc34a328157fb8e9
2020-05-28 20:09:52 +00:00
TreeHugger Robot
171694b82e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iea9d42d6ce8c804b8cff63ef81ec9bca49aab7ad
2020-05-28 20:09:41 +00:00
TreeHugger Robot
be2190fe64
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-28 19:58:59 +00:00
Bill Yi
049aca9d5e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I5f6b84e0c2aef2d2c258f6c8dc80a140c04b1153
2020-05-28 19:17:11 +00:00
Bill Yi
18428dce24
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I09d9add17cf33cbe0525e728f4e7a3c19a7aa9f2
2020-05-28 18:38:28 +00:00
paulhu
a788a3190c
Forward the ResultReceiver to Tethering Entitlement app
...
Bug: 156336264
Test: atest TetherProvisioningActivityTest
Change-Id: I37fcaddd5569223146ff9d6316d97f33312d8d24
Merged-In: I37fcaddd5569223146ff9d6316d97f33312d8d24
2020-05-29 00:06:52 +08:00
TreeHugger Robot
6129b0eb34
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43
am: a8ebfe9e00
...
Change-Id: I98a080e00085cde55c5ef3a7b9bbc865f3db0181
2020-05-28 16:01:06 +00:00
TreeHugger Robot
691e31b0cf
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43
am: 1438ab4d59
...
Change-Id: I4d39f1d1b7ad6d0ced731f93b3ac9d39e0209f5b
2020-05-28 16:00:55 +00:00
Automerger Merge Worker
22a8cba196
Merge "Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52
am: 7a89d57820" into rvc-d1-dev-plus-aosp
2020-05-28 16:00:49 +00:00
TreeHugger Robot
704823b2d4
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52
am: 7a89d57820
...
Change-Id: I3165cb7a5851841685370af19694e41f2a2243b8
2020-05-28 16:00:45 +00:00
TreeHugger Robot
7a71c443d3
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52
am: 1d1e16a09b
...
Change-Id: I05739c26296ff53f1c218e0dd0070e10f641e960
2020-05-28 16:00:38 +00:00
Jay Aliomer
57cc7d01ae
Incorrect localization of dark theme custom time
...
Fixes: 154361883
Test: manually select dark theme custom time and make sure it matches
locale
Change-Id: I2a918b4b2f5aad6b04d3b0318bbca25e82dfae78
2020-05-28 12:00:17 -04:00
TreeHugger Robot
a8ebfe9e00
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43
...
Change-Id: I153a235418d5089dff46d1f3cbc8b9e0989a2046
2020-05-28 15:48:18 +00:00
TreeHugger Robot
1438ab4d59
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43
...
Change-Id: I6fca5b77f9301f2ddf0336beb8f12dd8bfd9bcb6
2020-05-28 15:48:00 +00:00
TreeHugger Robot
7a89d57820
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52
...
Change-Id: I5f379ae4e52fcdbdeef33f995a4f7179846ca936
2020-05-28 15:47:52 +00:00
TreeHugger Robot
1d1e16a09b
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52
...
Change-Id: I50b31cbe7f309b988d30d5cab191dc6be9095eef
2020-05-28 15:47:30 +00:00
TreeHugger Robot
591d761d43
Merge "Revert "Do not prebind sticky slices."" into rvc-dev
2020-05-28 15:42:28 +00:00
Yi-Ling Chuang
740db33c5c
Revert "Do not prebind sticky slices."
...
This reverts commit ac59ea8e23
.
Reason for revert: Fix it using another approach in ag/11629780. The prebind part will be helpful to cache slice data.
Bug: 152365480
Change-Id: Iebed42027552a923907647b61480f135ac4f4097
2020-05-28 15:42:15 +00:00
TreeHugger Robot
c3b262ed52
Merge "Increase the timeout for contextual card loading." into rvc-dev
2020-05-28 15:37:37 +00:00
Bonian Chen
fd2b4d8c32
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
am: 42ba4a5fc7
...
Change-Id: I83ddb21ebd72872ecd23f5fd5c13b691a8529c96
2020-05-28 15:18:32 +00:00
Bonian Chen
8367dc4e03
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
am: cb1353756d
...
Change-Id: I42f4408e3030de899931be97cf9561797ccab725
2020-05-28 15:18:14 +00:00
Bonian Chen
cb1353756d
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
...
Change-Id: I98bea7d8fa90e267a3039012bf19babd2eec7223
2020-05-28 15:07:52 +00:00
Bonian Chen
42ba4a5fc7
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
...
Change-Id: I7ba14ae944d40e74038c3bdf8dd0a6cf44e5326b
2020-05-28 15:07:46 +00:00
Bonian Chen
e2da25108a
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev
2020-05-28 14:59:47 +00:00
Automerger Merge Worker
666b90393f
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: 6425a5e7c9" into rvc-d1-dev-plus-aosp
2020-05-28 14:47:24 +00:00
SongFerngWang
04fe2247de
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: 6425a5e7c9
...
Change-Id: I55af5af7a75e99f66fa2106398d8a66da91a9afc
2020-05-28 14:47:18 +00:00
SongFerngWang
b086e67289
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: b6b8bc01e8
...
Change-Id: Ic87925e1939f53d5428007a613138155ac57eeb2
2020-05-28 14:47:13 +00:00
SongFerngWang
b6b8bc01e8
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
...
Change-Id: I4064e14c9ed83f5712141ebff4edc8217efd879b
2020-05-28 14:32:40 +00:00
SongFerngWang
6425a5e7c9
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
...
Change-Id: I9a5fc5bc6ef5e04a8fad91051cc3aacbe9c7261f
2020-05-28 14:32:35 +00:00
SongFerngWang
259e6288c9
EnabledNetworkModePreferenceController Remove AllowedNetworkType
...
Power manager decision do enable/disable NR by AllowedNetworkType,
and it will effect the PreferredNetworkMode UI. The
PreferredNetworkMode list no 5G item when AllowedNetworkType
disabled.
Bug: 156709797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (pass)
Change-Id: I3ab9eca0956c4cce1b79e518942063b681eb96cd
2020-05-28 20:37:51 +08:00
Tsung-Mao Fang
850bafbf58
Disable anomaly app detection for battery
...
This feature is introducing some false positive cases,
so we're going to disable this feature now.
Battery team will make it more precise in the next release.
Test: Run robotest. See there's no related card in battery page.
Fix: 156369998
Change-Id: I2dfe2f772e561b768af6af45ac92fdc65c1fafee
2020-05-28 20:14:32 +08:00
Yi-Ling Chuang
9d789ee7ba
Increase the timeout for contextual card loading.
...
Some cards require a bit more time to be loaded, so relax the timeout a
bit. After tweaking the time, the overall loading time seems decreased.
Fixes: 152365480
Test: rebuild and launch
Change-Id: Icc2f66b28a377bd8ce230f8a9918b8f1f164f4ff
2020-05-28 20:05:15 +08:00
TreeHugger Robot
e0ea0ace85
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
am: 44b9dfb558
...
Change-Id: Ie9be9bd48eded1c6a4f494ecb7712324c875b6ce
2020-05-28 11:36:10 +00:00
TreeHugger Robot
36d8289420
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
am: db19d8ffd0
...
Change-Id: I6d5f9b4c3ec723243039df217b7a03bb3af3ff5c
2020-05-28 11:35:52 +00:00
TreeHugger Robot
db19d8ffd0
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
...
Change-Id: I6cf54fdbb02d84367f3311f697499de00fbf6ced
2020-05-28 11:29:32 +00:00
TreeHugger Robot
44b9dfb558
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
...
Change-Id: I206522a9f33cc0cb1cebb5ac63e29bb42f27a506
2020-05-28 11:29:12 +00:00
TreeHugger Robot
f5056a03e3
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev
2020-05-28 11:14:49 +00:00
Bonian Chen
ce0f3c66a0
[Settings] Avoid crash for VoIP account displayed as default voice
...
When displaying VoIP account in Default voice account UI within
mobile network configuration, some null pointer checking need to
applied due to this is no longer a real account bind to SIM card.
Bug: 157334667
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Change-Id: I3927362676c867ac245f16e1d00ea953b21ec1d4
2020-05-28 18:17:42 +08:00
Jason Chiu
2ec9aee1e1
Send metrics log of card dismiss event to SI instantly
...
The 1 minute send delay of the original log writer makes the dismissed
card list in SI is not up to date, which causes some dismissed card
reappears.
Bug: 157211258
Test: manual
Change-Id: I0780a444e10a60c0cc7006b3bd65d37b33707134
2020-05-28 18:04:21 +08:00
Rubin Xu
5e51ed6a89
Allow setting password during provisioning if FRP is not supported
...
On devices without PersistentDataBlock support, we should
always allow setting up password during provisioning.
Bug: 157451551
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.password
Test: On cuttlefish, file ACTION_SET_NET_PASSWORD before SUW completes
Change-Id: Ic7b5d99b38e6427750ce70fa7e38f7ef6054d4ad
2020-05-28 10:30:47 +01:00
Edgar Wang
60a3d7d01d
Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207
am: 4d93ad694b
am: 3cb8e75d85
...
Change-Id: I6fd5b20fc63513e939ff30091bd8f7815e5618bc
2020-05-28 07:07:25 +00:00