Chuanghua Zhao
139124cd77
Merge "Fix FD leak during ADB shell install." am: c558f4cedf
...
am: 9882ad7a27
2018-10-24 14:33:56 -07:00
Chih-Hung Hsieh
b7ce376383
[automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE." am: 46049f5fec -s ours
...
am: fb5b05d2ff
2018-10-24 14:24:26 -07:00
Chih-hung Hsieh
eb919bc560
Merge "Allow implicit-fallthrough warnings locally." am: dd68cf76de
...
am: 0db2c27df7
2018-10-24 14:23:59 -07:00
Chih-Hung Hsieh
bd0093e182
Merge "Fix implicit-fallthrough warnings." am: 8f520e6f83
...
am: a6c90c99cd
2018-10-24 14:19:26 -07:00
Dan Shi
3084f41930
Merge "Mark 4 tests as FlakyTest" am: 50242ce28a
...
am: e52b43f54e
2018-10-24 14:14:54 -07:00
Bill Yi
f5e484a688
Merge "Merge pi-dr1-dev to aosp-master" am: 04d53e2611
...
am: 6bf05d4c6f
2018-10-24 14:05:58 -07:00
Bill Lin
e4df226c6d
Merge "Device show "No SIM card" and then showing carrier name during boot" into pi-dev
...
am: 2f97046a4e
2018-10-24 02:49:00 -07:00
Bill Lin
2f97046a4e
Merge "Device show "No SIM card" and then showing carrier name during boot" into pi-dev
2018-10-24 09:35:33 +00:00
Steve Elliott
ccf0c2ae4c
[automerger skipped] DO NOT MERGE: Add configurable default setting for assistant componentname am: d5bed0f4b6 -s ours
...
am: bd1a7fa5c3
2018-10-23 11:15:46 -07:00
Steve Elliott
bd1a7fa5c3
[automerger skipped] DO NOT MERGE: Add configurable default setting for assistant componentname
...
am: d5bed0f4b6
2018-10-23 11:06:30 -07:00
Brad Ebinger
fe499bc0fb
Merge "Adds new Public ImsManager API" into pi-dev-plus-aosp
2018-10-23 16:46:00 +00:00
weichinweng
cd42fe9215
[automerger skipped] Merge "AudioService: Add Hearing Aid Switch Control" into pi-dev
...
am: 71cedf9b0c
2018-10-23 02:18:21 -07:00
TreeHugger Robot
71cedf9b0c
Merge "AudioService: Add Hearing Aid Switch Control" into pi-dev
2018-10-23 09:04:49 +00:00
Brad Ebinger
35cfa4fea5
Adds new Public ImsManager API
...
Exposes IMS functionality using new ImsManager API.
Bug: 116493310
Bug: 112538960
Bug: 112866475
Test: Telephony Unit Tests
Merged-In: I856fd7edd7a8b6085567ae6de12340f9086a4903
Change-Id: I856fd7edd7a8b6085567ae6de12340f9086a4903
2018-10-22 10:44:48 -07:00
Daniel Sandler
8b6a2e8521
[automerger skipped] Merge "Add configurable default setting for assistant componentname" into pi-dev
...
am: afda78ad15
2018-10-22 06:57:25 -07:00
Daniel Sandler
afda78ad15
Merge "Add configurable default setting for assistant componentname" into pi-dev
2018-10-22 13:42:07 +00:00
Chuanghua Zhao
9882ad7a27
Merge "Fix FD leak during ADB shell install."
...
am: c558f4cedf
2018-10-20 01:20:28 -07:00
Treehugger Robot
c558f4cedf
Merge "Fix FD leak during ADB shell install."
2018-10-20 07:25:24 +00:00
Chih-Hung Hsieh
fb5b05d2ff
[automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE."
...
am: 46049f5fec
2018-10-19 19:52:05 -07:00
Treehugger Robot
46049f5fec
Merge "Fix implicit-fallthrough warnings. DO NOT MERGE."
2018-10-20 01:08:55 +00:00
Chih-hung Hsieh
0db2c27df7
Merge "Allow implicit-fallthrough warnings locally."
...
am: dd68cf76de
2018-10-19 18:05:02 -07:00
Chih-hung Hsieh
dd68cf76de
Merge "Allow implicit-fallthrough warnings locally."
2018-10-20 00:44:34 +00:00
Chih-Hung Hsieh
a6c90c99cd
Merge "Fix implicit-fallthrough warnings."
...
am: 8f520e6f83
2018-10-19 17:31:02 -07:00
Treehugger Robot
8f520e6f83
Merge "Fix implicit-fallthrough warnings."
2018-10-20 00:15:20 +00:00
Dan Shi
e52b43f54e
Merge "Mark 4 tests as FlakyTest"
...
am: 50242ce28a
2018-10-19 15:37:29 -07:00
Chih-Hung Hsieh
df891f8a31
Fix implicit-fallthrough warnings. DO NOT MERGE.
...
These changes are not needed in goog/master.
Test: make checkbuild
Bug: 112564944
Change-Id: I75972e680c9502e1b83845f08e79b99a8084cc4c
2018-10-19 15:32:26 -07:00
Dan Shi
50242ce28a
Merge "Mark 4 tests as FlakyTest"
2018-10-19 22:13:34 +00:00
Dan Sandler
ad1908c428
Add configurable default setting for assistant componentname
...
By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.
(Note: this is a fix to Change-Id: Ib32daf that clarifies
the logic if R.string.config_defaultAssistantComponentName
has not been set in a given build.)
Test: manual
Bug: 111603898
Change-Id: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
Merged-In: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
2018-10-19 18:12:40 -04:00
Bill Yi
6bf05d4c6f
Merge "Merge pi-dr1-dev to aosp-master"
...
am: 04d53e2611
2018-10-19 14:51:29 -07:00
Dan Shi
2192b50a29
Mark 4 tests as FlakyTest
...
Until b/113616538 is fixed, a test class without FlakyTest, can be included in
a presubmit test mapping suite unexpectedly. Mark these 3 classes as FlakyTest
for now:
ActivityManagerServiceTest
AssistDataRequesterTest
AppErrorDialogTest
This test becomes unstable and still needs to be fixed before it can run in
presubmit:
TaskPositioningControllerTests
Bug: 117880789
Test: none
Change-Id: I3ed29bcbd30e34d6fd97169ac2913fbf312d4f70
2018-10-19 14:25:36 -07:00
Bill Yi
04d53e2611
Merge "Merge pi-dr1-dev to aosp-master"
2018-10-19 21:19:30 +00:00
Chih-Hung Hsieh
672a4fd863
Fix implicit-fallthrough warnings.
...
Test: make checkbuild
Bug: 112564944
Change-Id: Iaebada5e1a5d94ed06d9b584b888a4f78c0b8505
2018-10-19 14:19:29 -07:00
Brad Ebinger
6984c36cc0
Merge "Expose the empty MmTelCapabilities constructor" am: 7fff7e5eff
...
am: 4e63b90a3b
2018-10-19 13:54:58 -07:00
Jayachandran Chinnakkannu
fce7b175d7
Merge "Add a new intent ACTION_MMSSMS_DATABASE_LOST" into pi-dev
...
am: e25c238953
2018-10-19 13:46:17 -07:00
Brad Ebinger
4e63b90a3b
Merge "Expose the empty MmTelCapabilities constructor"
...
am: 7fff7e5eff
2018-10-19 13:34:36 -07:00
Jayachandran Chinnakkannu
e25c238953
Merge "Add a new intent ACTION_MMSSMS_DATABASE_LOST" into pi-dev
2018-10-19 20:32:41 +00:00
Niklas Lindgren
a65185a0f6
Merge "Remove resources for 4G/LTE/LTE+ icons" am: 1868b7eec8
...
am: 75ff8539c0
2018-10-19 13:31:50 -07:00
chen xu
7f3258ac83
Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED" am: 2c10a29eaa
...
am: fd6cccc775
2018-10-19 13:26:32 -07:00
Steve Elliott
d5bed0f4b6
DO NOT MERGE: Add configurable default setting for assistant componentname
...
By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.
Test: manual
Bug: 111603898
Change-Id: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
Merged-In: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
2018-10-19 16:24:19 -04:00
Brad Ebinger
7fff7e5eff
Merge "Expose the empty MmTelCapabilities constructor"
2018-10-19 20:20:14 +00:00
Chen Xu
39f0965925
Merge "new SystemAPI for setCarrierDataEnabled" am: 7dd38c2115
...
am: 6ec00c2584
2018-10-19 13:16:05 -07:00
Niklas Lindgren
75ff8539c0
Merge "Remove resources for 4G/LTE/LTE+ icons"
...
am: 1868b7eec8
2018-10-19 13:09:14 -07:00
chen xu
fd6cccc775
Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED"
...
am: 2c10a29eaa
2018-10-19 12:56:35 -07:00
Chen Xu
6ec00c2584
Merge "new SystemAPI for setCarrierDataEnabled"
...
am: 7dd38c2115
2018-10-19 12:52:37 -07:00
Treehugger Robot
1868b7eec8
Merge "Remove resources for 4G/LTE/LTE+ icons"
2018-10-19 19:26:20 +00:00
Bill Yi
0b537c73f7
Merge pi-dr1-dev to aosp-master
...
Change-Id: I40fca8b785049f8563809a70f6671b8af89f3cfd
2018-10-19 12:20:31 -07:00
Treehugger Robot
2c10a29eaa
Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED"
2018-10-19 19:19:26 +00:00
Chih-Hung Hsieh
8767a4ede6
Allow implicit-fallthrough warnings locally.
...
It will be a global error by default.
Test: make checkbuild
Bug: 112564944
Change-Id: Ib23d0cc8b95a3734d5bd28f8c9d967df669cfdf8
Exempt-From-Owner-Approval: do not block on new warnings
2018-10-19 12:13:48 -07:00
Chen Xu
cd6874f0bf
Merge "Revert "Telephony light grey list clean up for Q"" am: a18e095754
...
am: c16c2f7c8e
2018-10-19 12:11:23 -07:00
Chen Xu
c16c2f7c8e
Merge "Revert "Telephony light grey list clean up for Q""
...
am: a18e095754
2018-10-19 11:58:21 -07:00
