Andrew Sapperstein
0590293c31
Merge "Remove "data usage" from search." into qt-dev am: 655e2e55e9
...
am: 706db87435
2019-04-30 00:27:02 -07:00
Fan Zhang
1f20c4cf68
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev am: 4fe327858f
...
am: 7ba7f47ae3
2019-04-30 00:24:25 -07:00
Lei Yu
4f207934a4
Merge "Hide number label if info is opportunistic" into qt-dev am: 1a66d9b22f
...
am: f6ff7a02fb
2019-04-30 00:23:16 -07:00
Andy Chou
114fa266ef
Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev am: 8c16ef2906
...
am: 5f82b6e72e
2019-04-30 00:22:23 -07:00
Chandan Nath
1a96c61193
Merge "Always show backup settings (even if backup is deactivated)." into qt-dev am: 2f2a3c4055
...
am: 2ab7fab9a8
2019-04-30 00:21:33 -07:00
hughchen
b7fb90ab6c
Merge "Fix media output slice is empty even BT device is paired" into qt-dev am: 668edcfb95
...
am: a35353d687
2019-04-30 00:17:55 -07:00
Lifu Tang
8968de16d4
Merge "Add timestamp to recent used apps" into qt-dev am: 80be930357
...
am: 68310109ef
2019-04-30 00:17:02 -07:00
Lei Yu
a7578022f0
Merge "Update color filter for battery saver mode" into qt-dev am: 30991963e4
...
am: c86d7fb326
2019-04-30 00:15:16 -07:00
Andrew Sapperstein
706db87435
Merge "Remove "data usage" from search." into qt-dev
...
am: 655e2e55e9
2019-04-30 00:13:08 -07:00
Salvador Martinez
cf61ab8596
Merge "Fix broken dark ui test" into qt-dev am: 1eb92917c9
...
am: 0677441d03
2019-04-30 00:12:28 -07:00
Yanting Yang
f1934ac7f7
Merge "Improve the latency of NotificationChannelSlice" into qt-dev am: c7564be562
...
am: 4bcd5b2cfd
2019-04-30 00:11:32 -07:00
Fan Zhang
7ba7f47ae3
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
...
am: 4fe327858f
2019-04-30 00:10:49 -07:00
Lei Yu
f6ff7a02fb
Merge "Hide number label if info is opportunistic" into qt-dev
...
am: 1a66d9b22f
2019-04-30 00:10:07 -07:00
Andy Chou
5f82b6e72e
Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev
...
am: 8c16ef2906
2019-04-30 00:09:23 -07:00
Chandan Nath
2ab7fab9a8
Merge "Always show backup settings (even if backup is deactivated)." into qt-dev
...
am: 2f2a3c4055
2019-04-30 00:08:26 -07:00
hughchen
a35353d687
Merge "Fix media output slice is empty even BT device is paired" into qt-dev
...
am: 668edcfb95
2019-04-30 00:07:39 -07:00
Lifu Tang
68310109ef
Merge "Add timestamp to recent used apps" into qt-dev
...
am: 80be930357
2019-04-30 00:06:49 -07:00
Lei Yu
c86d7fb326
Merge "Update color filter for battery saver mode" into qt-dev
...
am: 30991963e4
2019-04-30 00:05:05 -07:00
Salvador Martinez
0677441d03
Merge "Fix broken dark ui test" into qt-dev
...
am: 1eb92917c9
2019-04-30 00:02:41 -07:00
Yanting Yang
4bcd5b2cfd
Merge "Improve the latency of NotificationChannelSlice" into qt-dev
...
am: c7564be562
2019-04-30 00:01:51 -07:00
Andrew Sapperstein
655e2e55e9
Merge "Remove "data usage" from search." into qt-dev
2019-04-26 20:28:06 +00:00
Fan Zhang
4fe327858f
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
2019-04-26 19:57:09 +00:00
Andrew Sapperstein
62a68d6edb
Remove "data usage" from search.
...
Fixes: 131324402
Test: verified manually
Change-Id: Ib72902c3eaa1f2427e9c1c835ba2939f28cf7a0d
2019-04-26 10:23:02 -07:00
Fan Zhang
f61db6e9d7
Fix incorrect mapping to get subscriptioninfo
...
getActiveSubscriptionInfoList() returns a list of active subscription.
It doesn't 1:1 mapping with slotId. So it is not correct to use slotId
as index to get subscriptioninfo from list.
Use framework interface getActiveSubscriptionInfoForSimSlotIndex() to
get subscriptioninfo per slotid instead.
Fixes: 129038597
Test: robotest
Change-Id: If4277c425e6145e0e3ba716551d0dce46cdb61ab
2019-04-26 10:07:07 -07:00
Lei Yu
1a66d9b22f
Merge "Hide number label if info is opportunistic" into qt-dev
2019-04-26 16:54:02 +00:00
Andy Chou
8c16ef2906
Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev
2019-04-26 15:04:25 +00:00
Chandan Nath
2f2a3c4055
Merge "Always show backup settings (even if backup is deactivated)." into qt-dev
2019-04-26 08:14:53 +00:00
andychou
7c89a929c4
Avoid IMEI overrided by getSummary() for dual SIM condition
...
IMEI information will be overrided by getSummary() and cause second slot IMEI is
oerrided by first slot.
Avoid IMEI is override by first slot information.
Bug: 131124169
Test: Test with dual SIM device and atest
ImeiInfoPreferenceControllerTest, ImeiInfoDialogControllerTest pass
Change-Id: Ia0a028aa0103867f42fff610129cf7ce2d3910b7
2019-04-26 09:31:43 +08:00
TreeHugger Robot
668edcfb95
Merge "Fix media output slice is empty even BT device is paired" into qt-dev
2019-04-26 00:46:48 +00:00
TreeHugger Robot
80be930357
Merge "Add timestamp to recent used apps" into qt-dev
2019-04-25 22:54:20 +00:00
Lei Yu
7e9ef34112
Hide number label if info is opportunistic
...
Fixes: 125855323
Test: RunSettingsRoboTests
Change-Id: I6f77d65691319097c9bf56232710ba12fa7360f3
2019-04-25 14:56:59 -07:00
Lei Yu
30991963e4
Merge "Update color filter for battery saver mode" into qt-dev
2019-04-25 21:42:56 +00:00
TreeHugger Robot
7e4cd25d9d
Merge "ANR observed under settings when trying to reset network settings"
2019-04-25 20:03:34 +00:00
Lifu Tang
c359536d0b
Add timestamp to recent used apps
...
Bug: 129354132
Test: build, flash, and test manually
Change-Id: If8e657460da45db019633e95e77dffb1493997c0
2019-04-25 12:47:42 -07:00
TreeHugger Robot
1eb92917c9
Merge "Fix broken dark ui test" into qt-dev
2019-04-25 19:25:30 +00:00
TreeHugger Robot
c7564be562
Merge "Improve the latency of NotificationChannelSlice" into qt-dev
2019-04-25 17:31:16 +00:00
Salvador Martinez
b0737ee174
Fix broken dark ui test
...
It was checking something in shared preferences which seems
to have stopped working (a bunch of the stuff used in the
test is deprecated). This CL just has it verify that
updateDarkTheme() is called when appropriate since that
is all we really care about.
Test: is a test
Bug: 130897882
Change-Id: If3286dd91b5a95cb0f41cac619a11a9089e0aecf
2019-04-25 10:25:15 -07:00
Pasty Chang
7dfb0f3df9
Merge "Update the fingerprint skip dialog" into qt-dev am: d6f9ec122d
...
am: 6c43c5a924
2019-04-25 02:27:21 -07:00
Pasty Chang
6c43c5a924
Merge "Update the fingerprint skip dialog" into qt-dev
...
am: d6f9ec122d
2019-04-25 02:17:09 -07:00
Clown SHEN
5ea8dd1386
Merge "Fix NPE when connect timeout" into qt-dev am: 05e680d3c8
...
am: 2cd35901f6
2019-04-25 00:35:24 -07:00
Fan Zhang
4df4d40e1a
Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev am: c78e4d1e0f
...
am: 3a5dd82969
2019-04-25 00:32:55 -07:00
Antony Sargent
4b20393348
Merge "Implement off state for SIM details page" into qt-dev am: 62d580d5b4
...
am: d6209877b1
2019-04-25 00:30:36 -07:00
Julia Reynolds
a35e3d9d88
Merge "Fix notification preferences" into qt-dev am: 42eefd0d7e
...
am: 953bb4514c
2019-04-25 00:18:15 -07:00
Clown SHEN
2cd35901f6
Merge "Fix NPE when connect timeout" into qt-dev
...
am: 05e680d3c8
2019-04-25 00:17:19 -07:00
Fan Zhang
3a5dd82969
Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev
...
am: c78e4d1e0f
2019-04-25 00:14:59 -07:00
Antony Sargent
d6209877b1
Merge "Implement off state for SIM details page" into qt-dev
...
am: 62d580d5b4
2019-04-25 00:12:19 -07:00
Julia Reynolds
953bb4514c
Merge "Fix notification preferences" into qt-dev
...
am: 42eefd0d7e
2019-04-25 00:08:26 -07:00
Pasty Chang
d6f9ec122d
Merge "Update the fingerprint skip dialog" into qt-dev
2019-04-25 06:12:19 +00:00
hughchen
53eb9eb24d
Fix media output slice is empty even BT device is paired
...
Return the empty ListBuilder instead of return null in
getSlice().
Bug: 131140677
Test: make -j42 RunSettingsRobotests
Change-Id: I2b1a4bc0c6d2017ec85b2e9f8a5bfc08a0eba1b5
2019-04-25 11:05:27 +08:00
Raff Tsai
3aeb915355
ANR observed under settings when trying to reset network settings
...
- Move reset network settings code to async task.
Test: manual, Robolectric
Fixes: 130772994
Change-Id: I59345f48ed840ecfd64c29c2c20ab8caf2679f63
2019-04-25 02:55:25 +00:00
