OSDN Git Service
Ajay Panicker [Tue, 4 Apr 2017 01:35:05 +0000 (01:35 +0000)]
Merge "Make sure that the device name is not null before returning it" am:
d4963e8035
am:
87d114ac3e
Change-Id: I874a58ecc54ddd46837c6e21b6244e5bb40312d7
Ajay Panicker [Tue, 4 Apr 2017 01:27:41 +0000 (01:27 +0000)]
Merge "Make sure that the device name is not null before returning it"
am:
d4963e8035
Change-Id: Ia9f3baa2e1c78bb1ebde2be9a412d96f76e5a225
Treehugger Robot [Tue, 4 Apr 2017 01:11:07 +0000 (01:11 +0000)]
Merge "Make sure that the device name is not null before returning it"
Ajay Panicker [Mon, 3 Apr 2017 19:15:54 +0000 (12:15 -0700)]
Make sure that the device name is not null before returning it
Bug:
30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c
Lorenzo Colitti [Mon, 3 Apr 2017 10:52:20 +0000 (10:52 +0000)]
Merge "Add test coverage for NetworkSpecifiers." am:
9a029b5262
am:
0e068f6360
Change-Id: I376b9011aaae7f0b8a2899a942d1a43e26605101
Lorenzo Colitti [Mon, 3 Apr 2017 10:45:22 +0000 (10:45 +0000)]
Merge "Add test coverage for NetworkSpecifiers."
am:
9a029b5262
Change-Id: Ia328b945af4c4f55ef560b33b00fa861b8f81b0d
Treehugger Robot [Mon, 3 Apr 2017 10:37:00 +0000 (10:37 +0000)]
Merge "Add test coverage for NetworkSpecifiers."
Hugo Benichi [Mon, 3 Apr 2017 09:10:44 +0000 (09:10 +0000)]
Merge "ConnectivityService: simplify WakeLock management" am:
c98db5caa2
am:
6db00a22b0
Change-Id: I468e31800d5cfe1dd385d773fcc393b615cfa343
Hugo Benichi [Mon, 3 Apr 2017 09:03:13 +0000 (09:03 +0000)]
Merge "ConnectivityService: simplify WakeLock management"
am:
c98db5caa2
Change-Id: I1e0ae930cd7a329febf21ff3fc83ad2d0a3be69b
Hugo Benichi [Mon, 3 Apr 2017 08:56:23 +0000 (08:56 +0000)]
Merge "ConnectivityService: simplify WakeLock management"
Lorenzo Colitti [Mon, 3 Apr 2017 08:46:35 +0000 (17:46 +0900)]
Add test coverage for NetworkSpecifiers.
Tests various combinations of empty / non-empty NetworkSpecifiers
and changing specifiers on the fly.
Test: ConnectivityServiceTest passes
Bug:
27533960
Change-Id: Ibd6b4efc861dc51689e46f3882ba859223411bf0
Bill Yi [Mon, 3 Apr 2017 02:18:48 +0000 (02:18 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
8f59f867f9 -s ours
Change-Id: Ief3fa9c34e3a1959e193d35cea0b0ace7168411e
TreeHugger Robot [Mon, 3 Apr 2017 02:11:39 +0000 (02:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Hugo Benichi [Thu, 30 Mar 2017 14:18:10 +0000 (23:18 +0900)]
ConnectivityService: simplify WakeLock management
This patch simplifies wakelock management by acknowledging that only one
acquisition at most is in flight at any time. This allows to remove the
serial number associated with wakelock acquisition and to avoid double
release when regaining a default network.
Example of $ adb shell dumpsys connectivity logs:
NetTransition WakeLock activity (most recent first):
03-31 00:15:13.816 - RELEASE (EVENT_CLEAR_NET_TRANSITION_WAKELOCK)
03-31 00:14:59.216 - ACQUIRE for NetworkAgentInfo [WIFI () - 101]
03-31 00:09:05.799 - RELEASE (EVENT_EXPIRE_NET_TRANSITION_WAKELOCK)
03-31 00:08:05.738 - ACQUIRE for NetworkAgentInfo [WIFI () - 100]
Test: watched wakelock section $ adb shell dumpsys connectivity while
turning on and off Wifi (with no other network).
Bug:
36703718
Change-Id: I899b0816c0e41b3991d9540e9b9a604914ff673a
Hugo Benichi [Sun, 2 Apr 2017 23:53:46 +0000 (23:53 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps" am:
db104b2367
am:
146914c0d5
Change-Id: I4d0430a6a5b3a1f97cdc4cf9590e5b0a798ae04f
Hugo Benichi [Sun, 2 Apr 2017 23:47:15 +0000 (23:47 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps"
am:
db104b2367
Change-Id: If08e0088ab25f1494aaf3a339a38e7a8e343d910
Hugo Benichi [Sun, 2 Apr 2017 23:40:25 +0000 (23:40 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps"
Bill Yi [Sun, 2 Apr 2017 09:06:23 +0000 (09:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
2c697884a3 -s ours
Change-Id: I2e43884e9fda71b912361b12c5d26873ccd92953
Bill Yi [Sun, 2 Apr 2017 09:05:11 +0000 (09:05 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
bcd194eb04 -s ours
Change-Id: Ide3209a7be2b5f32cced831c4bfb0f4ae8e1b278
Bill Yi [Sun, 2 Apr 2017 09:04:04 +0000 (09:04 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
1058478d5b -s ours
Change-Id: Ie6758133479cfb44940dc63719595362d407c61e
Bill Yi [Sun, 2 Apr 2017 09:02:57 +0000 (09:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
69dd99c741 -s ours
Change-Id: I1eb25a2afadf68bd8a44195debb4846bca36d193
Bill Yi [Sun, 2 Apr 2017 09:01:34 +0000 (09:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
e1a2ddeee8 -s ours
Change-Id: Ic3d74dd044e7da852eeea96744c209d3741a00d5
Bill Yi [Sun, 2 Apr 2017 09:00:22 +0000 (09:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
45d02673c5 -s ours
Change-Id: I251062605b0d0a5ea912a510cac39ab6326f6496
Bill Yi [Sun, 2 Apr 2017 08:59:11 +0000 (08:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
ae1e284380 -s ours
Change-Id: Ibb55ea97617f1b4cff17fe66f1ff6bc1b185e4e4
Bill Yi [Sun, 2 Apr 2017 08:57:59 +0000 (08:57 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
0bbfc26ecb -s ours
Change-Id: I8e14e844175e9d54e1249756a03b4470226a4d39
Bill Yi [Sun, 2 Apr 2017 08:54:36 +0000 (08:54 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
f13c6c2a4c -s ours
Change-Id: Ic6c474944a6a0a6b0a1a301f3ccd4a8e891ff073
Bill Yi [Sun, 2 Apr 2017 08:53:18 +0000 (08:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
89a5b41395 -s ours
Change-Id: I83d95004dbb353c6b6657091845ea02358ce10bb
Bill Yi [Sun, 2 Apr 2017 08:47:56 +0000 (08:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
4bac557350 -s ours
Change-Id: Id582294a639c1037f1f87b4f04ae2d79061e5e57
TreeHugger Robot [Sun, 2 Apr 2017 08:47:36 +0000 (08:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 08:46:47 +0000 (08:46 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
68a2d1d674 -s ours
Change-Id: I215a2d1fdcb8654739221d9b00457c9584728e17
TreeHugger Robot [Sun, 2 Apr 2017 08:44:19 +0000 (08:44 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:43:33 +0000 (08:43 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:42:52 +0000 (08:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:42:10 +0000 (08:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:41:34 +0000 (08:41 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:41:04 +0000 (08:41 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:39:42 +0000 (08:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:39:13 +0000 (08:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:38:44 +0000 (08:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:38:19 +0000 (08:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:36:16 +0000 (08:36 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 06:06:04 +0000 (23:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: Id8d5a50ec7d04eb45dd55d333a178b9a214d05d5
Bill Yi [Sun, 2 Apr 2017 06:02:20 +0000 (23:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I967ca7ee9e12c4bc83e8bd4bcf9eec0cce0ed031
Bill Yi [Sun, 2 Apr 2017 05:30:30 +0000 (22:30 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I896e874391b7951f14ccb3138c21399d4dd0a6e6
Bill Yi [Sun, 2 Apr 2017 05:26:48 +0000 (22:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I8fe57933ecbc106945b72f306cd10346e4b754a9
Bill Yi [Sun, 2 Apr 2017 05:23:03 +0000 (22:23 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I6b319f5bbeccf3aeb0b8e68279add98a03389dea
Bill Yi [Sun, 2 Apr 2017 05:19:25 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: Ib67a94c0268dbfcf32025179010422410b19157e
Bill Yi [Sun, 2 Apr 2017 05:10:25 +0000 (22:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: Ic79825620336a148791f1d88e8744a8dff669b2c
Bill Yi [Sun, 2 Apr 2017 05:03:48 +0000 (22:03 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I7b31b10f7d84ab10587b50e6a3d1831a3e71886b
Bill Yi [Sun, 2 Apr 2017 04:59:53 +0000 (21:59 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I87e870cdcec90e173ab587cc65afb8841e9a6411
Bill Yi [Sun, 2 Apr 2017 04:56:25 +0000 (21:56 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I811c247c477f0e53e060d721b7d9b9ba954f3c8b
Bill Yi [Sun, 2 Apr 2017 04:52:56 +0000 (21:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I6c846a034570454310571a442fb55eec8295139b
Bill Yi [Sun, 2 Apr 2017 04:49:26 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I3732af38b0e535528297ee18e772afd087a4c9c6
Bill Yi [Sun, 2 Apr 2017 04:45:35 +0000 (21:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I4afbbdb8355c77f409d59a2ad77430ca73e49ca3
Bill Yi [Sun, 2 Apr 2017 04:06:46 +0000 (04:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
0ec174802b -s ours
Change-Id: If10833b148ed1988bc7ff7731fe615e58c86d6c0
Bill Yi [Sun, 2 Apr 2017 04:01:12 +0000 (04:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
ba09ef4367 -s ours
Change-Id: I3fcc1bfebb680e4f53230cc9be60b7ca4f3bacb8
TreeHugger Robot [Sun, 2 Apr 2017 04:00:42 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 03:56:26 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
nharold [Sun, 2 Apr 2017 00:27:38 +0000 (00:27 +0000)]
Merge changes from topic 'ipsec-transport-impl' am:
464dc5c07e
am:
f983d89083
Change-Id: Ifbee28deb7bee43532b923193cade15dad4ee5b9
Nathan Harold [Sun, 2 Apr 2017 00:26:41 +0000 (00:26 +0000)]
IpSecManager and IpSecTransform API Cleanup am:
48b566557d
am:
5eaf5393a5
Change-Id: I30390e7341265cee055b38ba621f050e8be71f7e
nharold [Sun, 2 Apr 2017 00:19:44 +0000 (00:19 +0000)]
Merge changes from topic 'ipsec-transport-impl'
am:
464dc5c07e
Change-Id: I6caf23f5fef995f1ad735ea64b99660a5180799f
Nathan Harold [Sun, 2 Apr 2017 00:18:42 +0000 (00:18 +0000)]
IpSecManager and IpSecTransform API Cleanup
am:
48b566557d
Change-Id: I1524f8381c8a73ba4dc7a36b343e11066b75c08d
nharold [Sun, 2 Apr 2017 00:10:33 +0000 (00:10 +0000)]
Merge changes from topic 'ipsec-transport-impl'
* changes:
Add Initial IPsec APIs to IpSecService
IpSecManager and IpSecTransform API Cleanup
Bill Yi [Sat, 1 Apr 2017 23:18:41 +0000 (16:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I3213f09cb1ad99844c7d745b14ccbbc1f0b4c05f
Bill Yi [Sat, 1 Apr 2017 23:11:07 +0000 (16:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I61b5291fe0b6b1e6c421756adac398e76566ca5f
Robert Sesek [Sat, 1 Apr 2017 06:57:55 +0000 (06:57 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." am:
c04b06dc81
am:
8bafcfe81c
Change-Id: I6e5b9eef6c2a6da1c3185d274afbfdec33d14a7a
Robert Sesek [Sat, 1 Apr 2017 06:53:03 +0000 (06:53 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."
am:
c04b06dc81
Change-Id: I781b676d273738101a6aaf27d523c7b5d7d06596
Treehugger Robot [Sat, 1 Apr 2017 06:46:31 +0000 (06:46 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."
Jakub Pawlowski [Sat, 1 Apr 2017 04:49:26 +0000 (04:49 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)" am:
3946df68ed
am:
8c5b5b0c4b
Change-Id: Iff286d35a01c180459be652de8a2670c745f49c2
Jakub Pawlowski [Sat, 1 Apr 2017 04:44:17 +0000 (04:44 +0000)]
Merge "Bluetooth LE Advertising minor improvements" am:
3d84362412
am:
821523d859
Change-Id: I1c10c8099fa6381a163eb3436ac49872399793f3
Jakub Pawlowski [Sat, 1 Apr 2017 04:42:45 +0000 (04:42 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)"
am:
3946df68ed
Change-Id: I04f7f867a1387d1816d007ba4bdebf9eecc66b06
Jakub Pawlowski [Sat, 1 Apr 2017 04:40:10 +0000 (04:40 +0000)]
Merge "Bluetooth LE Advertising minor improvements"
am:
3d84362412
Change-Id: Idc51a6673d8c29a22f9bed177ecb949a49480e3a
Jakub Pawlowski [Sat, 1 Apr 2017 04:34:50 +0000 (04:34 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)"
Jakub Pawlowski [Fri, 31 Mar 2017 02:10:08 +0000 (19:10 -0700)]
Bluetooth 5 advertising duration refactoring (4/4)
Expose both duration and maximum extended advertising events to limit
advertising time.
Test: manual
Bug:
30622771
Change-Id: I44df300995ef985526b93f8c24389775720b3432
Jakub Pawlowski [Sat, 1 Apr 2017 04:34:30 +0000 (04:34 +0000)]
Merge "Bluetooth LE Advertising minor improvements"
Jakub Pawlowski [Thu, 30 Mar 2017 18:19:24 +0000 (11:19 -0700)]
Bluetooth LE Advertising minor improvements
This patch adds some additional error checking for the advertising set
parameters, and some more comments.
Test: manual
Bug:
30622771
Change-Id: I87bd44f4179ef63694ad3ed656dc2acc52e40f1e
Ajay Panicker [Sat, 1 Apr 2017 03:33:41 +0000 (03:33 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" am:
985fe4cbd2
am:
7eaf518b71
Change-Id: I9d646bf060c704a652a646f68a963a3ef6b36134
Ajay Panicker [Sat, 1 Apr 2017 03:28:13 +0000 (03:28 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
am:
985fe4cbd2
Change-Id: I81f642bae7fe8f1530db6474ebab26760c707fa3
Treehugger Robot [Sat, 1 Apr 2017 03:18:45 +0000 (03:18 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
Jakub Pawlowski [Sat, 1 Apr 2017 02:19:06 +0000 (02:19 +0000)]
Merge "Fix advertise data size estimation" am:
5b2e9f40b4
am:
21bd8d5f2e
Change-Id: If730c290a7f6745615658edd405877b0441b7d0f
Jakub Pawlowski [Sat, 1 Apr 2017 02:13:41 +0000 (02:13 +0000)]
Merge "Fix advertise data size estimation"
am:
5b2e9f40b4
Change-Id: Ic6c0a5d5a988ebeedde333910281af54c026f428
Jakub Pawlowski [Sat, 1 Apr 2017 02:06:30 +0000 (02:06 +0000)]
Merge "Fix advertise data size estimation"
Nathan Harold [Tue, 7 Mar 2017 21:23:36 +0000 (13:23 -0800)]
Add Initial IPsec APIs to IpSecService
-Plumb IpSecManager APIs to NetD
-Add Resource Management to IpSecService
Bug:
33695893
Test: CTS verifies nearly all of these paths
Change-Id: Ic43965c6158f28cac53810adbf5cf50d2c54f920
Jakub Pawlowski [Fri, 31 Mar 2017 23:49:13 +0000 (16:49 -0700)]
Fix advertise data size estimation
UUID in service data field can be 2, 4, or 16 bytes long.
Test: manual
Bug:
36553478
Change-Id: Ib5ba2d16065496ca311e8642a15a7ea6bc84d4c1
Ajay Panicker [Tue, 28 Mar 2017 21:28:27 +0000 (14:28 -0700)]
Bluetooth: Add additional BluetoothSocket logging to root cause errors
Bug:
34780400
Test: Code still compiles
Change-Id: I166842ecc6889f9ea403e7aa3678ed818cd80968
Nathan Harold [Thu, 30 Mar 2017 18:01:37 +0000 (11:01 -0700)]
IpSecManager and IpSecTransform API Cleanup
-Remove Int-based SPI usage from the IpSecTransform.Builder
This is essentially a less-safe method overload, and it is both
unnecessary and difficult to implement: the cross-validation
between SPI and Transform is actually useful, and the kernel
requires two different mechanisms to use an unreserved vs a
reserved (alloc'd) SPI: CREATESA vs UPDATESA, which makes this
hard to support. API Council has questioned the value of this,
and they are right: everything points to "remove this". In the
future, if we find that SPI reservation is overhead, we can
always add it back.
-Hiding the TunnelMode builder method and application/remove
methods. These will not land by the time the next API
stabilizes, so better to hide them now that this is a
near-certainty. Expectation is to un-hide them in the subsequent
API bump.
Bug:
36073210
Test: Compilation, verified nobody is calling these stubs
Change-Id: Ic1a3f2cf7128633318ac175d6b56b45eb8d21cab
Mark Renouf [Fri, 31 Mar 2017 15:20:36 +0000 (15:20 +0000)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom am:
d1a0d19794
am:
8f9a6c3e89
Change-Id: Ie5fa2c8d64befee4f776dff6a01395099f83e5d9
Tyler Gunn [Fri, 31 Mar 2017 15:18:30 +0000 (15:18 +0000)]
Merge "Add carrier config to hide merge button for IMS conference" am:
78b3cbe4e0
am:
ec22b62a3a
Change-Id: Ib3dd03021d74ab981d0d61e7013cea376ee4bc46
Mark Renouf [Fri, 31 Mar 2017 15:15:49 +0000 (15:15 +0000)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom
am:
d1a0d19794
Change-Id: Ia0bdc13ac2e8f3e65aaa38a64b4af9409ffeaa21
Tyler Gunn [Fri, 31 Mar 2017 15:12:37 +0000 (15:12 +0000)]
Merge "Add carrier config to hide merge button for IMS conference"
am:
78b3cbe4e0
Change-Id: I8dbfda0871dd06cf446fa42debba955e18b4bf0f
Tyler Gunn [Fri, 31 Mar 2017 15:05:35 +0000 (15:05 +0000)]
Merge "Add carrier config to hide merge button for IMS conference"
Tyler Gunn [Fri, 31 Mar 2017 04:32:20 +0000 (04:32 +0000)]
Merge "Self Managed CS Implementation" am:
98fad21a8a
am:
9fab4ad9b3
Change-Id: I4e75f6c7f3cf5deb7e98dddb668be350d1c60dd9
Tyler Gunn [Fri, 31 Mar 2017 04:26:27 +0000 (04:26 +0000)]
Merge "Self Managed CS Implementation"
am:
98fad21a8a
Change-Id: I8c972f521270e6c973c2524a2684aa32a65ca0fd
Treehugger Robot [Fri, 31 Mar 2017 04:11:53 +0000 (04:11 +0000)]
Merge "Self Managed CS Implementation"
Tyler Gunn [Tue, 14 Mar 2017 01:15:15 +0000 (18:15 -0700)]
Self Managed CS Implementation
- Add API guide for developers giving an overview of what they need
to implement.
- Add @hide setLabel method in PhoneAccount; used when registering a
self-managed CS's phone account; we override it with their app label to
ensure they don't try to give themselves another name.
Test: Unit
Bug:
34159263
Change-Id: I0c890dc2feeb3ee438a80ed425db2aaf1f4c1fdd
Sohani Rao [Fri, 31 Mar 2017 01:56:35 +0000 (01:56 +0000)]
Merge "Introduce Authentication Failure reason codes" am:
e23b2c6c59
am:
1fc10c0729
Change-Id: I0ec86c921ce418230b95f462ba70dce6d7b1d3c0
Sohani Rao [Fri, 31 Mar 2017 01:51:30 +0000 (01:51 +0000)]
Merge "Introduce Authentication Failure reason codes"
am:
e23b2c6c59
Change-Id: I5e002f4b341f2a295ed6d8a2213bc9401fcde008
Treehugger Robot [Fri, 31 Mar 2017 01:43:50 +0000 (01:43 +0000)]
Merge "Introduce Authentication Failure reason codes"
Joel Scherpelz [Fri, 31 Mar 2017 00:50:35 +0000 (00:50 +0000)]
Merge "Partially revert "Add blocking and retrying wrappers for INetd uses."" am:
8b560611bf
am:
a084e3283f
Change-Id: Iefdd5394fbe33fe4ce9706ec587a76c8da4f5dd3
Joel Scherpelz [Fri, 31 Mar 2017 00:42:57 +0000 (00:42 +0000)]
Merge "Partially revert "Add blocking and retrying wrappers for INetd uses.""
am:
8b560611bf
Change-Id: I65e9137ae4c4f48e5484059244833edeab41f001