summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix incorrect Conference time for IMS conference calls.Tyler Gunn2015-04-161-1/+1
| | | | | | | | | Looks like the connectTimeMillis parameter to ParcelableConference got removed when partner CLs were merged in. Adding it back fixes the problem. Bug: 20159830 Change-Id: Ibe067f64f8faea6fd1eb157e5073bc702978c511
* Prevent merging conference calls hosted on peer device.Tyler Gunn2015-04-141-0/+8
|\ | | | | | | | | | | | | automerge: 6b91ebf * commit '6b91ebf58c928987ead635bb1c49a16965d4c835': Prevent merging conference calls hosted on peer device.
| * Prevent merging conference calls hosted on peer device.Tyler Gunn2015-04-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With IMS, the "multiparty" bit on an ImsCall is set to "true" when a call is merged into a conference. This not only occurs on the device hosting the conference call, but also on the devices of the callers merged into the conference. This CL adds a listener to the ImsCallSessionListener which is used to communicate a change in the multiparty state of an ImsCallSession to the ImsCall. This solves a problem where the RIL knows of the change, but since there is no callback, the change is not noticed by Telephony until another call state change occurrs (e.g. holding the call). Bug: 19478784 Change-Id: I4847ab3b63f6a00a91d1324196f181467d1753a4
* | Deprecate connectivity APIs relying on integer network types.Paul Jensen2015-04-143-8/+21
| | | | | | | | | | | | | | | | Recommend ConnectivityManager.getAllNetworks() and various state inspection functions as a way forward. Bug:19608294 Change-Id: Ibd53629995897047fc532ffa56f079dfba10a7c7
* | Merge "Add ConnectivityManager.reportNetworkConnectivity() API" into ↵Paul Jensen2015-04-146-18/+45
|\ \ | | | | | | | | | m-wireless-dev
| * | Add ConnectivityManager.reportNetworkConnectivity() APIPaul Jensen2015-04-136-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new API allows reporting networks that are perceived to provide Internet connectivity and networks that are not. This allows the framework to avoid needlessly reevaluating networks where the apps perception matches the framework's perception. This was not possible with the prior API, reportBadNetwork. Bug: 16214361 Change-Id: Id4409bd7538854bd837231fb50e693c10a62b4f2
* | | Fix onLost/onFound logic in isSettingsAndFilterComboAllowedtturney2015-04-131-2/+2
|/ / | | | | | | | | | | bug: b/20185066 Change-Id: If9e3fecd12ee86aa12fa63688babeff694bee62e
* | OBEX Over L2CAP + SDP search API for BT profilesCasper Bonde2015-04-1123-329/+1809
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated OBEX to support SRM - Added support for OBEX over l2cap and SRM. - Minor bugfixes, and reduce CPU load ALOT - Added support to send responses without body data. - Extend BluetoothSocket to support L2CAP - Added functionality to get the channel number needed to be able to create an SDP record with the channel number. - Added interface to get socket type and max packet sizes. - Added interface to perform SDP search and get the resulting SDP record data. Change-Id: I9d37a00ce73dfffc0e3ce03eab5511ba3a86e5b8
* | Add ConnectivityManager.getActiveNetwork().Paul Jensen2015-04-108-20/+99
| | | | | | | | | | | | | | | | Rework NetID allocation in ConnectivityService so registerNetworkAgent() can return the allocated NetID. Bug: 19416463 Change-Id: I68e395552cf27422c80b4dfae5db5d56a0d68f5d
* | Merge "Non-functional code cleanup of ConnectivityService." into m-wireless-devPaul Jensen2015-04-104-75/+21
|\ \
| * | Non-functional code cleanup of ConnectivityService.Paul Jensen2015-04-084-75/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove ConnectivityService.findConnectionTypeForIface() as this can be done just as easily with supported APIs now. 2. Avoid making copies of Network objects as this precludes reuse of Network internals (e.g. socket factory, connection pool). Change-Id: I52f92e35d769d8350471f485e408169608630082
* | | Merge "Cleanup of Video Call pause functionality." into m-wireless-devTyler Gunn2015-04-092-5/+25
|\ \ \
| * | | Cleanup of Video Call pause functionality.Tyler Gunn2015-04-072-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whether the paused videoState is available is dependent on the carrier's implementation of the VT spec. The original VT implementation assumed that this was stored in a system property accessed via InCall; these CLs move this to a Call/Connection capability which will ultimately support multisim video capable devices. - Added new connection/call capabilities. Bug: 16680364 Bug: 19820114 Change-Id: I3840f92270100811161120dffcfe297bef7c4ea2
* | | | Onfound onlost feature.Prerepa Viswanadham2015-04-076-9/+182
| | | | | | | | | | | | | | | | | | | | Change-Id: I5475cb21183abab8cf04af486ff7692396801b92 Signed-off-by: Prerepa Viswanadham <dham@google.com>
* | | | Merge "API for config app." into m-wireless-devVinit Deshpande2015-04-073-13/+41
|\ \ \ \
| * | | | API for config app.Jan Nordqvist2015-04-073-13/+41
| |/ / / | | | | | | | | | | | | Change-Id: Icda0ac1b081a08f438645ccf3667b5b81cb5e244
* | | | RTT framework interface updatexinhe2015-04-072-109/+255
| |/ / |/| | | | | | | | | | | Bug:19917983 Change-Id: I1c89c4c583923137983243814e35c8981f6db54a
* | | Unhide Network.openConnection(URL, Proxy).Lorenzo Colitti2015-04-073-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Spun off from https://partner-android-review.googlesource.com/#/c/205463/ for ease of review. Bug: 19416463 Change-Id: Ia37a53a350d55b5514b949242368dfe396f6b9a0
* | | Fix typos in ConnectivityManager documentation.Paul Jensen2015-04-071-27/+27
|/ / | | | | | | | | | | | | | | | | Spun off from https://partner-android-review.googlesource.com/#/c/205463/ for ease of review. Bug: 19416463 Change-Id: I2f88ac415177ecd96c9191df5e390830869f52e1
* | Implement 'Available via Passpoint' featureVinit Deshpande2015-04-032-0/+16
| | | | | | | | | | | | | | | | This also fixes the issues related to explicit connection to passpoint AP, and fixes occassional mention of 'connected via Wi-Fi Assistent' Change-Id: Ib4de956f2ea29709d0212fbcb392815644800e78
* | Deprecate EXTRA_PROXY_INFO and unhide ConnectivityManager.getDefaultProxy().Paul Jensen2015-04-034-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | 1. Unhide ConnectivityManager.getDefaultProxy() and update it to take into account process-bound-Networks. 2. Deprecate EXTRA_PROXY_INFO and instead encourage querying via getDefaultProxy(). Bug: 17905627 Bug: 17420465 Bug: 18144582 Change-Id: I45358ee82fe705d048022c8238b2452f52c37b88
* | Merge "IMS-VT: Upgrade/Downgrade change -Add isVideo API to ↵Tyler Gunn2015-04-0324-46/+532
|\ \ | | | | | | | | | VideoProfile.VideoState" into m-wireless-dev
| * | IMS-VT: Upgrade/Downgrade changeRekha Kumar2015-04-0124-46/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Add isVideo API to VideoProfile.VideoState IMS-VT: Fix propagation of device orientation. Orientation received at VT Service is incorrect. Fixed propagation of device orientation to VT service. IMS-VT: Upgrade fix -Add session modify call timed out constant Notify listeners of video quality changed event - Propagate the video quality changed message to the UI. IMS: Add support for video quality - Add Config interface to get/set video quality IMS-VT: Multitasking feature -Support for video multitasking IMS-VT: Modification of data usage aidl Change data usage aidl interface to take parameter type long instead of int Change-Id: I7cda2a689edb86d025dfe8efc8f573918c4bd6bc Propagate the call substate changed message to the UI IMS-VT: Add call modifiable capability PhoneCapababilities call type modifiable constant added IMS-VT: Add a bit mask CALL_SUBSTATE_ALL with all call substate bits set IMS-VT: Enable Video conferencing. Enable Video conferencing. Change-Id: I4240aa6f32c75d6eea8a41da3c87bca651f0901b IMS-VT: Add hide for setVideoProvider API Observed compilation error for SDK generation due to setVideoProvider API. Marking setVideoProvider as hide inorder to resolve the compilation error. IMS-VT: Add persist.radio.ims.audio.output for VT calls -- Add persist.radio.ims.audio.output to set the default speaker for VT calls. -- Add required constants IMS-VT: Add additional error codes for upgrade downgrade -Add support to send additional error codes to UI during upgrade downgrade. Change-Id: Id452d225098fe3bccdcd37d242985c5c761144c1
* | | Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.Paul Jensen2015-04-029-31/+88
|/ / | | | | | | | | | | | | | | | | | | These functions risk hitting an unchecked Exception due to ConnectivityManager not being instantiated yet. Also, change Network.openConnection() to throw a checked Exception rather than an unchecked Exception when ConnectivityManager is not yet instantiated. bug:19416463 Change-Id: Ie1e2b3238aec0343d267c76b64927073f2f05f85
* | Merge "Deal with null characters in string options." into m-wireless-devLorenzo Colitti2015-04-013-6/+135
|\ \
| * | Deal with null characters in string options.Lorenzo Colitti2015-04-013-6/+135
| | | | | | | | | | | | | | | | | | | | | | | | This currently truncates all strings at the first NULL character, except for vendorInfo, which is an opaque string. Bug: 19985674 Change-Id: Ie53b2c55eb8a5204d7b2c7e2d8587743d923647a
* | | Add DhcpStateMachine PollingState.Erik Kline2015-04-011-57/+120
|/ / | | | | | | | | | | | | | | This state leaves dhcpcd running and polls for results, with exponential backoff to once every 32 seconds. Bug: 19422416 Change-Id: I87f481969629ba104491f25ea36de1efc4ad105a
* | Merge "DO NOT MERGE Do not hide any call log entries when they are added." ↵Santos Cordon2015-04-011-8/+0
|\ \ | | | | | | | | | into m-wireless-dev
| * | DO NOT MERGE Do not hide any call log entries when they are added.Santos Cordon2015-03-311-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a call log entry is added, and it's phone account does not match a currently registered one, we set it to hidden. This code was built for the calllog restore case where call log entries would be hidden when added if the original phone account wasn't also present on the new device (where the restore is being performed). We no longer do that so we're removing the code that sets any call log entry to hidden. -- Resubmitting since this change was lost to a merge conflict -- Change-Id: I1ef094d5a35063e8f89cd1ecb1e5a0b59361781c
* | | Merge "Remove scanResultCache from WifiConfiguration" into m-wireless-devVinit Deshpande2015-03-312-184/+3
|\ \ \ | |/ / |/| |
| * | Remove scanResultCache from WifiConfigurationVinit Deshpande2015-03-312-184/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation to use ScanDetail - which is a superset of ScanResult - in wifi stack. There are no external users of scanResultCache; so it can be safely removed. Also fixed a javadoc comment for getPlmn() Change-Id: I7c49532664ffe2e3e5e134bfcd42615d5999d02f
* | | Merge "Don't log errors if the receive thread is stopped." into m-wireless-devVinit Deshpande2015-03-311-2/+4
|\ \ \
| * | | Don't log errors if the receive thread is stopped.Lorenzo Colitti2015-03-311-2/+4
| | | | | | | | | | | | | | | | Change-Id: I75ddc9b68f0a61a9a7a78026ed97a8a7c5109cc3
* | | | Merge "WiFi Calling: Show different operator name string in Data usage ↵Pavel Zhamaitsiak2015-03-305-5/+30
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | dialog." into lmp-mr1-wfc-dev automerge: 5fd843b * commit '5fd843b33383266cfe5f79f7ba4c5134c104cda0': WiFi Calling: Show different operator name string in Data usage dialog.
| * | | Merge "WiFi Calling: Show different operator name string in Data usage ↵Pavel Zhamaitsiak2015-03-275-5/+30
| |\ \ \ | | | | | | | | | | | | | | | dialog." into lmp-mr1-wfc-dev
| | * | | WiFi Calling: Show different operator name string in Data usage dialog.Pavel Zhamaitsiak2015-03-275-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19950657 Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef
* | | | | am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control ↵Bart Sears2015-03-301-1/+13
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | passthrough" into lmp-mr1-dev automerge: e6687a7 * commit 'e6687a756cf4f6def71d920f80bb5898c081c4e1': CEC: Explicitly turn on screen for remote control passthrough
| * | | am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control ↵Bart Sears2015-03-271-1/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passthrough" into lmp-mr1-dev * commit '4a26c391d08dfa6a3c189293f0fc163b817b1b49': CEC: Explicitly turn on screen for remote control passthrough
| | * \ \ Merge "CEC: Explicitly turn on screen for remote control passthrough" into ↵Bart Sears2015-03-271-1/+13
| | |\ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | CEC: Explicitly turn on screen for remote control passthroughJinsuk Kim2015-03-261-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensures that the playback device turns on display output signal upon receiving CEC command <User Control Pressed>. Bug: 19518981 Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5 (cherry picked from commit 9b8507c52ae845c8eed9fd9952bf66538934b8fd)
* | | | | | Add API for BLE_SCAN_ALWAYS_AVAILABLE feature.Wei Wang2015-03-273-0/+44
| |_|_|_|/ |/| | | | | | | | | | | | | | Change-Id: I83e966d4db076db367ded71bfb50c39e57568156
* | | | | am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.Deepanshu Gupta2015-03-2718-5/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: b3fea86 * commit 'b3fea8671843675db3c091bd4c7c2d4fa31f2917': Fix tests for Java 6.
| * | | | am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6.Deepanshu Gupta2015-03-2718-5/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '4e6ae02a29dd432648a81f3803f3ccf712621d43': Fix tests for Java 6.
| | * | | am 17bb697b: am ec8df9af: Fix tests for Java 6.Deepanshu Gupta2015-03-2718-5/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '17bb697b3bce1b23137553829dd62e0e7c16b472': Fix tests for Java 6.
| | | * \ \ am ec8df9af: Fix tests for Java 6.Deepanshu Gupta2015-03-2718-5/+9
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec8df9af2f35eb5be4df01d66b1add4a4e7546c7': Fix tests for Java 6.
| | | | * | | Fix tests for Java 6.Deepanshu Gupta2015-03-2618-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change the guava version used to match the one included in the SDK. The test server uses the same. However, the command line build still uses the guava present at platform/external/guava, which is compiled with Java 7. Thus, running the tests from inside the IDE can be done via Java 6. - Rebuilt the test app classes with Java 6 compatibility. - Change similarity threshold to prevent differences due to some locale settings different java versions. Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
* | | | | | | am dbe0dd16: When scanning unbundled apps, only install the expected APK treeChristopher Tate2015-03-271-2/+25
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d291cd4 * commit 'd291cd4040dcaa26d0f5cff637b11011d55fe25b': When scanning unbundled apps, only install the expected APK tree
| * | | | | | am dbe0dd16: When scanning unbundled apps, only install the expected APK treeChristopher Tate2015-03-271-2/+25
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | | * commit 'dbe0dd160e93feef1335830a36e86ae83b19b793': When scanning unbundled apps, only install the expected APK tree
| | * | | | When scanning unbundled apps, only install the expected APK treeChristopher Tate2015-03-261-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now make sure, when scanning post-factory app installs, that we do not accidentally activate a "leaked" or otherwise superfluous APK tree that the scan algorithm happens to encounter before the one that we expect a priori based on the persisted package-installation state. When we find such an extraneous installation we ignore it in favor of the expected one, similarly to the policy used when collecting system-bundled packages that have been updated. Even if we find an unexpected APK for the package, if the expected one turns out to be absent we fall back to the existing "we thought this app was present and now it isn't" logic. Bug 19602471 Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74
* | | | | | am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTAMichael Runge2015-03-260-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 26eaaee * commit '26eaaeed3dcc0e9010057c7a1cbf177c998c368e': Increase timeout when uncrypting OTA