OSDN Git Service
Marco Nelissen [Wed, 7 Jun 2017 00:20:21 +0000 (00:20 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8
am:
9e4e6c4b7c
Change-Id: I96b9977d0bd218e3c13dcd177b8033657a023d14
Marco Nelissen [Wed, 7 Jun 2017 00:10:27 +0000 (00:10 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8
am:
db9d2588b8
Change-Id: I8da5c1b0f6fb3d7676c463c354167abce71f8124
Marco Nelissen [Wed, 7 Jun 2017 00:04:12 +0000 (00:04 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3
am:
d7fe3ea6a8
Change-Id: Ic5a7104241d36e82418ce5a2a43595d2fa4bff47
Marco Nelissen [Tue, 6 Jun 2017 23:54:55 +0000 (23:54 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887
am:
4d9e6150f3
Change-Id: I5ede1388f265920fa5dd835c4a6335380daa9103
Marco Nelissen [Tue, 6 Jun 2017 23:45:51 +0000 (23:45 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3
am:
ce5c72e887
Change-Id: I081f15c5d6bb16b3f490e53dbc2910a45e6a920b
Marco Nelissen [Tue, 6 Jun 2017 23:39:57 +0000 (23:39 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113
am:
69b6a382a3
Change-Id: I2c599bac680bda5d4dcfa4f3b9fb5f1413839da0
Marco Nelissen [Tue, 6 Jun 2017 23:33:50 +0000 (23:33 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1
am:
e18e8c4113
Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
Marco Nelissen [Tue, 6 Jun 2017 23:28:27 +0000 (23:28 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2
am:
3272cf26c1
Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944
Marco Nelissen [Tue, 6 Jun 2017 23:22:14 +0000 (23:22 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546
am:
6d5bc9a3c2
Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52
Marco Nelissen [Tue, 6 Jun 2017 23:16:24 +0000 (23:16 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64
am:
4b78a79546
Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8
Marco Nelissen [Tue, 6 Jun 2017 23:10:16 +0000 (23:10 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb
am:
5181a7ab64
Change-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9
Marco Nelissen [Tue, 6 Jun 2017 23:02:35 +0000 (23:02 +0000)]
Merge "Close connection before retrying" into lmp-dev
am:
a8648ecebb
Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74
TreeHugger Robot [Tue, 6 Jun 2017 22:53:55 +0000 (22:53 +0000)]
Merge "Close connection before retrying" into lmp-dev
Gabriele M [Tue, 6 Jun 2017 19:00:21 +0000 (19:00 +0000)]
Merge "QS: Remove listeners only if added" am:
bede96729c
am:
a8e8f1c9f6
Change-Id: Id8211c9683230ee5cbf1bc7497f5e7d879116d56
Gabriele M [Tue, 6 Jun 2017 18:49:15 +0000 (18:49 +0000)]
Merge "QS: Remove listeners only if added"
am:
bede96729c
Change-Id: I53250273e39889b6b772dc12bbdbbc0c9606fd47
Treehugger Robot [Tue, 6 Jun 2017 18:36:25 +0000 (18:36 +0000)]
Merge "QS: Remove listeners only if added"
Gabriele M [Mon, 5 Jun 2017 15:55:03 +0000 (17:55 +0200)]
QS: Remove listeners only if added
handleDestroy() calls setListening(false) unconditionally. This
causes an error if no listener was never added. Check if we added
a listener and then try to remove it.
Change-Id: Iefe8aacbe87ba1c2c19c9e77cf132fc7c84798f9
Paul Duffin [Tue, 6 Jun 2017 08:01:41 +0000 (08:01 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets" am:
46f8d427c4
am:
de30ee2d40
Change-Id: I4f615991b43350df9748d7f05fdcf5501eff135d
Paul Duffin [Tue, 6 Jun 2017 07:49:39 +0000 (07:49 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets"
am:
46f8d427c4
Change-Id: I93ecb5e95337b84c2746b802fa88382cdd676cb8
Paul Duffin [Tue, 6 Jun 2017 07:40:17 +0000 (07:40 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets"
Erik Kline [Tue, 6 Jun 2017 05:05:04 +0000 (05:05 +0000)]
Merge "Support setting upstream parameters." am:
faf8d67749
am:
4e5024131b
Change-Id: I150015ea0c66be50e79f641f20d1752b9d60cb0d
Erik Kline [Tue, 6 Jun 2017 04:54:04 +0000 (04:54 +0000)]
Merge "Support setting upstream parameters."
am:
faf8d67749
Change-Id: I0be9ad265fa664f0ce6e1e098996b46c88317b97
Treehugger Robot [Tue, 6 Jun 2017 04:43:32 +0000 (04:43 +0000)]
Merge "Support setting upstream parameters."
Erik Kline [Thu, 1 Jun 2017 11:11:25 +0000 (20:11 +0900)]
Support setting upstream parameters.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
34361337
Change-Id: Id88cae4beed7d38aec3d29a0e2f59a5c7e6a9a4e
Erik Wolsheimer [Mon, 5 Jun 2017 21:46:26 +0000 (21:46 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff
am:
51a89ee90c
Change-Id: I154876bd0294d0e31af63ed2e24c91d243eae56f
Erik Wolsheimer [Mon, 5 Jun 2017 21:38:33 +0000 (21:38 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev
am:
7a5dd1c3ff
Change-Id: Ida35556f6d57113ad06c736ef780580b814f673e
TreeHugger Robot [Mon, 5 Jun 2017 21:24:44 +0000 (21:24 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev
Erik Wolsheimer [Mon, 5 Jun 2017 16:49:28 +0000 (16:49 +0000)]
Revert "Fix race condition triggered by quick stop/start of Dream"
Causes another race condition
This reverts commit
69515b2261335be4bd8510ed5a40a6bed3d7b48f.
Bug:
62147987
Change-Id: Ibe6f9bc14ed6cc35d3a23d52300657eaed9bb6d8
Paul Duffin [Fri, 19 May 2017 08:05:54 +0000 (09:05 +0100)]
Added android.test.mock and android.test.mock.sdk targets
The android.test.mock will be used for any targets that require
android.test.mock classes but which do not already depend on the
sdk. It is also the library that will be added to the classpath
at runtime when an app has the following in their manifest.
<uses-library android:name="android.test.mock"/>
The android.test.mock.sdk will be used by targets that require
android.test.mock classes and which build against the SDK. It
contains stub classes (like android.jar). It is also the library
that will be copied into the optional directory of the SDK.
(cherry picked from
f74752293d1d25633aebc42c600717d0296a0820)
Bug:
30188076
Test: make checkbuild
Change-Id: If199180e1136da1927a9e7c7bcafbcfb29cf1274
Merged-In: Ia3fcd47c644b8e5a573f891571a7b3772eac63f9
Erik Kline [Mon, 5 Jun 2017 04:38:51 +0000 (04:38 +0000)]
Merge "Minor upstream selection refactoring" am:
12fe022fbd
am:
2cb58deb7b
Change-Id: I9868806741e17c23e8c9ed34e753062733af190e
Erik Kline [Mon, 5 Jun 2017 04:28:16 +0000 (04:28 +0000)]
Merge "Minor upstream selection refactoring"
am:
12fe022fbd
Change-Id: I1984cf520c04cdc2751dca3d6029793a257a1592
Treehugger Robot [Mon, 5 Jun 2017 04:19:28 +0000 (04:19 +0000)]
Merge "Minor upstream selection refactoring"
Hugo Benichi [Mon, 5 Jun 2017 04:09:22 +0000 (04:09 +0000)]
Merge "Fix captive portal login ssl error overflow" am:
42409f9776
am:
a89aad8408
Change-Id: Id56f6bddf188b80b5e371e78ea8a45df63742414
Hugo Benichi [Mon, 5 Jun 2017 03:59:14 +0000 (03:59 +0000)]
Merge "Fix captive portal login ssl error overflow"
am:
42409f9776
Change-Id: I71a035066c522d6e96a43dea32f07594861bdbed
Treehugger Robot [Mon, 5 Jun 2017 03:47:58 +0000 (03:47 +0000)]
Merge "Fix captive portal login ssl error overflow"
Erik Kline [Sun, 4 Jun 2017 02:36:01 +0000 (11:36 +0900)]
Minor upstream selection refactoring
Specifically:
- relocated "tryCell" handling
- minor logging change
- remove unneeded checkExpectedThread()
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I2f5428206503fd222b959e695c26326df53038f1
Hugo Benichi [Fri, 2 Jun 2017 01:12:09 +0000 (10:12 +0900)]
Fix captive portal login ssl error overflow
This patch fixes the built-in html page shown in the captive portal
login activity when there is an ssl error. The page is now scaled
correctly with respect to the device screen, and text wraps as
expected.
This patch also cleanups the hardcoded page by:
- formatting it for better reading,
- inlining the "px" css rules,
- using string concatenation instead of format for including the
localized text.
Bug:
62269512
Bug:
36532213
Test: manually triggered the activity to load the error page
Change-Id: I9d037222798bd9d4c1736923afb71e3e14c68bcc
nharold [Fri, 2 Jun 2017 23:57:05 +0000 (23:57 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager" am:
4f6ec3d11d
am:
c530c01744
Change-Id: I529711b4a658cdf82e223194ebae4ecf1a7f3ce2
nharold [Fri, 2 Jun 2017 23:49:33 +0000 (23:49 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager"
am:
4f6ec3d11d
Change-Id: If2b8a92171f9d9f7d1b9aa89cf6fc90efe2f386d
nharold [Fri, 2 Jun 2017 23:40:16 +0000 (23:40 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager"
Marco Nelissen [Fri, 2 Jun 2017 19:16:44 +0000 (12:16 -0700)]
Close connection before retrying
Otherwise the (CTS) server might run out of connections.
Bug:
38391487
Bug:
22771132
Test: build, run CTS, stream music
Change-Id: I92c782a6799ab36eec8df3f7c3217bea667b838a
Brad Ebinger [Fri, 2 Jun 2017 22:26:31 +0000 (22:26 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am:
75b7ef15f6
am:
bbe9e26247
Change-Id: I32989c307a3c251e1d9df65cf6c91b4b29a2452e
Brad Ebinger [Fri, 2 Jun 2017 22:19:31 +0000 (22:19 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"
am:
75b7ef15f6
Change-Id: I7075ab7524d363ade4f42d7d3d33251243707e8a
Brad Ebinger [Fri, 2 Jun 2017 22:09:47 +0000 (22:09 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"
Brad Ebinger [Fri, 2 Jun 2017 17:56:40 +0000 (10:56 -0700)]
Adds ACCESS_CLASS_BLOCKED Disconnect cause
Adds the ACCESS_CLASS_BLOCKED Disconnect cause in order
to allow the dialer to take action when this happens
during a VT call.
Bug:
33821263
Test: Build
Change-Id: I9afdd90f0a8a562b626b730dbb1b03cf37776ebd
Sooraj Sasindran [Fri, 2 Jun 2017 17:38:02 +0000 (17:38 +0000)]
Merge "Testra RSSI compliance" am:
7466567d89
am:
1bb09a713d
Change-Id: I351f4bc774e57565691485f3bc16897807b02024
Sooraj Sasindran [Fri, 2 Jun 2017 17:31:39 +0000 (17:31 +0000)]
Merge "Testra RSSI compliance"
am:
7466567d89
Change-Id: I8e348f6433bef87c28ac80e6778ecfd3dede6dc5
Sooraj Sasindran [Fri, 2 Jun 2017 17:31:34 +0000 (17:31 +0000)]
Merge "Testra RSSI compliance" am:
542ebcd3fb
am:
69a3e67e3c
Change-Id: I53331fb51559ede536988061e43dece2b1d54456
Sooraj Sasindran [Fri, 2 Jun 2017 17:25:46 +0000 (17:25 +0000)]
Merge "Testra RSSI compliance"
am:
542ebcd3fb
Change-Id: I5c31472190dc06d1ae5c2c077248b8c8f65f54e8
Treehugger Robot [Fri, 2 Jun 2017 17:20:30 +0000 (17:20 +0000)]
Merge "Testra RSSI compliance"
Treehugger Robot [Fri, 2 Jun 2017 17:16:41 +0000 (17:16 +0000)]
Merge "Testra RSSI compliance"
Sooraj Sasindran [Tue, 9 May 2017 22:00:55 +0000 (15:00 -0700)]
Testra RSSI compliance
Devices that support 4 bar signal strength
indication should display the bars as follow:
4 bar RSRP > -90
3 bar -90 ≥ RSRP > -100
2 bar -100 ≥ RSRP > -115
1 bar -115 ≥ RSRP > -120
0 bar RSRP ≤ -120
or No Sync to LTE Reference Signals
Bug=
37187586
Change-Id: I2a76aabdf6d8ef1be3a05a90643b1e670f929bc3
Sooraj Sasindran [Fri, 12 May 2017 00:36:37 +0000 (17:36 -0700)]
Testra RSSI compliance
Devices that support 4 bar signal strength
indication should display the bars as follow:
4 bar RSRP > -90
3 bar -90 ≥ RSRP > -100
2 bar -100 ≥ RSRP > -115
1 bar -115 ≥ RSRP > -120
0 bar RSRP ≤ -120
or No Sync to LTE Reference Signals
Add support for mnc 11, 71 and 72
BUG=
37187586
Change-Id: Ia0a71707d1cbc20887bcc00c0519833b522b4a95
Erik Kline [Fri, 2 Jun 2017 05:32:50 +0000 (05:32 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am:
3478ff8c9e
am:
1536453059
Change-Id: I4a9a99c72f8a1d70355d1bf910530ca50cab8a77
Erik Kline [Fri, 2 Jun 2017 05:26:49 +0000 (05:26 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode"
am:
3478ff8c9e
Change-Id: I489f7e6b8ca4af584879a4c9e8f00570da6e400c
Treehugger Robot [Fri, 2 Jun 2017 05:19:31 +0000 (05:19 +0000)]
Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode"
Erik Kline [Wed, 31 May 2017 06:53:53 +0000 (15:53 +0900)]
Handle Wi-Fi passing explicit interface name and AP/IP mode
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
31466854
Bug:
32163131
Bug:
62076211
Change-Id: I3557a9c14f4e9f1de1869084566a179003d98ffe
Nathan Harold [Wed, 5 Apr 2017 02:37:48 +0000 (19:37 -0700)]
Add UDP Encap Socket Support to IpSecManager
-Implement the UdpEncapsulationSocket
-Convert all ManagedResources to use resourceIds
-Rework ManagedResource to track resourceIds
Bug:
30984788
Test: cts - IpSecManagerTest#testUdpEncapsulation()
Change-Id: I7b1099c487051a8d951c1485791c4b6cef2deb1d
Rebecca Silberstein [Fri, 2 Jun 2017 01:43:47 +0000 (01:43 +0000)]
Merge "WifiManager: add unspecified ip mode" am:
dae92faa02
am:
0b9fa27619
Change-Id: I52a0e54bf024ffa6871fb8edbcda3301e7e7fbed
Rebecca Silberstein [Fri, 2 Jun 2017 01:37:43 +0000 (01:37 +0000)]
Merge "WifiManager: add unspecified ip mode"
am:
dae92faa02
Change-Id: Ia8fe528fd7cbe8076ea185d21ae7dcfd5654334c
Treehugger Robot [Fri, 2 Jun 2017 01:26:14 +0000 (01:26 +0000)]
Merge "WifiManager: add unspecified ip mode"
Arun [Thu, 1 Jun 2017 23:33:26 +0000 (23:33 +0000)]
Merge "Optimised hwui rounded corners shader" am:
d7287c96eb
am:
ed7bdd6549
Change-Id: I6acba9bd707a3beec41439cd86cce4cdea6d8b69
Arun [Thu, 1 Jun 2017 23:24:50 +0000 (23:24 +0000)]
Merge "Optimised hwui rounded corners shader"
am:
d7287c96eb
Change-Id: Idf53faac924be91d4e23da91b54c9ca08be9ad39
Treehugger Robot [Thu, 1 Jun 2017 23:13:24 +0000 (23:13 +0000)]
Merge "Optimised hwui rounded corners shader"
Arun [Mon, 23 Jan 2017 11:59:21 +0000 (11:59 +0000)]
Optimised hwui rounded corners shader
This is a ~2x performance increase for the rounded corners shader which
was previously shader limited even on many high-end GPUs. It simplifies
the calculations by pre-dividing by the radius, which also allows to
maintain mediump/FP16 precision (this improves performance and might
improve image quality on GPUs that don't support highp e.g. Mali-400).
It also uses a conditional in the shader to save much of the work on
the vast majority of pixels which are not close to the corners.
Test: manual - visual inspection on fugu (nexus player)
Change-Id: I38f491cfb006e2991ef0b9d6b3d67d2c4d328d44
Robert Greenwalt [Thu, 1 Jun 2017 17:11:56 +0000 (17:11 +0000)]
Merge "Move appName inside Downloadrequest." am:
142a392b75
am:
196cb3dff6
Change-Id: I79e1beb5c211a8ff0f90a2f473f85b0068abe61a
Robert Greenwalt [Thu, 1 Jun 2017 17:05:40 +0000 (17:05 +0000)]
Merge "Move appName inside Downloadrequest."
am:
142a392b75
Change-Id: I6512d4bc2406f23571c1d4e6425353930fb9b847
Robert Greenwalt [Thu, 1 Jun 2017 16:52:32 +0000 (16:52 +0000)]
Merge "Move appName inside Downloadrequest."
Hugo Benichi [Thu, 1 Jun 2017 13:52:16 +0000 (13:52 +0000)]
Merge "Prettify the captive portal sign-in activity" am:
5dbdffbf81
am:
6e145ffb0e
Change-Id: I183a1c4e9b38b88c541eb3acf3412eb29744bd69
Hugo Benichi [Thu, 1 Jun 2017 13:44:19 +0000 (13:44 +0000)]
Merge "Prettify the captive portal sign-in activity"
am:
5dbdffbf81
Change-Id: I71b55fc8869471c02f470980d013951b285b3ebb
Treehugger Robot [Thu, 1 Jun 2017 13:34:14 +0000 (13:34 +0000)]
Merge "Prettify the captive portal sign-in activity"
Rebecca Silberstein [Wed, 10 May 2017 05:58:01 +0000 (22:58 -0700)]
WifiManager: add unspecified ip mode
Add an unspecified IP mode that allows WifiServiceImpl to clear state
in the interface-based IP mode tracking.
Bug:
31466854
Test: frameworks/base/wifi/tests/runtests.sh
Merged-In: I0d1db7ecb9cf7edd74d95f73d88b23571b87a27f
Merged-In: Iaa1474bd24d63e957ae82745b66c7571a5f18433
Change-Id: I15485cdab95ed4308cf5c2877fba40eac82bf162
(cherry picked from commit
bf4754361877ad93a92bea64407974f26eb7c494)
Yohann Roussel [Thu, 1 Jun 2017 09:40:00 +0000 (09:40 +0000)]
Merge "Add tests on MultiDex.installInstrumentation" am:
f547c4045f
am:
56b36c092b
Change-Id: I1aebb84f762c990430f52f7b6312fdd3b61a0be4
Hugo Benichi [Wed, 17 May 2017 00:26:30 +0000 (09:26 +0900)]
Prettify the captive portal sign-in activity
- fuses url bar with activity header: url is now the subtitle
- url appears as text and not as editable content
- url only shows host name
- header style is the device default for Settings
- Material progress bar
- progress bar disappears at page load finished
- webview does not jump at page load finished
Bug:
62107381
Bug:
38197949
Test: tested by manually triggering the sign-in activity
Merged-In: Id75023acad04f444dbfc41de56814a09e70cc6f9
(cherry pick from commit
a206649a6f66f16cc56db2f4e32b846d9b03501c)
Change-Id: I5c3e5ebac18fef6611c215d04d88ffef67b2b640
Yohann Roussel [Thu, 1 Jun 2017 09:31:07 +0000 (09:31 +0000)]
Merge "Add tests on MultiDex.installInstrumentation"
am:
f547c4045f
Change-Id: I022a89d1fdacca4a96ea493841609c48a538370b
Yohann Roussel [Thu, 1 Jun 2017 09:23:13 +0000 (09:23 +0000)]
Merge "Add tests on MultiDex.installInstrumentation"
Erik Kline [Thu, 1 Jun 2017 08:04:20 +0000 (08:04 +0000)]
Merge "Add a tethering offload settings kill switch" am:
7cf3086f37
am:
503a6952b2
Change-Id: I6be567bb315a5797bbc71f5f48efc522b947f678
Erik Kline [Thu, 1 Jun 2017 07:59:11 +0000 (07:59 +0000)]
Merge "Add a tethering offload settings kill switch"
am:
7cf3086f37
Change-Id: I13264b4ae23c8754b61ff46cafbb1b5f31bd14a3
Treehugger Robot [Thu, 1 Jun 2017 07:50:35 +0000 (07:50 +0000)]
Merge "Add a tethering offload settings kill switch"
Jack He [Thu, 1 Jun 2017 07:08:40 +0000 (07:08 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected" am:
93d7c84726
am:
10cb6f3b4c
Change-Id: I9bd2db9f92866c1e4f62b09fcfd5ad02edcd4e8e
Jack He [Thu, 1 Jun 2017 07:00:47 +0000 (07:00 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected"
am:
93d7c84726
Change-Id: I5f0ad1581dd76a8c95dcc52702b0462adc786528
Treehugger Robot [Thu, 1 Jun 2017 06:53:25 +0000 (06:53 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected"
Robert Greenwalt [Fri, 19 May 2017 19:30:22 +0000 (12:30 -0700)]
Move appName inside Downloadrequest.
Simplifies vendor API.
Test: builds
Change-Id: I1e59e8014aa0fe1c0d46bca3347f428347fa0365
Jack He [Wed, 10 May 2017 00:16:01 +0000 (17:16 -0700)]
HFP: Allow SCO audio to be forcibly connected
* Normally, Android only allows SCO audio to be connected in several
allowed cases (e.g. in call, in ringing, in virtual call state, etc)
* Sometimes, it is necessary to force a SCO audio connection (e.g.
during PTS test)
* This change adds setForceScoAudio(boolean) hidden, system only method
to allow such behaviour
Bug:
38040125
Test: PTS HFP tests
Change-Id: I28f295c98da5bebb837c2a5423c7acde81af73f7
Jack Yu [Wed, 31 May 2017 21:52:05 +0000 (21:52 +0000)]
Merge "Added video calling data usage per-uid support" am:
36fdb346f2
am:
2f74c02826
Change-Id: Ia81f03a076901d545972fc3cbe7a18d20ea6df2a
Jack Yu [Wed, 31 May 2017 21:44:13 +0000 (21:44 +0000)]
Merge "Added video calling data usage per-uid support"
am:
36fdb346f2
Change-Id: I3901efbfafcfab7e076b669f0313dce860e97072
Treehugger Robot [Wed, 31 May 2017 21:33:55 +0000 (21:33 +0000)]
Merge "Added video calling data usage per-uid support"
Jack Yu [Fri, 26 May 2017 23:08:22 +0000 (16:08 -0700)]
Added video calling data usage per-uid support
Now the VT call data usage will be counted under
current dialer's data usage as well as the total
device data usage.
Test: Manual
bug:
37671326
Merged-In: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Change-Id: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Hugo Benichi [Wed, 31 May 2017 13:16:43 +0000 (13:16 +0000)]
Merge "Fix race condition in NsdManagerTest" am:
f2383db747
am:
2dfb494827
Change-Id: Id2036620f3780aca340470d03b3c579ed3e1e9b7
Hugo Benichi [Wed, 31 May 2017 13:08:37 +0000 (13:08 +0000)]
Merge "Fix race condition in NsdManagerTest"
am:
f2383db747
Change-Id: Ifd731767608e738a271bd5793a462675c2a93123
Treehugger Robot [Wed, 31 May 2017 12:56:55 +0000 (12:56 +0000)]
Merge "Fix race condition in NsdManagerTest"
daqi [Wed, 31 May 2017 12:42:12 +0000 (12:42 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime" am:
30895c5e1e
am:
6bc2199774
Change-Id: Idf798414b9d7d4c41d59c4b57c313e1030cba119
daqi [Wed, 31 May 2017 12:34:10 +0000 (12:34 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime"
am:
30895c5e1e
Change-Id: I5bdbbee36116fd18aa373fd666581eb274b488cb
Treehugger Robot [Wed, 31 May 2017 12:25:38 +0000 (12:25 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime"
Narayan Kamath [Wed, 31 May 2017 12:16:10 +0000 (12:16 +0000)]
Merge "jni: Track debuggerd API changes." am:
d29f144836
am:
d82212700e
Change-Id: I3022cc84acaff4a416eb070d98a2d972a0833f08
Narayan Kamath [Wed, 31 May 2017 12:06:35 +0000 (12:06 +0000)]
Merge "jni: Track debuggerd API changes."
am:
d29f144836
Change-Id: I0a538cdcb94c2f79c371df0c60af1e1234279f5b
Narayan Kamath [Wed, 31 May 2017 12:01:07 +0000 (12:01 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps." am:
41f23d645c
am:
9765d78f69
Change-Id: I6b5830ad5a5eda8ad2b84a1c5fa71f2beab27a88
Narayan Kamath [Wed, 31 May 2017 11:55:47 +0000 (11:55 +0000)]
Merge "jni: Track debuggerd API changes."
Narayan Kamath [Wed, 31 May 2017 11:52:39 +0000 (11:52 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps."
am:
41f23d645c
Change-Id: I900bf1adcb6bf449f6db49a34ce5a9bb26af6001
Treehugger Robot [Wed, 31 May 2017 11:42:26 +0000 (11:42 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps."
OSDN Git Service
