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
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
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
Automerger Merge Worker
8ef2ebfb52
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 am: 46e37f0930
...
Change-Id: Ia8b29dafb03faa136f2ebdb5e50e90d9c9cacfae
2020-05-28 05:20:28 +00:00
Edgar Wang
38a1b4b91b
Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b
am: 869e287894
am: 669f7d9002
...
Change-Id: Ibf6d65064c8ca723fed00abcee18076bdc1a4047
2020-05-28 05:20:13 +00:00
Edgar Wang
d1d962af5c
Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b
am: 869e287894
am: 6052f50c35
...
Change-Id: I58a2b33d25baf3033bdfaddd8982b32917878f1e
2020-05-28 05:19:57 +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
669f7d9002
Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b
am: 869e287894
...
Change-Id: I26cad15058d9706f17a08e20dbbf9531c9ef1ccf
2020-05-28 05:09:13 +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
4251bdcce9
Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8
am: aae8734076
am: 269d3529bd
...
Change-Id: I3a9e8c8fc3a68008114c838b4ed3d486015e6c94
2020-05-28 03:35:29 +00:00
TreeHugger Robot
b058ab4b9f
Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8
am: aae8734076
am: a159271ce4
...
Change-Id: I91362ad7de388264f02cafa5ab8a92049ee167d0
2020-05-28 03:34:58 +00:00
TreeHugger Robot
b5a0ab2830
Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8
am: d078f8e326
am: da614c603f
...
Change-Id: I6dde38a47074dc2fc95d24589bf61346397fc646
2020-05-28 03:34:44 +00:00
TreeHugger Robot
a159271ce4
Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8
am: aae8734076
...
Change-Id: Id0aacce3979e957be319c760c5df96a5df2c714a
2020-05-28 03:22:45 +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
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
Chen Xu
8544e130a9
[automerger skipped] Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
am: 76f2b27e3b
-s ours am: 78c75b1d10
-s ours
...
am skip reason: Change-Id Ic38372d96918c17d3cd61832ff668fcfc61f0686 with SHA-1 c2ee364f6f
is in history
Change-Id: I818ce65335912c6b8bebc6b18ed0df18c723cdb5
2020-05-28 02:28:04 +00:00