277828 Commits

Author SHA1 Message Date
Hugo Benichi
b55fb220b3 Simple cleanups to Tethering
- regroup together static final class fields, final instance fields, and
  mutable instance fields.
- uses correct Android naming conventions for instance fields.
- reorder imports correctly.

Test: no functional change.
Change-Id: If3d73bc28972a004c2ba3cc14d869a2a679abfce
2017-03-10 15:32:30 +09:00
Brad Ebinger
59a40691a5 Merge "Disable a phone number log for user build" 2017-03-09 21:39:00 +00:00
Miao Wang
70fac233fa Merge changes from topic 'USAGE_IO_INPUT'
* changes:
  [RenderScript] Update RenderScript JNI with the corresponding AllocationGetSurface driver implementation change.
  [RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow from Java Surface.
2017-03-09 20:38:49 +00:00
Treehugger Robot
4903487fd9 Merge "CaptivePortalLoginActivity correctly gets UserAgent" 2017-03-09 10:03:26 +00:00
Martijn Coenen
4a75e32f1d Merge "Remove interfaceChain from IServiceManager::add()" 2017-03-09 08:33:04 +00:00
Hugo Benichi
ec88fd6708 CaptivePortalLoginActivity correctly gets UserAgent
Change I33cbcdab9809c712d998da6d925bdd4e3093f8ff added to the intent
passed from NetworkMonitor to the CaptivePortalLoginActivity an extra
argument to set the UserAgent header of probes done by the
CaptivePortalLoginActivity.

However that extra String argument is not correctly retrieved from the
Intent and instead a null pointer is returned by getParcelableExtra().
Consequently the UserAgent header field is never set.

This patch fixes this bug and replace getParcelableExtra() with
getStringExtra().

It also adds logging of the request header and response header for every
network probes sent by CaptivePortalLoginActivity.

Bug: 35937367, 32369183
Test: manually tested
Change-Id: If5c463023474ffb0401f3cda5875ccd9fc6f79f9
2017-03-09 17:02:34 +09:00
Hugo Benichi
5aaab1f2c8 ConnectivityManager: unhide methods with Handler argument
Test: no functionality change
Bug: 32130437
Change-Id: I2a57175142683f991a215b584282db143a76ed9d
2017-03-09 15:25:26 +09:00
Brad Ebinger
c6613f7206 Merge "Return generic Binder on onBind" 2017-03-08 19:53:26 +00:00
Jakub Pawlowski
1bb08c25b8 Merge "Bluetooth 5 Advertising API" 2017-03-08 19:05:12 +00:00
Jakub Pawlowski
a9d1a32e5e Bluetooth 5 Advertising API
Test: manual
Bug: 30622771
Change-Id: Id6856e6110872ec50ff1af54ddc75c0104a6459c
(cherry picked from commit 5324a14cf490656269ef862d7f8f6b139a21c0e6)
2017-03-08 19:04:49 +00:00
Jakub Pawlowski
104eeedb42 Merge "Bluetooth 5 PHY selection API" 2017-03-08 19:04:31 +00:00
Jakub Pawlowski
409cee69b2 Bluetooth 5 PHY selection API
Bug: 30622771
Test: manual
Change-Id: I50262a56a70466439f9700549c3c0e7bd49e2e8d
(cherry picked from commit db5a87d50db9d4b3d642603f6c329b83ee5851f6)
2017-03-08 19:04:06 +00:00
Jakub Pawlowski
f1d76a71c8 Merge "Bluetooth 5 periodc scan API (1/2)" 2017-03-08 19:03:47 +00:00
Jakub Pawlowski
ac7fcfa361 Bluetooth 5 periodc scan API (1/2)
Bug: 30622771
Test: manual
Change-Id: I61853bc71f6013e9406d1d151bb51ea4484bb92c
(cherry picked from commit a48e03745becc96181c676dc3d194d0572f11c10)
2017-03-08 19:03:12 +00:00
Jakub Pawlowski
bed6fb3f5a Merge "Bluetooth 5 enhanced scanning API" 2017-03-08 19:02:58 +00:00
Jakub Pawlowski
3aca933861 Bluetooth 5 enhanced scanning API
Bug: 30622771
Test: manual
Change-Id: I2c8065fbcedf48777ce18c7d8fe621e568b3fd75
(cherry picked from commit 9de522c6e48497028d36a1f8ad8f8adf4b7b1ae6)
2017-03-08 19:02:25 +00:00
Jakub Pawlowski
a06a0dfdb7 Merge "Bluetooth 5 feature check API (1/2)" 2017-03-08 19:02:11 +00:00
Jakub Pawlowski
48091bbd78 Bluetooth 5 feature check API (1/2)
Bug: 30622771
Test: manual
Change-Id: I90e2efe989745c07c2f2fb8f4ea5bc3b718382f6
(cherry picked from commit 79d66495c32996a5b532328571bf6ceecca70ca5)
2017-03-08 18:20:03 +00:00
Joachim Sauer
8416a4dfd1 Change Czech Republic to Czechia
This commit only contains changes to comments.

Bug: 34964100
Test: m buildcheck
Change-Id: I174eb8bf8ed7ac36198bd40bda925c6274933315
2017-03-08 17:38:58 +00:00
Joachim Sauer
33bade08de Merge "Renaming Czech Republic to Czechia." 2017-03-08 17:31:27 +00:00
Etan Cohen
3a764c19d1 [AWARE] Update network API: make open/encrypted explicit
Replace the older (implicitly) open network with 3 network
creation APIs:
- Open
- Passphrase-based
- PMK (SystemApi only)

Bug: 26564544
Bug: 35702875
Test: unit tests and integration (sl4a) tests
Change-Id: I29a1d668d245853755cd2dfaaa6c65fbb43989f7
2017-03-08 09:11:21 -08:00
Etan Cohen
769fa0c881 Merge "[AWARE] Add data-path security configuration (Passphrase)" 2017-03-08 14:55:05 +00:00
Paul Duffin
0a11c83016 Merge "Replace usages of littlemock with mockito" 2017-03-08 14:36:18 +00:00
Etan Cohen
62a2f9f6ab [AWARE] Add data-path security configuration (Passphrase)
Add API to optionally provide a passphrase to
configure security on a data-path.

Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: Ie011345348a3918a412957e38610cabe147c35fa
2017-03-07 19:07:14 -08:00
Treehugger Robot
79eb213a98 Merge "Bluetooth: Expose L2CAP API to support OPP 1.2" 2017-03-08 00:28:31 +00:00
Hall Liu
6bb5110f2c Merge "Add further Connection-side APIs for RTT (part 2)" 2017-03-07 21:44:43 +00:00
Calin Juravle
eef66fd0c7 Merge "PackageManager: Clean up code related to foreign dex use" 2017-03-07 21:13:15 +00:00
Calin Juravle
4c06f55f14 PackageManager: Clean up code related to foreign dex use
We simplified the way we track whether or not a dex file is used by
other apps. DexManager in the framework keeps track of the data and we
no longer need file markers on disk.

Test: device boots, foreign dex markers are not created anymore

Bug: 32871170

(cherry picked from commit 74f0a3450cd598f52b2c68c43531b1a27fb4e1ce)

Change-Id: I2a9daca15e5120518852584fa17aa94012af8f1a
Merged-In: I3660e2f3913a73904181449c2d910af0a0477950
2017-03-07 11:39:24 -08:00
Treehugger Robot
d0f092af84 Merge "Framework: Ensure image heap string literals for Patterns" 2017-03-07 16:50:59 +00:00
Etan Cohen
8328f27a87 Merge "[CM] Allow timeout in request network" 2017-03-07 16:40:27 +00:00
Tobias Thierer
aa4877e295 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" 2017-03-07 16:35:17 +00:00
Paul Duffin
9df5d4f715 Replace usages of littlemock with mockito
Littlemock appears to have been created as an alternative to
Mockito that would work on Android. Given that Mockito does
now work on Android and Littlemock has had no activity since
Aug 2012 it seems prudent to switch over to use Mockito instead.

https://code.google.com/archive/p/littlemock/

This is being done as part of the work to upgrade Mockito.

Bug: 32912773
Test: Build and install affected APKs, test using am instrument
Change-Id: Id0e57880ea66c5681b664bbfb534c96410544665
2017-03-07 13:55:52 +00:00
Treehugger Robot
75dfc5bd91 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" 2017-03-07 13:27:11 +00:00
Erik Kline
465c46d555 request{LinkProperties,NetworkCapabilities} no longer needed
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toggling between WiFi and mobile
Bug: 32163131
Change-Id: I57edf5114b6361f320577c7870e40f8b3cdf74ce
2017-03-07 17:18:06 +09:00
Treehugger Robot
ae758b2c7f Merge "Handle null NetworkState updates" 2017-03-07 06:24:17 +00:00
Treehugger Robot
affbb8b6a9 Merge "Always send all available state when calling onAvailable()." 2017-03-07 05:51:41 +00:00
Erik Kline
34baa3da4e Handle null NetworkState updates
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering to WiFi and mobile switching works
Bug: 32163131
Change-Id: I2d4ef7c135ae6eb50cc31236f2fd20080536ea6a
2017-03-07 13:17:53 +09:00
Erik Kline
c75d4fad22 Always send all available state when calling onAvailable().
The state that needs to be transferred includes:
    - NetworkCapabilities
    - LinkProperties
    - whether the network is currently suspended

Additionally:
    - Rename notifyNetworkCallback() to notifyNetworkAvailable()
      in order to clarify its real function.
    - fix previous copy/paste error in unittest

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - USB tethering with mobile and Wi-Fi upstream toggling
Bug: 32163131
Change-Id: Ib4460bcd5d08863a9feac9e8ab41a238897bb3ea
2017-03-07 12:57:26 +09:00
Hemant Gupta
ef3e0dbf00 Bluetooth: Expose L2CAP API to support OPP 1.2
Add changes to expose L2CAP API to create an insecure L2CAP socket
for supporting OPP 1.2.

Test: Connect with Remote OPP Client supporting OPP 1.2 and verify
that connection and transfer happens over L2CAP. Connect with Remote
OPP Client supporting OPP 1.1 and verify that connection and transfer
happens over RFCOMM.

Bug: 33010988
Change-Id: I21ed672afb4ed5d2355ff0a0f9691af220921c1f
2017-03-07 02:30:52 +00:00
Tyler Gunn
9324d6513b Merge "API review cleanups/changes." 2017-03-07 01:55:59 +00:00
Treehugger Robot
7b0d16249c Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" 2017-03-07 01:27:18 +00:00
Treehugger Robot
121006f428 Merge "Start of tethering OffloadController" 2017-03-07 01:00:57 +00:00
Hall Liu
b64ac4c57a Add further Connection-side APIs for RTT (part 2)
Add methods and callbacks to facilitate local and remote RTT initiation
and termination in the middle of a call. Adds @hide Connection-side APIs
to communicate with the ConnectionService, as well as plumbing for
RemoteConnections.

Test: manual, through telecom testapps
Merged-In: Ia80604b7dff8586ff222dbccdbe55e91aab02178
Change-Id: Ia80604b7dff8586ff222dbccdbe55e91aab02178
2017-03-06 16:48:24 -08:00
fionaxu
5b834a8208 polish the notification of the default carrier app
Based on the feedbacks from UX review
- modified notificaiton icon
- modified notification content text
- modified notification app name
- modified notification color

Test: Manual
Bug: 36002256
Change-Id: Icf13ea41fc88fb7b15f2b1c29fd3551fd3351819
2017-03-06 14:25:24 -08:00
Andre Eisenbach
ba0992f4c4 Merge "BluetoothManagerService: continue teardown when BLE apps registered" 2017-03-06 21:25:40 +00:00
Martin Brabham
c2b0622634 BluetoothManagerService: continue teardown when BLE apps registered
When the adapter is toggled off; when there are BLE apps registered, a
request is sent to unregister all of the BLE apps.  Upon unregister each app
will call through to this function via a callback.  When this gets called if
the ble app count is 0, we can disable everything.  I am keeping track of the
flag so that we know explicitly where we are coming from.

Bug: 34707848
Test: Compile
Change-Id: I9a8322a6fa918e7b410770894c257ec9f7d8d1f5
2017-03-06 21:25:33 +00:00
Yang Ni
97c9b57cec Merge "Removed close guards for Element and Type objects" 2017-03-06 21:25:29 +00:00
Ruchi Kandoi
2b527ac293 nfc: First chunked NDEF record of TNF doesn't contain the type field
Test: CTS test passes
Bug: 34943312
Change-Id: I08f37ee76810f642b35ae8bde05ef0e2eff921e0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-03-06 13:10:20 -08:00
Tom Cherry
3a3cd0a27f Merge "Check for spurious wake ups" 2017-03-06 19:25:59 +00:00
Tyler Gunn
159f35c8e4 API review cleanups/changes.
- Change onCreateIncomingConnectionFailed/onCreateOutgoingConnectionFailed
to accept the connection mgr phone account as the first parameter.
- For the video APIs, pass the target SDK of the caller into along so
that the Telecom permission check can have fallback behavior for older API
versions.
- Add guidance for how UX should be shown in onShowIncomingCallUi API.
API guidance follows how the Dialer app shows its notification and full
screen UX.

Test: Manual, CTS.
Bug: 35767711
Bug: 35767096
Change-Id: Ib343f0eda1a4d067a38c553f33f140b4efcf3e48
2017-03-06 11:04:55 -08:00