OSDN Git Service
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 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 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: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"
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:31:39 +0000 (17:31 +0000)]
Merge "Testra RSSI compliance"
am:
7466567d89
Change-Id: I8e348f6433bef87c28ac80e6778ecfd3dede6dc5
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: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: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: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: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: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)
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 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: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: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: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: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:06:35 +0000 (12:06 +0000)]
Merge "jni: Track debuggerd API changes."
am:
d29f144836
Change-Id: I0a538cdcb94c2f79c371df0c60af1e1234279f5b
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."
Erik Kline [Wed, 31 May 2017 01:21:32 +0000 (10:21 +0900)]
Add a tethering offload settings kill switch
Check for tether_offload_disabled (defaulting to false if not present)
before starting the OffloadController.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
34361337
Change-Id: Ifcc0eb1a41f09ad9e717c9252d2d55e69789669b
Narayan Kamath [Thu, 25 May 2017 14:44:51 +0000 (15:44 +0100)]
jni: Track debuggerd API changes.
android_os_Debug calls dump_backtrace_to_file_timeout which
now needs an additional argument that specifies the dump type.
Bug:
32064548
Test: make
Change-Id: Ic4047f4117fee0829d4cb8b1d47ad688b33001dc
Narayan Kamath [Wed, 10 May 2017 17:56:12 +0000 (18:56 +0100)]
AndroidRuntime: Add flag to support tombstoned aided stack dumps.
We introduce a new property dalvik.vm.stack-trace-dir that indicates
that we're using one trace file per dump. The runtime does not need
to know what the directory is, since it will communicate with
tombstoned in order to obtain a file descriptor to which it will write
its traces. In this change, we set the -Xtombstonedtraces flag whenever
dalvik.vm.stack-trace-dir is set.
Test: Manual
Bug:
32064548
Change-Id: I05984e91658250ad8379b821ca31649f13868580
Hugo Benichi [Wed, 31 May 2017 06:31:59 +0000 (15:31 +0900)]
Fix race condition in NsdManagerTest
NsdManagerTest relies on the lastMessage variable to assert the
connection of a client to the service. The asserts in test are done on a
different thread, although the variable was not qualified volatile,
which creates the chance to read a stale value. This patch fixes this
race by marking the variable volatile.
Bug:
32561414
Bug:
62044295
Test: NsdManagerTest works
Change-Id: I0bc2cd8059c6ff8b78a2dda0ba8d6bc7e13ef951
Hugo Benichi [Wed, 31 May 2017 03:52:05 +0000 (03:52 +0000)]
Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark"
am:
76efbb30f5
Change-Id: I2c7e714af44c31a101fd58be6ebcc540fffd65a1
Treehugger Robot [Wed, 31 May 2017 03:43:37 +0000 (03:43 +0000)]
Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark"
Hugo Benichi [Mon, 29 May 2017 04:13:52 +0000 (13:13 +0900)]
ConnectivityServiceTest: more tweaks to testRequestBenchmark
Recent continuous testing runs indicates that commit
849b81b7 did not
completely fixed the issue with testRequestBenchmark.
This patch changes the name of the test to not include "test" and
removes @SmallTest annotation, which should do the job of @Ignore while
ConnectivityServiceTest still extends AndroidTestCase.
In addition timeouts are adjusted to take into account recent failures
observed.
This is the last pending action before turning on FrameworksNetTests on
presubmits.
Bug:
32561414
Test: no functional change
Change-Id: I56ef334e19e99e5a3483418330e5f0ccd6eb31bb
Colin Cross [Wed, 31 May 2017 01:22:00 +0000 (01:22 +0000)]
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"
am:
a4982eb5dd
Change-Id: Ic7700b1974d2d3aa3df0c55003ee6c16c1ba6ece
Treehugger Robot [Wed, 31 May 2017 01:13:05 +0000 (01:13 +0000)]
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"
insight.lee [Tue, 30 May 2017 22:34:47 +0000 (22:34 +0000)]
Merge "Allow ManagedProvisioning to silently uninstall apps"
am:
cfc68b6661
Change-Id: I2fed72cf026733b8976b4b8a113d1eb0db27fcaa
Treehugger Robot [Tue, 30 May 2017 22:21:12 +0000 (22:21 +0000)]
Merge "Allow ManagedProvisioning to silently uninstall apps"
yangbingqian [Tue, 30 May 2017 21:48:15 +0000 (21:48 +0000)]
Merge "use FgThread.class instead of UiThread.class for lock object"
am:
e2fddf56a4
Change-Id: Ia6d2154bf46d61ea55ef7e41abd538b1c71972b5
Treehugger Robot [Tue, 30 May 2017 21:35:11 +0000 (21:35 +0000)]
Merge "use FgThread.class instead of UiThread.class for lock object"
Colin Cross [Tue, 30 May 2017 17:57:34 +0000 (10:57 -0700)]
Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals
Instead of directly adding dependencies to full_classes_compiled_jar
and full_classes_jack, just use LOCAL_ADDITIONAL_DEPENDENCIES and
let the build system take care of where the dependencies are needed.
Test: builds
Change-Id: Ia3078fe0aa54b2d69821a9879cfe43414e1e9c4f
daqi [Tue, 30 May 2017 07:37:23 +0000 (15:37 +0800)]
Fix TaskRecord wrong dump element firstActiveTime
[Cause of Defect]
Used wrong class field.
Test: manual - adb shell dumpsys activity a
Change-Id: I6f54e374709b6ae60f8adabd5c29a1f100941c42
Signed-off-by: daqi <daqi@xiaomi.com>
Erik Kline [Mon, 29 May 2017 08:42:04 +0000 (08:42 +0000)]
Merge "Support "dumpsys connectivity tethering""
am:
6cdcba7b48
Change-Id: I91ef704d3fda346a50016841f40fecce2e23d215
Erik Kline [Mon, 29 May 2017 08:33:09 +0000 (08:33 +0000)]
Merge "Support "dumpsys connectivity tethering""
Joel Scherpelz [Mon, 29 May 2017 03:33:08 +0000 (03:33 +0000)]
Merge "Support requesting and receiving wakeup events"
am:
bf152b14c4
Change-Id: I594d4b5921ec6f0f8f73b88fd4d0e06278838553
Joel Scherpelz [Mon, 29 May 2017 03:28:00 +0000 (03:28 +0000)]
Merge "Support requesting and receiving wakeup events"
Erik Kline [Mon, 29 May 2017 00:11:03 +0000 (09:11 +0900)]
Support "dumpsys connectivity tethering"
Also print current upstream interface in tethering dump output.
Test: as follows
- build
- flashed
- booted
- runtest frameworks-net passes
- "dumpsys connectivity tethering" shows just tethering info
Bug:
32163131
Bug:
36504926
Bug:
36988090
Bug:
38152109
Bug:
38186915
Bug:
38218697
Change-Id: I7f185fd71946a032e7f815207016294892df135d
Joel Scherpelz [Mon, 22 May 2017 04:47:41 +0000 (13:47 +0900)]
Support requesting and receiving wakeup events
Test: as follows
- built
- flashed
- booted
- ConnectivityServiceTest passes
Bug:
28806131
Change-Id: Ifc45260d5315479393da2c859ba4afed4e0e8c85
Erik Kline [Sun, 28 May 2017 11:16:32 +0000 (11:16 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration"
am:
39ce589f0b
Change-Id: I1d61308cf21f3c4ebcc37f78bdd102f96a676462
Erik Kline [Sun, 28 May 2017 11:06:39 +0000 (11:06 +0000)]
Merge "Minor improvement in logging in TetheringConfiguration"
Erik Kline [Fri, 19 May 2017 01:10:41 +0000 (10:10 +0900)]
Minor improvement in logging in TetheringConfiguration
Test: as follows
- built
- booted
- flashed
- runtest frameworks-net passes
- dumpsys connectivity shows expected output
Bug:
32163131
Bug:
36504926
Bug:
36988090
Bug:
38152109
Bug:
38186915
Bug:
38218697
Change-Id: I4a2129d780dfec7bca693486a100ea3c78465430
insight.lee [Mon, 8 May 2017 07:10:12 +0000 (16:10 +0900)]
Allow ManagedProvisioning to silently uninstall apps
1. During device owner provisioning, ManagedProvisioning uninstalls
non-required apps. Apps to remove are all system apps in the reference
device. On the other hand, OEM devices have several non system apps,
so ManagedProvisioning can not uninstall them and can not complete
device owner provisioning permarnently.
2. This commit allows ManagedProvisioning having
MANAGE_PROFILE_AND_DEVICE_OWNERS permission to uninstall non-required
apps silently.
Bug:
37681141
Test: manual
Signed-off-by : Sungmin Lee <insight.lee@lge.com>
Merged-In: I201b070f4bcf453a2ffb391600853c7e595aec5d
Change-Id: I201b070f4bcf453a2ffb391600853c7e595aec5d
Hall Liu [Sat, 27 May 2017 01:18:33 +0000 (01:18 +0000)]
Merge "Add new error codes in MbmsException"
am:
8e7057ccf3
Change-Id: Ie8bf825d1fe7c40c94abd0245e69d597afb2f9bc
Hall Liu [Sat, 27 May 2017 01:08:29 +0000 (01:08 +0000)]
Merge "Add new error codes in MbmsException"
Jakub Pawlowski [Fri, 26 May 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Add 32 and 128 bit Service Data parsing."
am:
725e212de3
Change-Id: I5a5010651b07f2a9c5d1fb25f55602ed5e741d56
Treehugger Robot [Fri, 26 May 2017 22:53:27 +0000 (22:53 +0000)]
Merge "Add 32 and 128 bit Service Data parsing."
Hall Liu [Fri, 26 May 2017 22:49:32 +0000 (15:49 -0700)]
Add new error codes in MbmsException
Test: builds
Change-Id: I523961f588ef5ada97e06f5a910875c123f97989
Ruchi Kandoi [Fri, 26 May 2017 22:30:16 +0000 (22:30 +0000)]
Merge "Make NFC AIDL callbacks oneway"
am:
99c805b319
Change-Id: I964420fc36c67b9f96e286e1a8b9b54eda074189
Treehugger Robot [Fri, 26 May 2017 22:20:56 +0000 (22:20 +0000)]
Merge "Make NFC AIDL callbacks oneway"
Yuka Anami [Fri, 26 May 2017 22:17:15 +0000 (22:17 +0000)]
Merge "Add ID_LENGTH field for Empty type record"
am:
b1f0bb6f83
Change-Id: Ib63ba83f912f2047ec5bd795b57da423c1e78f59
Treehugger Robot [Fri, 26 May 2017 22:07:37 +0000 (22:07 +0000)]
Merge "Add ID_LENGTH field for Empty type record"
Jakub Pawlowski [Fri, 26 May 2017 20:59:55 +0000 (13:59 -0700)]
Add 32 and 128 bit Service Data parsing.
Bug:
62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
Ruchi Kandoi [Fri, 28 Apr 2017 22:48:02 +0000 (15:48 -0700)]
Make NFC AIDL callbacks oneway
Test: Read NFC tags, Android Beam
Bug:
32288773
Change-Id: I6294ec29be2af8feb578e9bfd5e0770ad9c09cc0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Yuka Anami [Mon, 15 May 2017 04:53:04 +0000 (13:53 +0900)]
Add ID_LENGTH field for Empty type record
If ID_LENGTH field is omitted from Empty Type record, it cannot be
detected as Ndef since the data is strictly checked by
e3fc7d9954.
But it is not possible to create raw bytes of Empty Type record
which can meet this condition by using NdefRecord/NdefMessage.
To fix this issue, added ID_LENGTH field to Empty type record.
Bug:
38299566
Test: Write and read NDEF tag with empty type record
Change-Id: Idb58c80cf8562a8b314f4ddeccdc627dc0c6f5b4
Rebecca Silberstein [Fri, 26 May 2017 16:37:21 +0000 (16:37 +0000)]
Merge "WifiManager: add iface name and mode labels"
am:
21cc4bcd01
Change-Id: Ia715be047c0e1c3ef5ea5d38d013276cf5a3eacc
Treehugger Robot [Fri, 26 May 2017 16:26:36 +0000 (16:26 +0000)]
Merge "WifiManager: add iface name and mode labels"
Rebecca Silberstein [Thu, 25 May 2017 08:53:08 +0000 (01:53 -0700)]
WifiManager: add iface name and mode labels
Connectivity service needs to get the interface name and intended ip
configuration mode for softap.
This CL adds the interface name and softap target mode variables to
use to insert the extra info into the wifi ap state change broadcast.
Note: additional CLs are needed to verify the iface name and mode. The
mode tracking is still in progress.
Bug:
62076211
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: manually verified the name in the broadcast
Merged-In: I67f82525b5c0fa5b81235311988c9b186d16077a
Merged-In: Ieff7af7c1ac2113b8044c16a01cad0f96cb70158
Change-Id: I64e1d13a9e422945fe9c4c268c206da365d0a3eb
(cherry picked from commit
4ac2cab8fd8cb6ef877f4e5c37f554f1a09b79dc)
Erik Kline [Fri, 26 May 2017 10:16:26 +0000 (10:16 +0000)]
Merge "Support registration of offload control callbacks."
am:
7ee96625c2
Change-Id: Ica4f51762b577e3868e87622df3963cd89daacae
Treehugger Robot [Fri, 26 May 2017 10:07:25 +0000 (10:07 +0000)]
Merge "Support registration of offload control callbacks."
Nicolas Geoffray [Fri, 26 May 2017 08:07:58 +0000 (08:07 +0000)]
Merge "Pass bootComplete to dexopt."
am:
18c3201986
Change-Id: I5d73692a887ef8f3fff888c310f9969d79ada970
Nicolas Geoffray [Fri, 26 May 2017 08:00:40 +0000 (08:00 +0000)]
Merge "Pass bootComplete to dexopt."
Erik Kline [Tue, 25 Apr 2017 10:19:59 +0000 (19:19 +0900)]
Support registration of offload control callbacks.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
34361337
Change-Id: I054cdf6a277c77e4cbf5c81145446a9be1c5fe39
Hugo Benichi [Fri, 26 May 2017 00:43:06 +0000 (00:43 +0000)]
Merge changes If4deb106,Ib25d7658
am:
0388f0e47b
Change-Id: Id10b2a80388aff2307cefd95ffb5f2b4df5fbdc3