tim peng
22750c155a
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 771ece6156 am: 8b5d909a86 am: cc6ce21c84
...
Change-Id: If389f12b4a79d18d73bdca779049882a835ca3bf
2020-05-29 06:10:56 +00:00
tim peng
8b5d909a86
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 771ece6156
...
Change-Id: Iadb742a7328cc8b8a135c55026e19727c09e9415
2020-05-29 05:36:07 +00:00
tim peng
771ece6156
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629
...
Change-Id: I462bcb49de448b2a1d5ac81dd75460ca08c6558c
2020-05-29 05:21:48 +00:00
tim peng
6febf2c629
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev
2020-05-29 05:09:07 +00:00
Jay Aliomer
b74593007f
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 73a818e99f am: cfebbe6fa6
...
Change-Id: Ie6cce67aac703db052a40d8ec7be98b9ca109905
2020-05-29 00:05:01 +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
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
Jay Aliomer
fb6711ae92
Merge "Incorrect localization of dark theme custom time" into rvc-dev
2020-05-28 22:21:21 +00:00
Automerger Merge Worker
4bc830265a
Merge "Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 am: 691e31b0cf" into rvc-qpr-dev-plus-aosp am: 2d256d5ca8
...
Change-Id: I8233440348485f16894219fe1b50f12608303498
2020-05-28 16:27:54 +00:00
TreeHugger Robot
06887ca77f
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b am: 7a71c443d3 am: b6de518b1c
...
Change-Id: I02dd05021e7b905887457867a49c9d35acb8ad9a
2020-05-28 16:26:43 +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
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
Bonian Chen
e837495c6c
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d am: 8367dc4e03 am: f2bb69f354
...
Change-Id: I059fcd2231c9d4b65f1c6e2eaf74d1c9e7391193
2020-05-28 15:43:26 +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
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
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
SongFerngWang
480b56b3f3
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8 am: b086e67289 am: cc361e10ae
...
Change-Id: Icdceccc1028c3a050189a95a474f83fe123fceed
2020-05-28 15:07:37 +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
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
TreeHugger Robot
69584b6483
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3 am: db19d8ffd0 am: 36d8289420 am: f31dedc48b
...
Change-Id: I46fae75db778e1f070eb80740e96833e2057c0d7
2020-05-28 12:10:11 +00: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
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
b36ae16050
Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207 am: 4d93ad694b am: 3cb8e75d85 am: 60a3d7d01d am: 757e453581
...
Change-Id: I9f368ee2a47ef60faf73bf555c5bfc8325fd22bf
2020-05-28 07:51:42 +00: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
TreeHugger Robot
1035b0abb3
Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: d078f8e326 am: da614c603f am: b5a0ab2830
...
Change-Id: I18ff2d91405edbb430f22401f2e1e992786c62f8
2020-05-28 03:57:56 +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
TreeHugger Robot
aae8734076
Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8
...
Change-Id: Ia7dc3014b9dd92c787b692395f359f5bedc51ea5
2020-05-28 03:06:59 +00:00
TreeHugger Robot
01338915d8
Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev
2020-05-28 02:58:23 +00:00
TreeHugger Robot
4b196e4875
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 3e6e83faf9 am: 2fbf0c12a1
...
Change-Id: I1362b39bb707a4c1393b899641693d8e7836a068
2020-05-27 21:25:09 +00:00
