Commit Graph

64148 Commits

Author SHA1 Message Date
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
18428dce24 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I09d9add17cf33cbe0525e728f4e7a3c19a7aa9f2
2020-05-28 18:38:28 +00: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
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
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
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
Edgar Wang
3cb8e75d85 Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207 am: 4d93ad694b
Change-Id: Ibb53d7709aab6f98d61045a5745fd0d52d108346
2020-05-28 06:59:05 +00:00
Edgar Wang
4d93ad694b Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207
Change-Id: I74e93eca610194d7251c596bb854446bbc3dc129
2020-05-28 06:45:04 +00:00
Edgar Wang
9bc3b6a207 Merge "Fix NPE if default supervisor is not defined" 2020-05-28 06:30:46 +00:00
Automerger Merge Worker
46e37f0930 Merge "Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b am: 786f69266b" into rvc-d1-dev-plus-aosp 2020-05-28 05:09:38 +00:00
Edgar Wang
60b7f5acb0 Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b am: 786f69266b
Change-Id: Ibb277107f5c4c9c59099305b5dbe21613a719ee0
2020-05-28 05:09:33 +00:00
Edgar Wang
6052f50c35 Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b am: 869e287894
Change-Id: If6a453d2116adf0d179713cb2d3f46f7ca2505b0
2020-05-28 05:09:28 +00:00
Edgar Wang
786f69266b Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b
Change-Id: I71eda01d338e6c1e424dbb30c016a1919fb4ac55
2020-05-28 04:54:43 +00:00
Edgar Wang
869e287894 Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b
Change-Id: If04ac5a8a6da67d3755400afc306f955e358d865
2020-05-28 04:54:41 +00:00
Edgar Wang
1821ab5e5b Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev 2020-05-28 04:43:17 +00:00
TreeHugger Robot
269d3529bd Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: aae8734076
Change-Id: Ia7e868b3754b96a0ae4ea0de66307eb8876ceec4
2020-05-28 03:22:43 +00:00
TreeHugger Robot
da614c603f Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: d078f8e326
Change-Id: I90a02cd29e01764568066bef01f73442c779a0cf
2020-05-28 03:22:38 +00:00
TreeHugger Robot
d078f8e326 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8
Change-Id: Ia4845ed6f59769cbd763e2137a807afa54696e62
2020-05-28 03:07:04 +00:00