OSDN Git Service
Hugo Benichi [Thu, 13 Apr 2017 09:40:19 +0000 (09:40 +0000)]
Merge changes Ia15f77e2,Icaa1f95c am:
c923752929
am:
8e5ebd9261
Change-Id: Idf1f5091144d93f88684df50fd38593400b0e23e
Hugo Benichi [Thu, 13 Apr 2017 09:34:22 +0000 (09:34 +0000)]
Merge changes Ia15f77e2,Icaa1f95c
am:
c923752929
Change-Id: I98b29c91c68a63d6ddeffd03a690b7e841c2b5bc
Treehugger Robot [Thu, 13 Apr 2017 09:24:32 +0000 (09:24 +0000)]
Merge changes Ia15f77e2,Icaa1f95c
* changes:
Captive portal: regroup hardcoded http response codes.
Captive portal: rotate fallback urls
Erik Kline [Thu, 13 Apr 2017 08:38:44 +0000 (08:38 +0000)]
Merge "Extract SimChangeListener to its own file" am:
0ef8df6d52
am:
85f5725fb5
Change-Id: I51f350937450542d8217da5e3d4a415de6cb7f30
Erik Kline [Thu, 13 Apr 2017 08:33:12 +0000 (08:33 +0000)]
Merge "Extract SimChangeListener to its own file"
am:
0ef8df6d52
Change-Id: Ib83aa0acc1cf19c04ed94a198bb8333c7e3a60b8
Treehugger Robot [Thu, 13 Apr 2017 08:19:05 +0000 (08:19 +0000)]
Merge "Extract SimChangeListener to its own file"
Hugo Benichi [Mon, 10 Apr 2017 08:08:06 +0000 (17:08 +0900)]
Captive portal: regroup hardcoded http response codes.
This patch regroups various hardcoded http codes into well defined
constants. This reduces risk of errors and makes the captive portal
logic clearer.
This patch also fixes the logging when a captive portal detection
probe fails, to take into account https ssl handshake failures: for
well-behaved portals it is expected that the https probe will fail,
however the error message was written before the introduction of the
https probe and had become ambiguous.
Test: built, flashed, tested manually with various portal networks
Bug:
36532213
Change-Id: Ia15f77e268cb414816fc52f92835289f9a9ce92b
Hugo Benichi [Mon, 10 Apr 2017 08:43:08 +0000 (17:43 +0900)]
Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.
Test: built, flashed, tested manually with various portal networks.
Bug:
36532213
Change-Id: Icaa1f95c5914e8840c83ccdf071047358a5b760f
Erik Kline [Thu, 13 Apr 2017 06:12:30 +0000 (06:12 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns" am:
f854c9034c
am:
1303b8b9ca
Change-Id: I3fb343daa4d1d5f01d5cc99d842574c841970d03
Erik Kline [Thu, 13 Apr 2017 06:00:37 +0000 (06:00 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns"
am:
f854c9034c
Change-Id: Ic9ac3a2b1162524369f19b876e91a234e56fdc37
Treehugger Robot [Thu, 13 Apr 2017 05:49:31 +0000 (05:49 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns"
Lorenzo Colitti [Thu, 13 Apr 2017 05:37:01 +0000 (05:37 +0000)]
Merge "Move some NetworkStats tests to tests/net." am:
ab3901dc8b
am:
67401e25c2
Change-Id: I732b7dbc6b0d29a79aff727c2357ed6bb9456f6c
Lorenzo Colitti [Thu, 13 Apr 2017 05:29:58 +0000 (05:29 +0000)]
Merge "Move some NetworkStats tests to tests/net."
am:
ab3901dc8b
Change-Id: I68214c14658afbb5c92facb018988d2ed27bc351
Lorenzo Colitti [Thu, 13 Apr 2017 05:18:46 +0000 (05:18 +0000)]
Merge "Move some NetworkStats tests to tests/net."
Erik Kline [Fri, 7 Apr 2017 06:29:29 +0000 (15:29 +0900)]
Ignore potential SystemProperties errors when setting net.dns
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
33308258
Bug:
36249702
Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
Lorenzo Colitti [Wed, 12 Apr 2017 22:48:55 +0000 (22:48 +0000)]
Merge changes from topic 'network_specifier' am:
d0f476bdae
am:
362bef45d1
Change-Id: Iea17cb166f9c1bcec55cc8d404e00175aecb9918
Lorenzo Colitti [Wed, 12 Apr 2017 22:43:03 +0000 (22:43 +0000)]
Merge changes from topic 'network_specifier'
am:
d0f476bdae
Change-Id: I783b2d06f3a5e8b9cd7940f1f1ef0dd951c734f1
Lorenzo Colitti [Wed, 12 Apr 2017 22:27:35 +0000 (22:27 +0000)]
Merge changes from topic 'network_specifier'
* changes:
[CM] Unhide the NetworkSpecifier as object API
Make the NetworkSpecifier a class instead of a string.
Jakub Pawlowski [Wed, 12 Apr 2017 21:45:52 +0000 (21:45 +0000)]
Merge "Bluetooth 5 PHY simplification" am:
a9acf9db97
am:
d43127865b
Change-Id: I782c0ad038cd68c00b7dd5908c7975e79b672a04
Jakub Pawlowski [Wed, 12 Apr 2017 21:35:25 +0000 (21:35 +0000)]
Merge "Bluetooth 5 PHY simplification"
am:
a9acf9db97
Change-Id: Ibd712a7629d946c24640da0e07496c229c35f7ad
Jakub Pawlowski [Wed, 12 Apr 2017 21:22:26 +0000 (21:22 +0000)]
Merge "Bluetooth 5 PHY simplification"
Svet Ganov [Wed, 12 Apr 2017 21:22:08 +0000 (21:22 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am:
39c3d2cf16
am:
91ed4d7553
Change-Id: I8c34b0ee542819bb254183a96845e925bce2b0a8
Julius D'souza [Wed, 12 Apr 2017 21:20:50 +0000 (21:20 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am:
0a8ecc6886
am:
f72dd4142b
Change-Id: I9466a9f2a35ac3f81b2203347afc9f2f62587b20
Svet Ganov [Wed, 12 Apr 2017 21:11:57 +0000 (21:11 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
am:
39c3d2cf16
Change-Id: I3ddf7e0ceadd7c179f3c7de198658af190985f1b
Julius D'souza [Wed, 12 Apr 2017 21:10:49 +0000 (21:10 +0000)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
am:
0a8ecc6886
Change-Id: I262e7497e9256f708847ba7c767f202c91aa1739
Shuo Qian [Wed, 12 Apr 2017 21:06:20 +0000 (21:06 +0000)]
Merge "ECBM SystemProperty cleanup" am:
4718606368
am:
40cde7b71f
Change-Id: I51ec750ff1833b1982d8fdc1995c1d8d29b36976
Shuo Qian [Wed, 12 Apr 2017 21:00:50 +0000 (21:00 +0000)]
Merge "ECBM SystemProperty cleanup"
am:
4718606368
Change-Id: Ie6b43fd0a0bfa7c813960d1bb53b7b57a4f82721
TreeHugger Robot [Wed, 12 Apr 2017 21:00:21 +0000 (21:00 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
Shuo Qian [Wed, 12 Apr 2017 20:52:18 +0000 (20:52 +0000)]
Merge "ECBM SystemProperty cleanup"
Julius D'souza [Wed, 12 Apr 2017 06:41:27 +0000 (23:41 -0700)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
Bug:
36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
(cherry picked from commit
8e9ea907448c49f573dd045707e37dd14efdf152)
nharold [Wed, 12 Apr 2017 18:39:15 +0000 (18:39 +0000)]
Merge changes from topic 'ipsec-api-tweaks' am:
fddf677b8b
am:
176bfb58c6
Change-Id: I056e52c4c3bf41ffaf482ebaf4c7b14a9091f3ca
Nathan Harold [Wed, 12 Apr 2017 18:37:23 +0000 (18:37 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35
am:
9c2428ad4d
Change-Id: I6f7e2011a273d10386b72391d12a0ce55f18ffd7
nharold [Wed, 12 Apr 2017 18:29:04 +0000 (18:29 +0000)]
Merge changes from topic 'ipsec-api-tweaks'
am:
fddf677b8b
Change-Id: I0c0812164e8fa4b36fd43f00b7388d4c0cc337f1
Nathan Harold [Wed, 12 Apr 2017 18:27:09 +0000 (18:27 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks
am:
6045429b35
Change-Id: I93d58f64834e5a4c7bc1bf03a5baf2eb5364a36d
nharold [Wed, 12 Apr 2017 18:13:55 +0000 (18:13 +0000)]
Merge changes from topic 'ipsec-api-tweaks'
* changes:
Add FileDescriptor Versions of applyTransportModeTransform()
IpSecManager and IpSecAlgorithm API Tweaks
Jakub Pawlowski [Wed, 12 Apr 2017 15:51:22 +0000 (08:51 -0700)]
Bluetooth 5 PHY simplification
Having PHY_LE_* constants defined in four different places, with one
value being different than others is misleading. Leave just PHY_LE_*
definitions in BluetoothDevice, and add PHY_LE*_MASK for the mask used
in PHY update API.
This patch also removes need to translate PHY value between PHY update
request and event, as mask is used for request, and the value is
returned in event.
Bug:
30622771
Test: manual
Change-Id: I897effa1204a024465d55501c83c542566c4d37c
Lorenzo Colitti [Wed, 12 Apr 2017 16:18:05 +0000 (01:18 +0900)]
Move some NetworkStats tests to tests/net.
This groups them together with the rest of the networking unit
tests. It also speeds up compile/test cycles ("runtest -x" of one
file goes from 1m15s to 30s).
Test: runtest frameworks-net passes on internal tree
Change-Id: I53cb0c51355fe4b4b30e451fa09fbbf58da39efd
Svet Ganov [Mon, 5 Dec 2016 17:03:24 +0000 (09:03 -0800)]
[DO NOT MERGE] Allow multiple toasts for the focused app
We don't allow apps to add multiple toast windows to
prevent an attacker to keep adding the same toast as
a workaround for our measure to ensure toast windows
are removed after a timeout. The may cause backwards
compatibility issue for apps that add multiple toasts.
While we need to fix the security vulnerability it is
desirable to make the fix as backwards compatible as
possible. This change allows the focused app to add
as many toast windows as it wants since they will be
removed after the timeout and once the app is not the
one the user uses it will lose the multiple toast add
capability.
bug:
30150688
Change-Id: I2d9295926cb49b5bb80c7af2546872ff8ca22c64
(cherry picked from commit
296a60acc3d67cea23bae167dbcb51c0d0d60b23)
Robert Greenwalt [Wed, 12 Apr 2017 15:37:53 +0000 (15:37 +0000)]
Merge "Adding 20 free short codes for DCB and other purposes" am:
70fea2df2a
am:
03f9a489cb
Change-Id: Ic4915213105ba31c63d97187297c652a477e99df
Robert Greenwalt [Wed, 12 Apr 2017 15:27:23 +0000 (15:27 +0000)]
Merge "Adding 20 free short codes for DCB and other purposes"
am:
70fea2df2a
Change-Id: Ic63e088d49796b6e98dc92bc3b0b261958d73e8c
Robert Greenwalt [Wed, 12 Apr 2017 15:15:32 +0000 (15:15 +0000)]
Merge "Adding 20 free short codes for DCB and other purposes"
Hugo Benichi [Wed, 12 Apr 2017 09:55:06 +0000 (09:55 +0000)]
Merge "Captive portal: fix probe urls at network creation" am:
923ef69ae7
am:
65fa0676bf
Change-Id: I3f4e5e226d6a6371a6fed02d472d1cad4995c64a
Hugo Benichi [Wed, 12 Apr 2017 09:50:05 +0000 (09:50 +0000)]
Merge "Captive portal: fix probe urls at network creation"
am:
923ef69ae7
Change-Id: I82eb06ee1f9d69a1a3ccb5208947bdfcdbba6d81
Treehugger Robot [Wed, 12 Apr 2017 09:38:40 +0000 (09:38 +0000)]
Merge "Captive portal: fix probe urls at network creation"
Erik Kline [Fri, 20 Jan 2017 11:26:10 +0000 (20:26 +0900)]
Extract SimChangeListener to its own file
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- runtest -x full/path/to/SimChangeListenerTest.java passes
Bug:
32163131
Change-Id: If90539fe9a5dc07c7c24ed0b70b920d94065a623
Julius D'souza [Wed, 12 Apr 2017 02:01:28 +0000 (02:01 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am:
9e3c9eeb96
am:
3c6d6f53f3
Change-Id: I4a3785a799a523c1e650929cf70f333a2492377e
Julius D'souza [Wed, 12 Apr 2017 01:55:57 +0000 (01:55 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
am:
9e3c9eeb96
Change-Id: Ic97ec1a7e4c5b76bcab8350102585e4dd2cd199b
Julius D'souza [Wed, 12 Apr 2017 01:41:38 +0000 (01:41 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
Mathieu Chartier [Wed, 12 Apr 2017 00:20:23 +0000 (00:20 +0000)]
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" am:
d269f30d62
am:
f62b12ae31
Change-Id: I002c55618a647e4ab17fff50f89b04df3e492e9e
Mathieu Chartier [Wed, 12 Apr 2017 00:09:47 +0000 (00:09 +0000)]
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING"
am:
d269f30d62
Change-Id: I2830356fd9288feef334e19a1281c720c6fd7fca
Treehugger Robot [Tue, 11 Apr 2017 23:59:28 +0000 (23:59 +0000)]
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING"
Mark Salyzyn [Tue, 11 Apr 2017 23:33:22 +0000 (23:33 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit" am:
cf39eea407
am:
5f98be7f11
Change-Id: I4997e6f310c08cd0cf094a04685859b2853f8a05
Mark Salyzyn [Tue, 11 Apr 2017 23:25:06 +0000 (23:25 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit"
am:
cf39eea407
Change-Id: I225add287a014fa8e2623d1e61456a5c523d5377
Mark Salyzyn [Tue, 11 Apr 2017 23:13:06 +0000 (23:13 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit"
shuoq [Tue, 10 Jan 2017 21:14:02 +0000 (13:14 -0800)]
ECBM SystemProperty cleanup
- Add getEmergencyCallbackMode() method in the TelephonyManager.java
to get the boolean value for ECBM callback mode from the phone through
ITelephony.aidl/java interface
- Use the added TelephonyManager Api to replace the 'get' of
PROPERTY_INECM_MODE system property in the framework/base
Test: manual
Bug:
30361624
Change-Id: I355d69820b157f23e077a95a13f8509ee0fa5874
Amit Mahajan [Tue, 11 Apr 2017 21:44:00 +0000 (21:44 +0000)]
Merge "Add p2 option in openLogicalChannel." am:
f954f2d5cc
am:
7c6fa75512
Change-Id: Iee6b5873353ea10262c9268989cbe5c2fd946cc7
Amit Mahajan [Tue, 11 Apr 2017 21:34:51 +0000 (21:34 +0000)]
Merge "Add p2 option in openLogicalChannel."
am:
f954f2d5cc
Change-Id: I3437793f39ba6747554fec383ac7ab9f88df9266
Amit Mahajan [Tue, 11 Apr 2017 21:25:41 +0000 (21:25 +0000)]
Merge "Add p2 option in openLogicalChannel."
Mathieu Chartier [Tue, 11 Apr 2017 01:28:03 +0000 (18:28 -0700)]
Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING
dalvik-data-code-cache and dalvik-CompilerMetadata should be counted
in JITCache instead of .GC in dumpsys.
Bug:
37224159
Test: adb shell dumpsys meminfo -d
(cherry picked from commit
874c4cf56c0a9ea3b48468a13ec7fb78a3e2594b)
Change-Id: I41def949d91b2fdef0b3f502fe16ae436d058051
Nathan Harold [Fri, 7 Apr 2017 00:46:00 +0000 (17:46 -0700)]
Add FileDescriptor Versions of applyTransportModeTransform()
Because there is no way using the Java sockets API to actually
get a socket of AF_INET on mode machines, it is necessary to
provide a way to apply transforms to sockets made using the
native wrapper API, which uses POSIX APIs and will create a
socket that is AF_INET.
Bug:
36073210
Test: b/
34811227
Change-Id: I28ac7cc4f36045ce523a54111e5be975b0331356
Nathan Harold [Fri, 7 Apr 2017 01:16:28 +0000 (18:16 -0700)]
IpSecManager and IpSecAlgorithm API Tweaks
-Add a reserveSecurityParamterIndex() function that allows the
system to select an SPI.
-Disallow INVALID_SECURITY_PARAMETER_INDEX from being passed as
an explicit SPI request.
-Remove the ALGO_ prefix from constants in IpSecAlgorithm
Bug:
36073210
Test: Updated CTS tests still pass on bullhead
Change-Id: Ic94809996076b0718f153f550b82192fe7048a2e
Dan Willemsen [Tue, 11 Apr 2017 17:06:04 +0000 (17:06 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am:
4a43598bd6
am:
73def9c0f9
Change-Id: Idd1cf9bbffb15bfdab59c9b2e80cb31b477ce0cf
Dan Willemsen [Tue, 11 Apr 2017 16:54:57 +0000 (16:54 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
am:
4a43598bd6
Change-Id: Ib66ddf53cbe91d2064f6268f9115cd577883acae
Treehugger Robot [Tue, 11 Apr 2017 16:19:14 +0000 (16:19 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
Andreas Gampe [Tue, 11 Apr 2017 15:38:05 +0000 (15:38 +0000)]
Merge "OtaDexOptService: Log post-reboot moves" am:
ac293515b3
am:
4e04b5882f
Change-Id: I6a94ee15c203a5386c5e92f49b65544d75d55e18
Andreas Gampe [Tue, 11 Apr 2017 15:32:27 +0000 (15:32 +0000)]
Merge "OtaDexOptService: Log post-reboot moves"
am:
ac293515b3
Change-Id: I76ded23a21610405079f275a61e1b61c23b46de7
Andreas Gampe [Tue, 11 Apr 2017 15:22:13 +0000 (15:22 +0000)]
Merge "OtaDexOptService: Log post-reboot moves"
Dan Willemsen [Fri, 7 Apr 2017 22:48:45 +0000 (15:48 -0700)]
Remove .(ll)ndk suffix from (ll)ndk_library
Soong handles these automatically now.
Bug:
33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Merged-In: Ic10796e75bb886cc3f92c234714ab3e6c85112df
Change-Id: Ic10796e75bb886cc3f92c234714ab3e6c85112df
Mark Salyzyn [Fri, 7 Apr 2017 18:26:26 +0000 (11:26 -0700)]
jni: isLoggable: adapt to removal of property name size limit
There is no longer a name size limit to the properties, remove
illegalArgumentException if tag length is too large.
Test: build
Bug:
36696208
Change-Id: I4b4329c8c951082ed0d777cdd70ee3e773bed16c
Jakub Pawlowski [Tue, 11 Apr 2017 06:36:13 +0000 (06:36 +0000)]
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am:
763765b1b1
am:
131cc43a2c
Change-Id: I7b12ecaaeb83bb3e5d49cd44d99c3339e2c0c835
Jakub Pawlowski [Tue, 11 Apr 2017 06:30:23 +0000 (06:30 +0000)]
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)"
am:
763765b1b1
Change-Id: Idb0c93f1f37b3fc4bd44bc4ad7d5474fd46e7413
Jakub Pawlowski [Tue, 11 Apr 2017 06:18:54 +0000 (06:18 +0000)]
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)"
Jakub Pawlowski [Mon, 10 Apr 2017 20:45:16 +0000 (13:45 -0700)]
Remove enable from PeriodicAdvertisingPariameters (1/2)
Instead of setting enable to true, one can just pass null
PeriodicAdvertisingParameters and achieve same result when starting the
set.
Passing the "enable" when updating the parameters make no sense, and
might be confusing.
Experience with "timeout" field, which was a part of AdvertiseSettings
show that merging fields that go into different HCI commands can cause
problems during processing, so keep enable as separate field.
Test: manual
Bug:
30622771
Change-Id: Ida02c59eb8433537179b4d22202fe745f8b4bb3e
Hugo Benichi [Mon, 10 Apr 2017 13:45:13 +0000 (22:45 +0900)]
Captive portal: fix probe urls at network creation
This patch changes how url configuration values for captive portal
detection are read: instead of re-reading the settings at every probe
detection, the settings are read once when the NetworkMonitor associated
to a network is created.
If the settings are updated, the new values are picked up by new
networks, but not by existing networks. Since captive portal detection
is most important when joining WiFi networks, the newest available
settings values will still be used.
This change prepares introducing further changes for rotating probe
urls. Especially it helps making the detection strategy stateful with
respect to the lifecycle of a single NetworkMonitor.
Test: built, flashed, tested manually with various portal networks
Bug:
36532213
Change-Id: I71cc8bb8b996462f27f50798d67bceee5ffb898d
nharold [Mon, 10 Apr 2017 23:20:35 +0000 (23:20 +0000)]
Merge "Deprecate TelephonyManager.getCellLocation()" am:
bc0f610b25
am:
a51173943a
Change-Id: I333aa64ab7d2ad3467240feb02d66f197bfe4241
Jack He [Mon, 10 Apr 2017 23:11:15 +0000 (23:11 +0000)]
Merge "Add developer setting and system API for inband ringing support" am:
1da38b2bcd
am:
d86c1fca76
Change-Id: I711f396cbf1a63177fc8e61956264c3d7ce5a375
nharold [Mon, 10 Apr 2017 23:10:01 +0000 (23:10 +0000)]
Merge "Deprecate TelephonyManager.getCellLocation()"
am:
bc0f610b25
Change-Id: Ic6f55f3f00b608f3b8c3212b0dea1114250ec1fe
Jack He [Mon, 10 Apr 2017 22:59:56 +0000 (22:59 +0000)]
Merge "Add developer setting and system API for inband ringing support"
am:
1da38b2bcd
Change-Id: I24f6eccb3a3dcc37fd21ee48d8844bd5a1b112f0
nharold [Mon, 10 Apr 2017 22:49:59 +0000 (22:49 +0000)]
Merge "Deprecate TelephonyManager.getCellLocation()"
Andreas Gampe [Mon, 10 Apr 2017 22:48:50 +0000 (15:48 -0700)]
OtaDexOptService: Log post-reboot moves
Disable artifact checks for non-upgrade booting. Log the number of
successfully move artifacts.
Bug:
37158297
Test: m
Test: manual
Change-Id: Ic81531950582ce937e2e3b7815fb9132888d9a42
Jack He [Mon, 10 Apr 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add developer setting and system API for inband ringing support"
Tyler Gunn [Mon, 10 Apr 2017 22:08:12 +0000 (22:08 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am:
c4ea961f91
am:
1fb1c39838
Change-Id: I1c4cdcbe0c25acb899d387f70d128a267385474b
Tyler Gunn [Mon, 10 Apr 2017 21:58:08 +0000 (21:58 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
am:
c4ea961f91
Change-Id: I77e7353fe345fbf17f9499aea9e792a23e8725d4
Treehugger Robot [Mon, 10 Apr 2017 21:49:05 +0000 (21:49 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
Tyler Gunn [Fri, 7 Apr 2017 21:57:37 +0000 (14:57 -0700)]
Add getSelfManagedPhoneAccounts() TelecomManager API.
This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.
Test: CTS
Bug:
34159263
Merged-In: I1396c63a6882947cd66721528e53b6964a9091e0
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0
Jack He [Fri, 18 Nov 2016 00:19:43 +0000 (16:19 -0800)]
Add developer setting and system API for inband ringing support
* Add 1 system API to check inband ringing flag in config.xml
static isInbandRingingSupported(Context)
* Add developer menu options to enable this feature
Bug:
19171297
Test: mm -j 40, HFP regression testing, testplans/82144
Change-Id: Iaf56ea41911f546bbc7ae1f82e399d0f8d48f75f
Erik Kline [Mon, 10 Apr 2017 12:12:17 +0000 (12:12 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" am:
d3128d4b55
am:
908ce167eb
Change-Id: I6e72a9b90e59ea5abd1dfa11c6c3d16a5c98751c
Erik Kline [Mon, 10 Apr 2017 12:02:49 +0000 (12:02 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams"
am:
d3128d4b55
Change-Id: Ic7d5e3e23f9ccc0f094ba5991e2fdefa82865b01
Treehugger Robot [Mon, 10 Apr 2017 11:50:31 +0000 (11:50 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams"
Erik Kline [Fri, 10 Mar 2017 10:35:34 +0000 (19:35 +0900)]
Tethering: support Local-only Hotspot mode for downstreams
Test: as follows
- built (bullhead)
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
31466854
Change-Id: Ia50e28c8ce0af8cdd7ac63217d921aff213668e7
Lorenzo Colitti [Mon, 10 Apr 2017 05:54:10 +0000 (05:54 +0000)]
Merge "Add an API hint for metered multipath traffic." am:
7a12f7efc7
am:
0ad718aab1
Change-Id: I787a9722c210632539a9258e8320f88153daba55
Hugo Benichi [Mon, 10 Apr 2017 05:52:51 +0000 (05:52 +0000)]
Merge "DO NOT MERGE IP connectivity metrics: fix tests." am:
b2adaad26b -s ours
am:
f294973f6c -s ours
Change-Id: I1d6084255ee59ff55f8a91196852f3645c3fe281
Lorenzo Colitti [Mon, 10 Apr 2017 05:48:34 +0000 (05:48 +0000)]
Merge "Add an API hint for metered multipath traffic."
am:
7a12f7efc7
Change-Id: Ie0d289460f93d3b93d91545eb3dfa925f0bdee5f
Hugo Benichi [Mon, 10 Apr 2017 05:43:43 +0000 (05:43 +0000)]
Merge "DO NOT MERGE IP connectivity metrics: fix tests."
am:
b2adaad26b -s ours
Change-Id: I47dbd0feaa99ff6018efc8703cfa29a265bc73fd
Treehugger Robot [Mon, 10 Apr 2017 05:40:08 +0000 (05:40 +0000)]
Merge "Add an API hint for metered multipath traffic."
Treehugger Robot [Mon, 10 Apr 2017 05:33:46 +0000 (05:33 +0000)]
Merge "DO NOT MERGE IP connectivity metrics: fix tests."
Hugo Benichi [Mon, 10 Apr 2017 04:12:49 +0000 (13:12 +0900)]
DO NOT MERGE IP connectivity metrics: fix tests.
This patch fixes mismatch between current proto compiler and what is
expected in several IP connectivity metrics unit tests.
Test: built, flashed, $ runtest frameworks-net
Bug:
37126521
Change-Id: I1476c923d61f748ecac1146423127f54ba117502
Hugo Benichi [Mon, 10 Apr 2017 01:26:49 +0000 (01:26 +0000)]
Merge "Improve utility of IntArray and LongArray" am:
35786735df
am:
e718797a37
Change-Id: I21587b63e670e9a67ff23aeeda9c2ee9cc5a3a0a
Hugo Benichi [Mon, 10 Apr 2017 01:17:42 +0000 (01:17 +0000)]
Merge "Improve utility of IntArray and LongArray"
am:
35786735df
Change-Id: Id50add8d7e3fc45978752a6a31760bc69df0cc4a
Hugo Benichi [Mon, 10 Apr 2017 01:09:02 +0000 (01:09 +0000)]
Merge "Improve utility of IntArray and LongArray"