OSDN Git Service
Brad Ebinger [Fri, 16 Feb 2018 23:21:41 +0000 (23:21 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs." am:
b8d25ed3a4
am:
5cb9aa55e8 -s ours
Change-Id: I9da5571baf210378fd2f0bbd59f3cca04be849af
Brad Ebinger [Fri, 16 Feb 2018 23:09:39 +0000 (23:09 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs."
am:
b8d25ed3a4
Change-Id: I1636e80c2f09e8949ba44f7225aed16448ed5692
Evan Rosky [Fri, 16 Feb 2018 21:36:56 +0000 (21:36 +0000)]
Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues" am:
8b764a0dab -s ours
am:
d418ecfc66 -s ours
Change-Id: I7d45de823c87f346b25ad0194dc538b560d67bad
Evan Rosky [Fri, 16 Feb 2018 21:25:26 +0000 (21:25 +0000)]
Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues"
am:
8b764a0dab -s ours
Change-Id: Iffb3e3c70d9d135f15f66f3bf7968dfef9f1d4f5
Vladislav Kaznacheev [Fri, 16 Feb 2018 20:46:04 +0000 (20:46 +0000)]
Merge "[DO NOT MERGE] Fix context menu position for RTL" am:
80ae7124f5 -s ours
am:
e715e2162e -s ours
Change-Id: I6edeac6d72d6f3471bbfc8f39fec282567441e82
Benedict Wong [Fri, 16 Feb 2018 20:43:12 +0000 (20:43 +0000)]
Merge "Correct bug in IpSecTransformTest" am:
999d1fc172
am:
c9f558d46d
Change-Id: I990729e8592e70898867fe72a3d628fd7f9fdaf0
Brad Ebinger [Fri, 16 Feb 2018 20:35:45 +0000 (20:35 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs."
Vladislav Kaznacheev [Fri, 16 Feb 2018 20:31:06 +0000 (20:31 +0000)]
Merge "[DO NOT MERGE] Fix context menu position for RTL"
am:
80ae7124f5 -s ours
Change-Id: If52d9831857624890785c31689d69dd6c0f28e09
Benedict Wong [Fri, 16 Feb 2018 20:28:18 +0000 (20:28 +0000)]
Merge "Correct bug in IpSecTransformTest"
am:
999d1fc172
Change-Id: If99a991052a821f43b8238a47d0d2c7e00362bc3
Treehugger Robot [Fri, 16 Feb 2018 20:02:26 +0000 (20:02 +0000)]
Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues"
Treehugger Robot [Fri, 16 Feb 2018 19:54:26 +0000 (19:54 +0000)]
Merge "[DO NOT MERGE] Fix context menu position for RTL"
Benedict Wong [Fri, 16 Feb 2018 18:32:05 +0000 (18:32 +0000)]
Merge "Correct bug in IpSecTransformTest"
Andreas Gampe [Fri, 16 Feb 2018 17:57:14 +0000 (17:57 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos" am:
4eaa22f24e
am:
1c14209950
Change-Id: Ib664802f2a8673ba0d1504a9b93f764ae993b044
Bruno Martins [Fri, 16 Feb 2018 17:50:09 +0000 (17:50 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase" am:
977bcea1f0
am:
a1f96ff00e
Change-Id: Id61a5fe96c065377916a630da4842bd675c8ab14
Andreas Gampe [Fri, 16 Feb 2018 17:46:08 +0000 (17:46 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos"
am:
4eaa22f24e
Change-Id: I376b8bea0e1c57a6f7e78970bc919d05d1ed372d
Bruno Martins [Fri, 16 Feb 2018 17:41:30 +0000 (17:41 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase"
am:
977bcea1f0
Change-Id: I692e2c21f92d0e8eff5c9114e012cd90e84f31e9
Mathew Inwood [Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +0000)]
Merge "Hidden API blacklisting killswitch." am:
46656fa28e
am:
84259cea59
Change-Id: Ia0bcbfb2cdc84a6a8a82f82ecda82f46ba46dab1
Mathew Inwood [Fri, 16 Feb 2018 16:31:26 +0000 (16:31 +0000)]
Merge "Hidden API blacklisting killswitch."
am:
46656fa28e
Change-Id: I1276e1eb5b2d4438ebc6f071ed28f1f322a8bc6e
Treehugger Robot [Fri, 16 Feb 2018 16:05:19 +0000 (16:05 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos"
Treehugger Robot [Fri, 16 Feb 2018 15:20:23 +0000 (15:20 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase"
Treehugger Robot [Fri, 16 Feb 2018 11:50:20 +0000 (11:50 +0000)]
Merge "Hidden API blacklisting killswitch."
Mathew Inwood [Thu, 15 Feb 2018 10:28:06 +0000 (10:28 +0000)]
Hidden API blacklisting killswitch.
Just support "*" for now, meaning disable all API blacklisting for all
apps.
Test: Manually verified by:
- installing test app that accesses hidden API
- manually blacklist the API
- $ adb shell settings put global hidden_api_blacklist_exemptions \\*
This is a cherry pick of change I9a41a104742c9aaaf3a753e7b0f3a1106e37d4d3
from internal master.
Merged-In: I9a41a104742c9aaaf3a753e7b0f3a1106e37d4d3
Change-Id: Ibb2a1d054c1b099fc6093e37f24b2ed421a2313c
Hugo Benichi [Fri, 16 Feb 2018 07:50:57 +0000 (07:50 +0000)]
Merge "Add missing'}' in javadoc of public API method" am:
f50d9fbdc1
am:
054bed5968
Change-Id: I51ad1f6b8d42f4c791c07d41297f02d3e798ccd9
Hugo Benichi [Fri, 16 Feb 2018 07:43:08 +0000 (07:43 +0000)]
Merge "Add missing'}' in javadoc of public API method"
am:
f50d9fbdc1
Change-Id: I3afcd9a3752ff6d158d68ca3ce19272151c1908c
Calin Juravle [Fri, 16 Feb 2018 05:45:10 +0000 (05:45 +0000)]
Merge "Pass the compilation reason to dexopt" am:
b0817b238a
am:
68024999b7
Change-Id: I6a4e3dd19cf612bd698bff0f60de2ef3fac35604
Calin Juravle [Fri, 16 Feb 2018 05:34:41 +0000 (05:34 +0000)]
Merge "Pass the compilation reason to dexopt"
am:
b0817b238a
Change-Id: Id8b60a2963b35a44c9420d9846283091b5e0619e
Nathan Harold [Fri, 16 Feb 2018 03:19:43 +0000 (03:19 +0000)]
Merge "Fix LTE Timing Advance Doc String" am:
3df127aefe
am:
c52bec3acb
Change-Id: I352f5d1e72b48d7a4944b0f0935fe03d4c5979c1
Treehugger Robot [Fri, 16 Feb 2018 03:19:35 +0000 (03:19 +0000)]
Merge "Add missing'}' in javadoc of public API method"
Bruno Martins [Fri, 16 Feb 2018 03:14:38 +0000 (03:14 +0000)]
Merge "NfcTile: Avoid NPE during boot up phase" am:
3a419fe212
am:
3628537476
Change-Id: I383b289d734ed72f248e004c8767357aca2ac578
Nathan Harold [Fri, 16 Feb 2018 03:05:49 +0000 (03:05 +0000)]
Merge "Fix LTE Timing Advance Doc String"
am:
3df127aefe
Change-Id: I3dfbe863080d3a5aadb01e77cd5a28861045b696
Bruno Martins [Fri, 16 Feb 2018 03:01:36 +0000 (03:01 +0000)]
Merge "NfcTile: Avoid NPE during boot up phase"
am:
3a419fe212
Change-Id: I352028c1974c38f2a88ffb6bdc49da7bd28d2204
Benedict Wong [Fri, 16 Feb 2018 02:47:49 +0000 (18:47 -0800)]
Correct bug in IpSecTransformTest
testCreateTransformsWithSameConfigEqual used assertFalse rather than
assertTrue
Bug:
69385347
Test: Passing on walleye
Change-Id: I8caa26e184e8bfc3e8acc9061d85c22d27ebf448
Calin Juravle [Fri, 16 Feb 2018 02:25:48 +0000 (02:25 +0000)]
Merge "Pass the compilation reason to dexopt"
Dan Zhang [Fri, 16 Feb 2018 02:21:04 +0000 (02:21 +0000)]
Merge "Fix HdmiCecLocalDevice concurrent access" am:
549082991d
am:
1494c01109
Change-Id: I74f59f35e1d78bdd9dcef57a939ec7a7af625049
Dan Zhang [Fri, 16 Feb 2018 02:07:15 +0000 (02:07 +0000)]
Merge "Fix HdmiCecLocalDevice concurrent access"
am:
549082991d
Change-Id: I86dba1aa8ee360d5f813d3108902d6affd74b13f
Bruno Martins [Fri, 16 Feb 2018 01:52:44 +0000 (01:52 +0000)]
Merge "DndTile: Avoid NPE during boot phase" am:
e134d23a7a
am:
fe607c0e2b
Change-Id: I58e63317a1c842e49a072507565c546789bb01ad
Treehugger Robot [Fri, 16 Feb 2018 01:47:27 +0000 (01:47 +0000)]
Merge "Fix LTE Timing Advance Doc String"
Hall Liu [Fri, 16 Feb 2018 01:47:27 +0000 (01:47 +0000)]
Merge "Un-hide Connection-side RTT APIs for Dialer" am:
d35e81d615
am:
01ae6fc2cd
Change-Id: Iaaf10ec63261a38f928dca9e8d91c9ab3e74ae34
Bruno Martins [Fri, 16 Feb 2018 01:40:50 +0000 (01:40 +0000)]
Merge "DndTile: Avoid NPE during boot phase"
am:
e134d23a7a
Change-Id: Iff3b41e08abc89956b924b40b6d72bf79a294eb0
Hall Liu [Fri, 16 Feb 2018 01:37:01 +0000 (01:37 +0000)]
Merge "Un-hide Connection-side RTT APIs for Dialer"
am:
d35e81d615
Change-Id: I2da7e7766d131500167f745cc50ae882edc832cf
Treehugger Robot [Fri, 16 Feb 2018 01:34:43 +0000 (01:34 +0000)]
Merge "NfcTile: Avoid NPE during boot up phase"
Andreas Gampe [Thu, 15 Feb 2018 23:12:38 +0000 (15:12 -0800)]
Framework: Disable [MissingOverride] for platformprotos
Bug:
72714520
Test: m javac-check-platformprotos RUN_ERROR_PRONE=true
Merged-In: I00f5a588fa74621d4c35dc4e39b54536815ad476
Change-Id: I00f5a588fa74621d4c35dc4e39b54536815ad476
Hall Liu [Fri, 16 Feb 2018 01:18:30 +0000 (01:18 +0000)]
Merge "Add setting and logging for RTT" am:
b823d08d21
am:
1c2da9f909
Change-Id: Ic5ab105e5b2c3ad3866bee4d7dd5a6d8427adc74
Dan Zhang [Fri, 16 Feb 2018 01:17:02 +0000 (01:17 +0000)]
Merge "Fix HdmiCecLocalDevice concurrent access"
Hall Liu [Fri, 16 Feb 2018 00:38:10 +0000 (00:38 +0000)]
Merge "Add setting and logging for RTT"
am:
b823d08d21
Change-Id: I0207ee73eee69096dc83d89553d21d462886b788
Treehugger Robot [Fri, 16 Feb 2018 00:33:37 +0000 (00:33 +0000)]
Merge "DndTile: Avoid NPE during boot phase"
TreeHugger Robot [Fri, 16 Feb 2018 00:10:35 +0000 (00:10 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs." into oc-mr1-dev-plus-aosp
Treehugger Robot [Thu, 15 Feb 2018 23:56:55 +0000 (23:56 +0000)]
Merge "Un-hide Connection-side RTT APIs for Dialer"
Xiangyu/Malcolm Chen [Thu, 15 Feb 2018 23:50:31 +0000 (23:50 +0000)]
Merge "Add NetworkRegistrationState into SS's list." am:
9f92ed943c
am:
6576ed3d5b
Change-Id: I02efc2c7dceb775a5ce2eb3e3f2696e098cef046
Xiangyu/Malcolm Chen [Thu, 15 Feb 2018 23:39:01 +0000 (23:39 +0000)]
Merge "Add NetworkRegistrationState into SS's list."
am:
9f92ed943c
Change-Id: I4c99214c0f8a2561795cd320f8ff87c072a7a9bd
Brad Ebinger [Thu, 15 Feb 2018 21:46:48 +0000 (21:46 +0000)]
Merge "Add new owners files for Telephony/Telecom frameworks files." am:
1da6f542ef
am:
fee59fac7b
Change-Id: Ieb1f9465eaec47f51d3e62a15c7d4f6fd0970dd0
Hall Liu [Mon, 4 Dec 2017 22:19:30 +0000 (14:19 -0800)]
Un-hide Connection-side RTT APIs for Dialer
Bug:
63934808
Test: builds
Change-Id: I59a892fb0e314810e92dd9ad7d0c2f4610055045
Merged-In: I59a892fb0e314810e92dd9ad7d0c2f461005504
Calin Juravle [Thu, 15 Feb 2018 21:30:27 +0000 (21:30 +0000)]
Merge changes from topic "cp_calin_framework_2017" am:
b98102b4dc
am:
b3da44d9a1
Change-Id: Ibd848f6803d63da46ae1461b469422c5a6431980
Brad Ebinger [Thu, 15 Feb 2018 21:22:40 +0000 (21:22 +0000)]
Merge "Add new owners files for Telephony/Telecom frameworks files."
am:
1da6f542ef
Change-Id: I8d07cde7cc41393799228b1af49ee460e9cebd15
Nathan Harold [Thu, 15 Feb 2018 21:06:16 +0000 (13:06 -0800)]
Fix LTE Timing Advance Doc String
The Doc string for LTE timing advance incorrectly
lists the range based on the maximum size of an
incremental TA command rather than the cumulative
timing advance. The spec reference is correct, but
the range was wrong.
Bug:
66751464
Test: compilation (docstring only change)
Change-Id: I0242cae7af40a7d9ed5ae9a2a509592076e5b6a3
Hall Liu [Thu, 15 Feb 2018 21:01:10 +0000 (21:01 +0000)]
Merge "Add setting and logging for RTT"
Calin Juravle [Mon, 12 Feb 2018 20:00:44 +0000 (12:00 -0800)]
Pass the compilation reason to dexopt
Record the compilation reason in the oat files to enable better
performance monitoring.
Test: DexoptOptionsTest
manual
Bug:
73102540
Change-Id: Ifa487d4bc33dcd06f12af6bdd1d9a9c5f4562f4b
Calin Juravle [Thu, 15 Feb 2018 20:46:22 +0000 (20:46 +0000)]
Merge changes from topic "cp_calin_framework_2017"
am:
b98102b4dc
Change-Id: I524b166fbd551200a539a40e3531883b494f68db
Xiangyu/Malcolm Chen [Thu, 15 Feb 2018 19:01:59 +0000 (19:01 +0000)]
Merge "Add NetworkRegistrationState into SS's list."
Hall Liu [Tue, 30 Jan 2018 01:22:02 +0000 (17:22 -0800)]
Add setting and logging for RTT
Add a system setting to store preferred RTT mode for calls. Add logging
for RTT in Telecom base classes.
Bug:
63934808
Test: manual
Change-Id: Ie26fac800931604379bbe7b8abfed7caa8c0236d
Merged-In: Ie26fac800931604379bbe7b8abfed7caa8c0236d
Brad Ebinger [Thu, 15 Feb 2018 17:23:31 +0000 (17:23 +0000)]
Merge "Add new owners files for Telephony/Telecom frameworks files."
Treehugger Robot [Thu, 15 Feb 2018 16:17:06 +0000 (16:17 +0000)]
Merge changes from topic "cp_calin_framework_2017"
* changes:
Allow public profile compilation for primary apks
[framework] Pass .dm files to dexopt at install time
Extend the ArtManager profiling API to cover boot image profiling
[framework] Extend profile operations to take the profile name
Accept UserHandle.USER_ALL during profile preparation
[framework] Prepare profile for app code paths
Perform a non strict matching of .dm files when computing the size
Support installation of DexMetadata files (.dm)
Rename snapshotProfile to createProfileSnapshot for consistency
Implement ArtManager#snapshotProfile API
Add SystemApis to expose runtime profile information
Log SHA256 of secondary dex files during reconcile.
David Brazdil [Thu, 15 Feb 2018 13:14:49 +0000 (13:14 +0000)]
Merge "Update hidden API toast message" am:
10034d94cf
am:
42ab3eeb4c
Change-Id: I6c82dc811f3118733d3afffa7ddb6d5016d4f075
Chalard Jean [Thu, 15 Feb 2018 13:09:26 +0000 (13:09 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119 am:
edab226d0e
am:
6fe110fa36
Change-Id: Iebc6a31b975fd7ba429bd9bae89cd9783776d1c3
David Brazdil [Thu, 15 Feb 2018 13:01:54 +0000 (13:01 +0000)]
Merge "Update hidden API toast message"
am:
10034d94cf
Change-Id: I7e5c4c5333be8d1bc5722b0924c31a8ad94be29e
Chalard Jean [Thu, 15 Feb 2018 12:57:16 +0000 (12:57 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119
am:
edab226d0e
Change-Id: I6ffc0a841d0aa8479bb5b6afba49c5130af879da
David Brazdil [Thu, 15 Feb 2018 11:55:15 +0000 (11:55 +0000)]
Merge "Update hidden API toast message"
Lorenzo Colitti [Thu, 15 Feb 2018 11:52:34 +0000 (11:52 +0000)]
Merge changes Icd56662d,I0ece820f am:
47ef64b0d2
am:
bf66580c0b
Change-Id: I5faf7049c376eb400a41231448d9414471ae6777
Lorenzo Colitti [Thu, 15 Feb 2018 11:43:29 +0000 (11:43 +0000)]
Merge changes Icd56662d,I0ece820f
am:
47ef64b0d2
Change-Id: Ifd2ffe68cfff511d010ce5e755b4b680ad1df52c
Chalard Jean [Thu, 15 Feb 2018 11:25:36 +0000 (11:25 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119
* changes:
Deprecate CONNECTIVITY_ACTION.
Publish FOREGROUND and add NOT_SUSPENDED capabilities.
Send null UIDs to apps instead of single-uid lists.
Lorenzo Colitti [Thu, 15 Feb 2018 10:03:26 +0000 (10:03 +0000)]
Merge changes Icd56662d,I0ece820f
* changes:
Restrict OWNERS in android.net.*
Add OWNERS to the libandroid_net library.
David Brazdil [Wed, 14 Feb 2018 22:36:34 +0000 (22:36 +0000)]
Update hidden API toast message
Change the toast message shown by an Activity when VMRuntime reports
that the app has used a private API.
(a) fix a typo: compatiblity -> compatibility
(b) change guidance from "please consult log" to "go to <url> for
more info" where devs can learn how to proceed if their app does
have compatibility issues.
Bug:
64382372
Test: make, visual
Change-Id: Idbe32a724438bb7b0826d0b4e11ef505015cb321
Lorenzo Colitti [Thu, 15 Feb 2018 07:43:44 +0000 (16:43 +0900)]
Restrict OWNERS in android.net.*
Test: None
Change-Id: Icd56662dcbc86b49015d094fd8ae2ade235aa475
Lorenzo Colitti [Thu, 15 Feb 2018 06:51:58 +0000 (15:51 +0900)]
Add OWNERS to the libandroid_net library.
Test: None
Change-Id: I0ece820fc0de786a81df9f922135acdf92f1d136
Jakub Pawlowski [Thu, 15 Feb 2018 05:49:13 +0000 (05:49 +0000)]
Merge "Hearing Aid profile" am:
aca4460b64
am:
edb16b0f4b
Change-Id: Ica92a9ffecb205f07288139970cd83f578ef7669
Jakub Pawlowski [Thu, 15 Feb 2018 05:37:45 +0000 (05:37 +0000)]
Merge "Hearing Aid profile"
am:
aca4460b64
Change-Id: I2f0367b57ec720c3b46b0f2984b77068db3fa3c1
Treehugger Robot [Thu, 15 Feb 2018 04:14:43 +0000 (04:14 +0000)]
Merge "Hearing Aid profile"
Siyamed Sinir [Thu, 15 Feb 2018 00:56:53 +0000 (00:56 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89 am:
1fd506a340 am:
bb0a801a85
am:
dc288fc3ec
Change-Id: I55d644d7028d7a69d8aec16c379d052608d7f336
Siyamed Sinir [Thu, 15 Feb 2018 00:43:01 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89 am:
1fd506a340
am:
bb0a801a85
Change-Id: I872e5511439ee880f7837a06d5449f556ffb1ebc
Siyamed Sinir [Thu, 15 Feb 2018 00:31:11 +0000 (00:31 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89
am:
1fd506a340
Change-Id: I882d9d4190e2f448a0595192c68ac6caf8ee4607
Tyler Gunn [Wed, 14 Feb 2018 22:37:17 +0000 (14:37 -0800)]
Add new owners files for Telephony/Telecom frameworks files.
Test: N/A
Bug:
73373651
Change-Id: Ia0e19018d6cd72923f9f20b372d303fa532409b0
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:21 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89
Change-Id: I0d1636b652adf1db5ebd67eb9bb467d3abd84b26
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:16 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60
Change-Id: Ib5ae0b8558fb647407e5a836b6835e1a5d9f6753
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:11 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f
Change-Id: I27c9d607c6b3b7ae5126a9bb22cdb4ea18963918
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:07 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4
Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:02 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761
Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:54 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35
Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:49 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0
Change-Id: I80463ee5315c2672e812659192b227c8271e9113
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:43 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a
Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:38 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3
Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57
Malcolm Chen [Tue, 13 Feb 2018 23:42:58 +0000 (15:42 -0800)]
Add NetworkRegistrationState into SS's list.
Add hidden API to add NetworkRegistrationState into SS's
NetworkRegistrationState list.
Bug:
73305596
Test: unittest
Change-Id: Ief7f22632c1f3400c01663d13b990dc9b0d59e2e
Jakub Pawlowski [Wed, 22 Nov 2017 19:02:34 +0000 (11:02 -0800)]
Hearing Aid profile
This is implementation of Hearing Aid Profile that will in future
be connected to Bluetooth Manager - see TODOs in BluetoothHearingAid.java
Bug:
69623109
Test: compilation. Manual test with HA.
Change-Id: I79643ea1e14e9df7f5771169359c964a60c56618
Benedict Wong [Wed, 14 Feb 2018 21:25:08 +0000 (21:25 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created" am:
2c8456b22e
am:
3988c929ad
Change-Id: I041cd94be9cefc997b95478444661b557d95e3dc
Benedict Wong [Wed, 14 Feb 2018 21:14:19 +0000 (21:14 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created"
am:
2c8456b22e
Change-Id: I24ac6baa0492a46bf5810bc6bc146d9aaa9eccab
Chen Xu [Wed, 14 Feb 2018 21:09:29 +0000 (21:09 +0000)]
Merge "add a current table in CarrierIdProvider" am:
3fa6fe2117
am:
9fce67f50f
Change-Id: Ia8dbd47c1c4cf775f7597e7e93c8315bf004e9e0
Chen Xu [Wed, 14 Feb 2018 21:00:42 +0000 (21:00 +0000)]
Merge "add a current table in CarrierIdProvider"
am:
3fa6fe2117
Change-Id: I5e734d3b55332e5d9bb5bc27515625456edb5df5
Benedict Wong [Wed, 14 Feb 2018 19:37:53 +0000 (19:37 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created"
Chen Xu [Wed, 14 Feb 2018 18:54:06 +0000 (18:54 +0000)]
Merge "add a current table in CarrierIdProvider"
Brad Ebinger [Fri, 9 Feb 2018 00:06:31 +0000 (16:06 -0800)]
MSIM support for hidden IMS capability and registration query APIs.
Modifies TelephonyManager APIs to better support MSIM devices
and adds a method to query MMTEL IMS Registration technology.
Test: Manual, telephony unit tests.
Bug:
35128252
Merged-In: Ie37185bd3477635094a0db998918ba5ad59842be
Change-Id: Ie37185bd3477635094a0db998918ba5ad59842be
Brad Ebinger [Fri, 9 Feb 2018 00:06:31 +0000 (16:06 -0800)]
MSIM support for hidden IMS capability and registration query APIs.
Modifies TelephonyManager APIs to better support MSIM devices
and adds a method to query MMTEL IMS Registration technology.
Test: Manual, telephony unit tests.
Bug:
35128252
Merged-In: Ie37185bd3477635094a0db998918ba5ad59842be
Change-Id: Ie37185bd3477635094a0db998918ba5ad59842be
OSDN Git Service
