summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* AudioSystem: add new audio device definitionsEric Laurent2014-05-194-29/+207
| | | | Change-Id: Ib7675bc33771365b2dbb7694c522469317b11457
* Merge "Improve trust handling on dimsissing keyguard"Adrian Roos2014-05-192-3/+6
|\
| * Improve trust handling on dimsissing keyguardAdrian Roos2014-05-192-3/+6
| | | | | | | | | | | | | | | | | | The check for whether the device is in trusted mode happened at the wrong time previously. Now it is checked when trying to dismiss the keyguard. Bug: 15072996 Change-Id: I81a3793ba1cf25468d3c923b2075f4c987b79e53
* | Merge "Remove methods added in TelephonyManager."Santos Cordon2014-05-195-233/+0
|\ \
| * | Remove methods added in TelephonyManager.Santos Cordon2014-05-165-233/+0
| | | | | | | | | | | | Change-Id: I771502ab76dfc24eb19b9ff58b029bea45d6832c
* | | Merge "Update the docs for NetworkCapabilities"Robert Greenwalt2014-05-192-19/+239
|\ \ \
| * | | Update the docs for NetworkCapabilitiesRobert Greenwalt2014-05-182-19/+239
| | | | | | | | | | | | | | | | | | | | | | | | Preparing for ConnectivityService API update Change-Id: I397e375b9254d4271183cf34c4a689deea1e198e
* | | | am 9672ee12: am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree ↵Narayan Kamath2014-05-191-17/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on an ISA for shared UIDs." * commit '9672ee125d6aee73bf1e5425c4089285714f25bf': Fail if we're unable to agree on an ISA for shared UIDs.
| * \ \ \ am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA ↵Narayan Kamath2014-05-191-17/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for shared UIDs." * commit 'deda5467f44fc4a03c3435f0c6d7bda4ea298b99': Fail if we're unable to agree on an ISA for shared UIDs.
| | * \ \ \ am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."Narayan Kamath2014-05-191-17/+25
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a4fd1baac68dcd73957e0fca0c02089ecf9a268a': Fail if we're unable to agree on an ISA for shared UIDs.
| | | * \ \ \ Merge "Fail if we're unable to agree on an ISA for shared UIDs."Narayan Kamath2014-05-191-17/+25
| | | |\ \ \ \
| | | | * | | | Fail if we're unable to agree on an ISA for shared UIDs.Narayan Kamath2014-05-191-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not worth the complexity of rescanning the APK and extracting a shared library with a different ABI. Also gets rid of an unnecessary command line argument and checks for dex-opt failures while adjusting shared ABIs. bug: 14453227 Change-Id: I6a0695e24cba37e93540c540507088e95b89089b
* | | | | | | | Merge "TTS Connection callbacks are called on main thread."Przemyslaw Szczepaniak2014-05-192-3/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | TTS Connection callbacks are called on main thread.Przemyslaw Szczepaniak2014-05-162-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After experimenting with the new TTS API I found out that receiving ConnectionCallbacks#onEngineStatusChange and #onServiceDisconnected callbacks on non-main thread are problematic. They are very rare and overhead of dealing with them in separate thread is high - in most cases user just wants to process those callbacks in the main thread context. This change should make new API usage easier. + Fixed default values of speech speed in voices from v1->v2 wrapper. Change-Id: I76d3b607b3b931b7eb10aa180775fd3607c43bd9
* | | | | | | | | am 4088970d: am 3011fc1a: Merge "Fallback to NullWebView when Chromium ↵Ben Murdoch2014-05-191-1/+9
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebView not present." into klp-modular-dev * commit '4088970dce354f53911f78084a32cb78af45baaf': Fallback to NullWebView when Chromium WebView not present.
| * | | | | | | | am 3011fc1a: Merge "Fallback to NullWebView when Chromium WebView not ↵Ben Murdoch2014-05-191-1/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | present." into klp-modular-dev * commit '3011fc1aa7dbffd3faab7d41203f63d2c0b50c2c': Fallback to NullWebView when Chromium WebView not present.
| | * \ \ \ \ \ \ \ Merge "Fallback to NullWebView when Chromium WebView not present." into ↵Ben Murdoch2014-05-191-1/+9
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev
| | | * | | | | | | | Fallback to NullWebView when Chromium WebView not present.Ben Murdoch2014-05-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it's not possible to load the Chromium WebView, fallback to loading the NullWebView that will throw UnsupportedOperationException. Bug: 13438487 Change-Id: If44b8b7a569c2f8e0e8bba7e6953288802d1c9e0
* | | | | | | | | | | Merge "Do not pass null to IInputMethod#setSessionEnabled"Yohei Yukawa2014-05-191-8/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do not pass null to IInputMethod#setSessionEnabledYohei Yukawa2014-05-191-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doen't make sense to pass null as IInputMethodSession for IInputMethod#setSessionEnabled. If we do this, it causes NPE. BUG: 14980068 Change-Id: Ide48d098d5e7640890257e31f8872e79b9821eb2
* | | | | | | | | | | | Merge "Publish new Telecomm API for Connection Services"Ihab Awad2014-05-196-0/+990
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Publish new Telecomm API for Connection ServicesIhab Awad2014-05-186-0/+990
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a new API for Connection Services providing phone connections to the Android system. Supersedes CallService API, which will be gradually replaced by this one. Change-Id: Ie4b06c1b0843a777c5b8ee9c5dd12b9d9f990980
* | | | | | | | | | | | Merge "Update RouteInfo docs and make public."Robert Greenwalt2014-05-182-77/+167
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update RouteInfo docs and make public.Robert Greenwalt2014-05-182-77/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a8fe04022ea8291076af166f09112d19114ee16
* | | | | | | | | | | | | Merge "Quick settings touch feedback tweaks."John Spurlock2014-05-187-20/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Quick settings touch feedback tweaks.John Spurlock2014-05-187-20/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I76a28c023fd6f006ba96063680842a4f89ae8c83
* | | | | | | | | | | | | | Merge "Initialize internal CEC logical devices"Jinsuk Kim2014-05-182-6/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Initialize internal CEC logical devicesJinsuk Kim2014-05-152-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocates logical address of internal HDMI-CEC logical device(s) using the resource config_hdmiCecLogicalDeviceType. Change-Id: I1a0d2f7bce36fc643887241f03161dc053d6c25c
* | | | | | | | | | | | | | | Merge "HdmiControlManager with HdmiPlaybackClient API definition"Jinsuk Kim2014-05-189-6/+336
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | HdmiControlManager with HdmiPlaybackClient API definitionJinsuk Kim2014-05-199-6/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a rewrite of HdmiCecManager that exposes API for CEC Playback device control. HdmiCecManager will be removed together with HdmiCecService once the migration is completed. Replaced direct access to CEC commands with the following 2 API: - oneTouchPlay - queryDisplayStatus Each method requires communication with other device on CEC bus, hence might take some time to finish. The result at the end of protocol exchange is reported through a callback provided as a parameter to the method. The callback is based on interface not abstract class since it has only one method 'onComplete'. Change-Id: I41e9d4571f890303282a79a803c86530d0b46974
* | | | | | | | | | | | | | | Merge "VolumeZen: frameworks changes to support Settings."John Spurlock2014-05-184-227/+263
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | VolumeZen: frameworks changes to support Settings.John Spurlock2014-05-184-227/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pull SeekBarVolumizer out into a separately reusable class. - Make register/unregisterOnActivityStopListener avail to system code. - Add new setting for displaying suppressed notifications in zen mode. Change-Id: Ic30aa575ae07650cee62c8c1d83b6bc69395cf0d
* | | | | | | | | | | | | | | | Merge "QuickSettings: Remove vector drawable runtime processing."John Spurlock2014-05-18136-504/+352
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | QuickSettings: Remove vector drawable runtime processing.John Spurlock2014-05-18136-504/+352
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove temporary harness responsible for creating enabled/disabled versions of vectors at runtime. Instead, pre-compute the necessary states as separate files. Normalize all qs icon names, cleanup obsolete pngs, and replace the DND hangtag. Bug:14133785 Change-Id: Ifb58635b832d25ca1de7e9f79cf8ec3503ea8cec
* | | | | | | | | | | | | | | | Merge "Action bar refactoring, round 1"Adam Powell2014-05-188-216/+352
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Action bar refactoring, round 1Adam Powell2014-05-178-216/+352
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple PhoneWindow and ActionBarView to allow for using Toolbar in some circumstances later. Change-Id: I907743e06c3a1203e21cfd84860a1884c66f3527
* | | | | | | | | | | | | | | | Merge "Update comments for LinkAddress"Robert Greenwalt2014-05-182-11/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Update comments for LinkAddressRobert Greenwalt2014-05-182-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for CS api review. Change-Id: Ib933e905846ebd039d96a523946dd8fdb10f3ff1
* | | | | | | | | | | | | | | | | Fix docs build break in passpoint managerVinit Deshpande2014-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I045a361d3a5c3f55c77dd33271892e50f275ab0d
* | | | | | | | | | | | | | | | | Fix SDK build for passpointInfoVinit Deshapnde2014-05-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I072a252fd413247cb1b882a7a136ad0265845b95
* | | | | | | | | | | | | | | | | introducing link layervandwalle2014-05-181-0/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie949d5edf07ef538fff815d9600a02565658ee7e
* | | | | | | | | | | | | | | | | Fix doc build - ScanResult is exposing PassointInfo which is still hiddenVinit Deshapnde2014-05-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hiding the passpoint information for now. Change-Id: Ic3cbb84d251478af687d9d46e2276115c8ebef18
* | | | | | | | | | | | | | | | | Enable more features on WifiScannerVinit Deshapnde2014-05-182-5/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables full scan results and allows overriding wifichange configuration. There are also minor API changes take relavent parameters. Change-Id: I6ebcb49f64bd8bc9e5e0c88c3b56eb634783524e
* | | | | | | | | | | | | | | | | Hotspot 2.0 framework API -- more functionalitiesYuhao Zheng2014-05-185-28/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added resolution parameter for requestOsuIcons() - Added ANQP parser (OSU provider list only) Bug: 5485670 Change-Id: I69f6fd2ce6f80980ad786c2a3833cca8279771b3
* | | | | | | | | | | | | | | | | Hotspot 2.0 framework APIs -- initial implementationYuhao Zheng2014-05-1820-90/+1219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from klp-wireless-dev-mirror SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4 Bug: 5485670 Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5
* | | | | | | | | | | | | | | | | Unhide the WifiScanner APIVinit Deshapnde2014-05-182-26/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also adds java docs where needed. Change-Id: I1b7e56e31d460bc773dab9603fbebacf7c439e60
* | | | | | | | | | | | | | | | | Fixed bypass of ConnectivityInternal permissionNavtej Singh Mann2014-05-182-14/+0
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed public function 'getWifiStateMachineMessenger' of WifiManager to fix bypass of ConnectivityInternal permission by application, which is security concern Bug: 13749822 Change-Id: I3ae73e33b77ee8ae0133ca9dc8cc03c504f09e40
* | | | | | | | | | | | | | | | Merge "Decouple network_sampling frequency from VDBG"Robert Greenwalt2014-05-181-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Decouple network_sampling frequency from VDBGRobert Greenwalt2014-05-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a special debug flag for testing network sampling. Change-Id: Ibe572c3b5648ca25f1e5be2c61e5c5ad2979b2cb
* | | | | | | | | | | | | | | | Merge "Set header views to an initial state."John Spurlock2014-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \