OSDN Git Service
Jeff Hao [Wed, 19 Apr 2017 17:21:36 +0000 (17:21 +0000)]
Merge "Handle shared libraries for split apks."
am:
9487dff8ab
Change-Id: I3414ba72ba8e3c3fc2d169a2a892c851d2577f3b
Treehugger Robot [Wed, 19 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Handle shared libraries for split apks."
Jakub Pawlowski [Wed, 19 Apr 2017 16:04:45 +0000 (16:04 +0000)]
Merge "Read by UUID for PTS tests (1/5)"
am:
7826c08e21
Change-Id: I380a38460b1e00f405fdde0683c40dbc9c5b3807
Treehugger Robot [Wed, 19 Apr 2017 06:08:48 +0000 (06:08 +0000)]
Merge "Read by UUID for PTS tests (1/5)"
Jeff Hao [Thu, 6 Apr 2017 00:09:59 +0000 (17:09 -0700)]
Handle shared libraries for split apks.
As we dexopt all the code paths of a package, we now append the code
paths to the list of shared libraries. These paths are passed as
relative paths since the apks are staged during installation, and are
not where they will be at runtime.
Part of a multi-project change.
Bug:
34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
Merged-In: I73823ca575560cbd445d78a6cfbfc72031943265
(cherry-picked from commit
16d4843433e024100b4ecd183f827ad5bd8772a6)
Change-Id: I943bf8234899e1b25d4eb5e98af15d9150a7a842
Jaewan Kim [Tue, 18 Apr 2017 23:37:26 +0000 (23:37 +0000)]
Merge "Add callback for AVRCP 1.6 support"
am:
58b5789cde
Change-Id: I13633358bb5fbc0bb52808d2e9213434cc27546f
Treehugger Robot [Tue, 18 Apr 2017 23:25:25 +0000 (23:25 +0000)]
Merge "Add callback for AVRCP 1.6 support"
nharold [Tue, 18 Apr 2017 21:51:25 +0000 (21:51 +0000)]
Merge changes from topic 'ipsec-hide-overloads'
am:
fe358c6adf
Change-Id: Ia28149a13cae7b5bdcb6f41d1f6cd4d37fbaf88b
Nathan Harold [Tue, 18 Apr 2017 21:50:30 +0000 (21:50 +0000)]
Consistenly Throw IOExceptions from IpSecManager
am:
0bfb207532
Change-Id: I42f4526b43a8de19178a23e5106596f94050c1d4
Jakub Pawlowski [Fri, 14 Apr 2017 14:21:20 +0000 (07:21 -0700)]
Read by UUID for PTS tests (1/5)
Add a hidden api for reading characteristic by UUID for PTS.
Bug:
35150313
Test: sl4a GattReadTest.byUuid
Change-Id: Ice4076d99e4694d20374ba0fdcae74d5ae841147
Jaewan Kim [Fri, 3 Feb 2017 07:21:38 +0000 (16:21 +0900)]
Add callback for AVRCP 1.6 support
Bug:
33828042
Test: Build
Change-Id: Iaf5cecfa38065cfeed096929952559d7cb2e248b
nharold [Tue, 18 Apr 2017 18:35:20 +0000 (18:35 +0000)]
Merge changes from topic 'ipsec-hide-overloads'
* changes:
Hide Socket+DatagramSocket IpSecTransform methods
Consistenly Throw IOExceptions from IpSecManager
Erik Kline [Tue, 18 Apr 2017 08:50:09 +0000 (08:50 +0000)]
Merge "Flatten the transitions to tethering and hotspot."
am:
af5f00ee5e
Change-Id: I0dd0a95e29b645d018d4d4f44696c2339f5d1127
Treehugger Robot [Tue, 18 Apr 2017 08:39:40 +0000 (08:39 +0000)]
Merge "Flatten the transitions to tethering and hotspot."
Lorenzo Colitti [Tue, 18 Apr 2017 08:30:13 +0000 (08:30 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier"
am:
a9cbda5bd8
Change-Id: I1cad06f1296a9c94a9184d8424f7fc57c8f41adb
Lorenzo Colitti [Tue, 18 Apr 2017 08:22:51 +0000 (08:22 +0000)]
Merge "[AWARE] Implement custom Wi-Fi Aware network specifier"
Nathan Harold [Tue, 18 Apr 2017 02:34:33 +0000 (19:34 -0700)]
Hide Socket+DatagramSocket IpSecTransform methods
These methods do not currently work for IPv4 sockets,
so they need to be hidden until the underlying kernel
code can be made to work properly in a dual-stack
environment.
Bug:
36073210
Test: compilation
Change-Id: Idce367f638a42da374a7f1dc5ebb8931c9555e06
Nathan Harold [Tue, 18 Apr 2017 00:11:58 +0000 (17:11 -0700)]
Consistenly Throw IOExceptions from IpSecManager
Bug:
36073210
Test: api-update
Change-Id: Ia3825e85b09b6330f1326a26cf9e1cadf9dacf71
Yifan Hong [Mon, 17 Apr 2017 18:27:00 +0000 (18:27 +0000)]
Merge changes from topic 'vintf_check_compat_native'
am:
6d033475b3
Change-Id: I7cc64ab9938d17848379537b57d7092c0968c6a3
Jordan Liu [Mon, 17 Apr 2017 18:14:23 +0000 (18:14 +0000)]
Merge "Update api for ServiceStateProvider"
am:
286b5f117d
Change-Id: I8404dad9be43a0ea41a973d289014a4fe1529ab3
Yifan Hong [Mon, 17 Apr 2017 18:12:27 +0000 (18:12 +0000)]
Merge changes from topic 'vintf_check_compat_native'
* changes:
Update for removing mount arg to VintfObject::CheckCompatibility
Add Java API for libvintf.
Treehugger Robot [Mon, 17 Apr 2017 18:05:02 +0000 (18:05 +0000)]
Merge "Update api for ServiceStateProvider"
Rebecca Silberstein [Mon, 17 Apr 2017 17:20:42 +0000 (17:20 +0000)]
Merge "WifiManager: add new methods to start softap"
am:
be2653d41e
Change-Id: Ic73c0b8f52c86f00a6d03687b37b4c02f41d4fcc
Rebecca Silberstein [Mon, 17 Apr 2017 17:10:37 +0000 (17:10 +0000)]
Merge "WifiManager: add new methods to start softap"
Erik Kline [Thu, 13 Apr 2017 13:54:34 +0000 (22:54 +0900)]
Flatten the transitions to tethering and hotspot.
The previous version could trigger a Log.wtf() if an error occured within
ServingState.enter() that caused a transition while a tranistion was
already in flight.
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
31466854
Change-Id: I66a47caf22e39ab4ad7f4ddd60940e9fe1580729
Yifan Hong [Fri, 14 Apr 2017 22:39:20 +0000 (15:39 -0700)]
Update for removing mount arg to VintfObject::CheckCompatibility
It is default to false.
Test: pass
Bug:
36814503
Change-Id: Ib06850d3355f54996b17cc6c2980a7d17af132e5
Tyler Gunn [Sat, 15 Apr 2017 06:13:21 +0000 (06:13 +0000)]
Merge "Expose phone account register/unregister intents."
am:
24299f5b06
Change-Id: Ifbc60e3221bee3813e2c854305144af901067b13
Treehugger Robot [Sat, 15 Apr 2017 06:07:25 +0000 (06:07 +0000)]
Merge "Expose phone account register/unregister intents."
Tyler Gunn [Fri, 14 Apr 2017 20:43:30 +0000 (13:43 -0700)]
Expose phone account register/unregister intents.
These were previously @SystemApi. Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.
Test: Manual
Bug:
37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
Nathan Harold [Sat, 15 Apr 2017 01:52:24 +0000 (01:52 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"
am:
02278a5a02
Change-Id: I473f438a0336b8c5183f385f062493abb53966fe
Treehugger Robot [Sat, 15 Apr 2017 01:42:58 +0000 (01:42 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"
Jordan Liu [Wed, 1 Mar 2017 02:15:07 +0000 (18:15 -0800)]
Update api for ServiceStateProvider
ServiceStateProvider defines public constants in
Telephony.ServiceStateTable so update the api.
Test: flashed onto device locally
Bug:
33756364
Change-Id: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Merged-In: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Nathan Harold [Fri, 14 Apr 2017 20:13:11 +0000 (13:13 -0700)]
Update doc string for getForbiddenPlmns() to READ_PHONE_STATE
For whatever reason when I chose the permission for this API I
chose the internal READ_PRIVILEGED_PHONE_STATE. Updating this to
use the equivalent public permission (since this is a public API)
requires me to use READ_PHONE_STATE
Bug:
35261110
Test: docstring only change. Compilation
Change-Id: I3647271798b33040751905c13b20da727eacfd9b
Hall Liu [Fri, 14 Apr 2017 18:39:18 +0000 (18:39 +0000)]
Merge "Helper method in VideoCallImpl for testing"
am:
14d27fccad
Change-Id: I5e298b40a83041d759e9e5c59d51be0ec5450d11
Hall Liu [Fri, 14 Apr 2017 18:30:25 +0000 (18:30 +0000)]
Merge "Helper method in VideoCallImpl for testing"
Tsukasa Hashimoto [Fri, 14 Apr 2017 18:09:56 +0000 (18:09 +0000)]
Merge "Add PID info into ANR crash log header"
am:
2fe972c822
Change-Id: Ib7ec151a3a4b1759022a9a663836a73087ea85ec
Treehugger Robot [Fri, 14 Apr 2017 18:03:11 +0000 (18:03 +0000)]
Merge "Add PID info into ANR crash log header"
Hugo Benichi [Fri, 14 Apr 2017 15:22:39 +0000 (15:22 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
am:
1a8f04b1b2
Change-Id: I30d3790822430d250d6005cc165e7fa10f56649e
Treehugger Robot [Fri, 14 Apr 2017 15:10:08 +0000 (15:10 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
Hugo Benichi [Mon, 6 Mar 2017 00:17:06 +0000 (09:17 +0900)]
ConnectivityManager: release all requests mapping to a callback.
This patch changes how callback unregistration works in order to be
consistent with undocumented use cases currently de-facto supported
by the API (although in a buggy way):
- callback recycling: releasing then reregistering a callback again.
- multiple request registrations with the same callback.
The second use case is not desirable but needs to be taken into account
for now for the purpose of correctly releasing NetworkRequests
registered in ConnectivityService.
In order to support request release in both use cases with minimal
amount of complexity for the time being the following changes are done:
- request to callback unmapping is done synchronously at callback
release time.
- all requests associated to a callback are unmapped at callback
release time.
This fixes the following issues:
- a callback stops being triggered as soon as it is released.
Otherwise when recycling the callback immediately, it is possible
the previous request associated with it triggers it, confusing the
app.
- when a callback is registered multiple times, the requests are not
leaked.
- when a callback is registered multiple times and then released, the
N-1 first registrations do not trigger the callback anymore.
In the future it would be desirable to enforce the intended 1:1 mapping
between callbacks and requests at registration time.
Bug:
35921499,
35955593,
20701525
Test: - added new tests in ConnectivityManagerTest to test releasing,
recycling, and a disabled test for no multiple regristration.
- new tests catch regression causing b/
35921499, b/
35955593.
Change-Id: Ia0917ac322fc049f76adb4743bc745989fed6d26
Hugo Benichi [Fri, 14 Apr 2017 06:54:10 +0000 (06:54 +0000)]
Merge "Captive portal: rotate fallback urls"
am:
76b3537dfd
Change-Id: I5583659f2f79cf5d42e7825dfbda875ce359ddb0
Treehugger Robot [Fri, 14 Apr 2017 06:41:07 +0000 (06:41 +0000)]
Merge "Captive portal: rotate fallback urls"
Rebecca Silberstein [Fri, 14 Apr 2017 04:12:34 +0000 (04:12 +0000)]
Merge "Add a default SSID prefix for local only hotspot"
am:
e98a2942a4
Change-Id: I3981dbbaa2eee7e54e8c8fd2d9825a3c0866bdb2
Rebecca Silberstein [Fri, 14 Apr 2017 04:03:48 +0000 (04:03 +0000)]
Merge "Add a default SSID prefix for local only hotspot"
Yifan Hong [Wed, 5 Apr 2017 21:42:05 +0000 (14:42 -0700)]
Add Java API for libvintf.
android.os.VintfObject has two methods:
- report: return device info that can be reported to OTA server
- verify: verify that metadata for a given OTA package is
compatible.
Test: pass
Test: adb shell am instrument -w -e class android.os.VintfObjectTest \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug:
36814503
Change-Id: Iff8fae289eec8ae9cfc327d0d0d36a1cdd5e6800
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.
(not like commit
0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b, this patch
uses a comma to separate fallback urls, which works as expected with
Java's String.split())
Test: built, flashed, tested manually with various portal networks.
Bug:
36532213
Change-Id: I3c010bfee5b99db03a500776fbf47959a29d0578
Hugo Benichi [Thu, 13 Apr 2017 13:40:04 +0000 (13:40 +0000)]
Merge "Revert "Captive portal: rotate fallback urls""
am:
9ea45b6106
Change-Id: Iea6582b4c7f347c24ebccf815256dd7125ab29de
Orion Hodson [Thu, 13 Apr 2017 13:34:27 +0000 (13:34 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()"
am:
891cab55d3
Change-Id: I6406a01c50df40a59e3af5432c1f31309cdb43e5
Hugo Benichi [Thu, 13 Apr 2017 13:25:40 +0000 (13:25 +0000)]
Merge "Revert "Captive portal: rotate fallback urls""
Treehugger Robot [Thu, 13 Apr 2017 13:25:10 +0000 (13:25 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()"
Hugo Benichi [Thu, 13 Apr 2017 12:43:49 +0000 (12:43 +0000)]
Revert "Captive portal: rotate fallback urls"
After discussion in the cl we agreed to use "|" as a separator. However String.split() input arg is a regex and not a literal string, so that "|" will actually split the urls characters per characters.
Will revert and resubmit with a comma.
This reverts commit
0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b.
Change-Id: Ifab25e41bec806fbc1d2c13ffd81d4ad91598c89
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: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
Rebecca Silberstein [Thu, 23 Mar 2017 22:05:39 +0000 (15:05 -0700)]
WifiManager: add new methods to start softap
Add two new methods to start/stop softap in WifiService. These are
internal calls that allow WifiService and ConnectivityService to
coordinate the switch to and from softap mode. These calls will not be
callable by apps and are protected by the NETWORK_STACK permission. The
calls are added in this CL, but are not used at this time.
Bug:
36540346
Test: compiles
Change-Id: Idabdba7f779cbac999ff88d8993b2f4b1f4a1624
Rebecca Silberstein [Sun, 26 Mar 2017 00:19:38 +0000 (17:19 -0700)]
Add a default SSID prefix for local only hotspot
Add a default prefix for local only hotspot that will be used to
generate WifiConfiguration objects. This prefix will have
random digits appended to reduce AP name collisions.
Bug:
36704909
Test: compiles
Change-Id: I2b9478a12de27cabe13ece2973bce7cd4976ba2f
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: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: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: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"
Shuo Qian [Wed, 12 Apr 2017 21:00:50 +0000 (21:00 +0000)]
Merge "ECBM SystemProperty cleanup"
am:
4718606368
Change-Id: Ie6b43fd0a0bfa7c813960d1bb53b7b57a4f82721
Shuo Qian [Wed, 12 Apr 2017 20:52:18 +0000 (20:52 +0000)]
Merge "ECBM SystemProperty cleanup"
Brad Ebinger [Mon, 20 Mar 2017 20:16:28 +0000 (13:16 -0700)]
Helper method in VideoCallImpl for testing
Test: Telecom Unit Tests
Change-Id: Ie619850bd6a0a0bb599dc6d69c43757604723ee0
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
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"
Orion Hodson [Wed, 12 Apr 2017 13:00:18 +0000 (14:00 +0100)]
Unhide MethodHandles.explicitCastArguments()
Bug:
33192564
Test: m -j32
Change-Id: Ic80c9fa8bd81173220f4a1615e35d89b0ed621c2
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
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: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: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 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: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: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)"