Xiangyu/Malcolm Chen
d9d9a79d31
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2 am: 226715e54e
...
am: b55caa7afc
2019-06-05 11:49:35 -07:00
Xiangyu/Malcolm Chen
b55caa7afc
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
...
am: 226715e54e
2019-06-05 11:35:09 -07:00
Xiangyu/Malcolm Chen
226715e54e
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
...
am: 13cbb2eea2
2019-06-05 11:21:33 -07:00
Xiangyu/Malcolm Chen
13cbb2eea2
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
2019-06-05 18:03:17 +00:00
TreeHugger Robot
205520bea1
Merge "Fix BatteryTipDialogFragmentTest"
2019-06-05 12:29:31 +00:00
tmfang
1392e6c979
Fix BatteryTipDialogFragmentTest
...
Test case can't get application info. We add test app information
in packagemanager in setup().
Test: atest BatteryTipDialogFragmentTest
Fixes: 134451831
Change-Id: I687f5f3a52ba8af346dbd0d798e4eee34a583870
2019-06-05 10:10:49 +00:00
Malcolm Chen
57badc2a82
Triggering notifications when dual CDMA SIM combinations are detected
...
In Settings, catch the intent from Telephony about SIM combination
warning and show a notification about it.
Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.
Change-Id: Ifd0e13781e4afc3bfd82415b3e51fd10176d9f9d
2019-06-04 17:11:09 -07:00
Alan Stokes
7b707bb204
Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d am: dd1545b098
...
am: c912a02f50
2019-06-04 07:53:23 -07:00
Alan Stokes
c912a02f50
Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
...
am: dd1545b098
2019-06-04 07:43:00 -07:00
Alan Stokes
5b09f510e2
Merge "Cleanup background activity starts for release." into qt-dev
...
am: c53f5ecb3d
2019-06-04 07:38:04 -07:00
Alan Stokes
dd1545b098
Merge "Cleanup background activity starts for release." into qt-dev
...
am: c53f5ecb3d
2019-06-04 07:38:00 -07:00
Alan Stokes
c53f5ecb3d
Merge "Cleanup background activity starts for release." into qt-dev
2019-06-04 14:26:29 +00:00
tmfang
675bc1940b
Ignore failure test case
...
Test: atest BatteryTipDialogFragmentTest
Bug: 134451831
Change-Id: I5649cbcf0d585514651c5b6befcca271e85a3cb3
2019-06-04 17:33:51 +08:00
Antony Sargent
5217f29671
Add a "data during calls" preference am: aeb1da0db9 am: 7f7f7cda18
...
am: 7a48cb470b
2019-06-03 19:00:57 -07:00
Antony Sargent
7a48cb470b
Add a "data during calls" preference am: aeb1da0db9
...
am: 7f7f7cda18
2019-06-03 18:47:56 -07:00
Antony Sargent
bffd3757e0
Add a "data during calls" preference
...
am: aeb1da0db9
2019-06-03 18:39:54 -07:00
Antony Sargent
7f7f7cda18
Add a "data during calls" preference
...
am: aeb1da0db9
2019-06-03 18:39:19 -07:00
Antony Sargent
aeb1da0db9
Add a "data during calls" preference
...
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.
Bug: 132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
2019-06-03 15:20:33 -07:00
Lei Yu
68c81d5b79
Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50 am: 057dc8466a
...
am: 1fa5118618
2019-06-03 10:15:47 -07:00
Lei Yu
1fa5118618
Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
...
am: 057dc8466a
2019-06-03 10:08:14 -07:00
Lei Yu
7f8a269a3a
Merge "Use new API to build NetworkTemplate" into qt-dev
...
am: c9fbd2ee50
2019-06-03 10:06:14 -07:00
Lei Yu
057dc8466a
Merge "Use new API to build NetworkTemplate" into qt-dev
...
am: c9fbd2ee50
2019-06-03 10:03:30 -07:00
Lei Yu
c9fbd2ee50
Merge "Use new API to build NetworkTemplate" into qt-dev
2019-06-03 16:54:29 +00:00
Joel Galenson
9e05bf902a
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev am: 4a9055a99c
...
am: efbf351167
2019-05-31 15:34:06 -07:00
Joel Galenson
efbf351167
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
...
am: 4a9055a99c
2019-05-31 15:04:56 -07:00
TreeHugger Robot
4a9055a99c
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
2019-05-31 21:54:29 +00:00
Mehdi Alizadeh
793cb2c9c7
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a am: c4be5512a7
...
am: ecf3028123
2019-05-31 14:43:50 -07:00
Mehdi Alizadeh
ecf3028123
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
...
am: c4be5512a7
2019-05-31 14:34:09 -07:00
Mehdi Alizadeh
9b378dd381
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
...
am: cad67cdc0a
2019-05-31 14:30:18 -07:00
Mehdi Alizadeh
c4be5512a7
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
...
am: cad67cdc0a
2019-05-31 14:26:04 -07:00
Mehdi Alizadeh
cad67cdc0a
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
2019-05-31 21:08:08 +00:00
Mehdi Alizadeh
ffea2ae488
Disables the Gesture nav option if 3P launcher is default
...
Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.
Bug: 129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637
2019-05-31 12:26:28 -07:00
Lei Yu
09c60c349f
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207 am: fad8cec592
...
am: a22bf1cd8b
2019-05-31 11:10:26 -07:00
TreeHugger Robot
75a5ef8c16
Merge "Override 2 getSliceUri() instance to return platform slice"
2019-05-31 18:03:44 +00:00
Lei Yu
a22bf1cd8b
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
...
am: fad8cec592
2019-05-31 10:53:59 -07:00
Lei Yu
fad8cec592
Merge "Fix issues in battery usage accounting" into qt-dev
...
am: 2148c1a207
2019-05-31 10:41:54 -07:00
Lei Yu
677d5a5e01
Merge "Fix issues in battery usage accounting" into qt-dev
...
am: 2148c1a207
2019-05-31 10:40:50 -07:00
Lei Yu
ded55a1401
Use new API to build NetworkTemplate
...
This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.
Bug: 133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5
2019-05-31 10:19:17 -07:00
Lei Yu
2148c1a207
Merge "Fix issues in battery usage accounting" into qt-dev
2019-05-31 17:17:51 +00:00
Joel Galenson
2118f8a63f
Revert "Remove Permissions Hub."
...
This reverts commit 1e7c172ad5
2019-05-31 07:55:19 -07:00
Joel Galenson
5a9c0f861e
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4 am: 58246f66db
...
am: 0709624634
2019-05-31 06:17:32 -07:00
Joel Galenson
0709624634
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
...
am: 58246f66db
2019-05-31 06:12:29 -07:00
Joel Galenson
d8efe209f7
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
2019-05-31 06:07:30 -07:00
Joel Galenson
58246f66db
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
2019-05-31 06:07:29 -07:00
TreeHugger Robot
63088840c4
Merge "Remove Permissions Hub." into qt-dev
2019-05-31 13:02:12 +00:00
TreeHugger Robot
c0fbb533d2
Merge "Guard NPE when using search view"
2019-05-31 04:27:43 +00:00
Colin Cross
dc67600f18
Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d am: 2d7cf1d924
...
am: cde28793cd
2019-05-30 20:46:28 -07:00
Colin Cross
cde28793cd
Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d
...
am: 2d7cf1d924
2019-05-30 20:28:58 -07:00
Colin Cross
2d7cf1d924
Merge "Make test_options.timeout an int64" am: c56651b345
...
am: 001b1c556d
2019-05-30 20:24:25 -07:00
tmfang
f841748be3
Guard NPE when using search view
...
Test: This crash pattern was observed from monkey test, I can't reproduce it.
So, just rebuild rom.
Fixes: 132819226
Change-Id: I0726524dcf8e1622d64f75c17b3600a7440b58c2
2019-05-31 10:47:30 +08:00
