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
d8a4346764
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
am: cb1353756d
am: 06312e5db5
...
Change-Id: Ie4ee52bbf8a2b53ce70779f7bc8d23476ee3e20c
2020-05-28 15:29:39 +00:00
Bonian Chen
914ba05d04
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
am: 42ba4a5fc7
am: fd2b4d8c32
...
Change-Id: Id18f9c6462c5d500e933a48e6f22b0cc5bf7f3c5
2020-05-28 15:29:31 +00:00
Bonian Chen
f2bb69f354
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
am: cb1353756d
am: 8367dc4e03
...
Change-Id: I2bf3f6f320168dc1031299e084dbf79507a5a4f0
2020-05-28 15:29:17 +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
06312e5db5
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
am: cb1353756d
...
Change-Id: I86f0150ef7eb6f8f4666f749897f47ffff5333cf
2020-05-28 15:18:10 +00:00
Automerger Merge Worker
36f2bb83fc
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: 6425a5e7c9" into rvc-d1-dev-plus-aosp am: 666b90393f
am: 35db8bade4
...
Change-Id: Id25ef0089e71ae19dd3206ce6b3f09b3862cea6d
2020-05-28 15:07:53 +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
Automerger Merge Worker
e6779dd9aa
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: b6b8bc01e8
am: 24c4c990ef" into rvc-qpr-dev-plus-aosp am: 8351265a91
...
Change-Id: I0f5eb896e73376828403b965f73c8966aa7ba363
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
Automerger Merge Worker
35db8bade4
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: 6425a5e7c9" into rvc-d1-dev-plus-aosp am: 666b90393f
...
Change-Id: I0e9efd8725ea8df11e63880602e04c086fb80831
2020-05-28 14:58:15 +00:00
Automerger Merge Worker
8351265a91
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: b6b8bc01e8
am: 24c4c990ef" into rvc-qpr-dev-plus-aosp
2020-05-28 14:57:42 +00:00
SongFerngWang
c75635df7c
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: b6b8bc01e8
am: 24c4c990ef
...
Change-Id: I9667686c25d349502f76a469e74a7bc338ce4ba0
2020-05-28 14:57:38 +00:00
SongFerngWang
cc361e10ae
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: b6b8bc01e8
am: b086e67289
...
Change-Id: Iabf8c9a6293ba4c92de7c958f7674ea53ed5be39
2020-05-28 14:57:28 +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
24c4c990ef
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: b6b8bc01e8
...
Change-Id: I31d1fc85b15e7b3d4335380ca4dbe6ef1e856e57
2020-05-28 14:47:12 +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
Automerger Merge Worker
8396210ed6
Merge "Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
am: 44b9dfb558
am: e0ea0ace85" into rvc-qpr-dev-plus-aosp am: 067c2bc9cc
...
Change-Id: I14547893a5104a389c2ecb0c6c959ded4415d663
2020-05-28 12:10:30 +00:00
TreeHugger Robot
61c463a612
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
am: db19d8ffd0
am: 4d64c02c02
am: 1c7ae21c92
...
Change-Id: I1df9b3b9b05aaaf8edb0353e146cfb0929430b21
2020-05-28 12:10:19 +00: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
Automerger Merge Worker
067c2bc9cc
Merge "Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
am: 44b9dfb558
am: e0ea0ace85" into rvc-qpr-dev-plus-aosp
2020-05-28 11:53:30 +00:00
TreeHugger Robot
a7f410f808
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
am: 44b9dfb558
am: e0ea0ace85
...
Change-Id: If7e6884a69d577e7b1d5bf694b429ae00edd480f
2020-05-28 11:53:25 +00:00
TreeHugger Robot
1c7ae21c92
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
am: db19d8ffd0
am: 4d64c02c02
...
Change-Id: I83bff6dc02371e7bb9665a0b2030d15872814e06
2020-05-28 11:53:12 +00:00
TreeHugger Robot
f31dedc48b
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
am: db19d8ffd0
am: 36d8289420
...
Change-Id: I36a25ac523a0fd43abf343c272c6ae4062ae619b
2020-05-28 11:53:01 +00: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
4d64c02c02
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
am: db19d8ffd0
...
Change-Id: Ie01c24aed0ef2988e9815779193afffd7fd792d8
2020-05-28 11:35:46 +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
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
757e453581
Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207
am: 4d93ad694b
am: 3cb8e75d85
am: 60a3d7d01d
...
Change-Id: Iee36cea988dc59e880ff1deb14e17e96dd3f9dce
2020-05-28 07:25:09 +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