summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add support for creating a Surface from a a SurfaceTexture."Ted Bonkenburg2011-07-255-22/+124
|\
| * Add support for creating a Surface from a a SurfaceTexture.Ted Bonkenburg2011-07-225-22/+124
| | | | | | | | | | | | | | | | The Surface is already using SurfaceTexture internally and it is parcelable. This is intended to replace and phase out ParcelSurfaceTexture in favor of creating a new Surface.java object from an existing SurfaceTexture. Change-Id: I8e2dd86614523da6abed6403e1d705a68fa19fdf
* | Merge "Add a System.Secure setting for the Autofill server URL."Ben Murdoch2011-07-252-3/+16
|\ \
| * | Add a System.Secure setting for the Autofill server URL.Ben Murdoch2011-07-212-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Autofill server is now configured as a system setting. Add that setting and a method to be called over JNI from the chrome stack to retrieve it. See also external/chromium change I3a22ae42402f52207eee2d0d9df64700cb7c9f45 Bug: 4515820 Change-Id: I0aa85c5bef834b1120baaabdc2dd2e4e607a63b6
* | | Merge "Fix for Autofill calling WebView.getSettings on background thread."Ben Murdoch2011-07-251-2/+3
|\ \ \
| * | | Fix for Autofill calling WebView.getSettings on background thread.Ben Murdoch2011-07-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autofill was reading the WebView's WebSettings on a background thread. Move it to the UI thread to conform to the WebView API and get rid of a Strict Mode violation. Bug: 5072283 Change-Id: Ib0ac60697f1e629ac1ef1743545b5cf0ac2cf52a
* | | | Merge "Add IS_READ column in call log and voicemail providers."Flavio Lerda2011-07-252-0/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Add IS_READ column in call log and voicemail providers.Flavio Lerda2011-07-252-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially we had exposed NEW in the voicemail provider instead of the IS_READ field. However, NEW is already used in the call log to represent a missed call for which a notification needs to be shown to the user. On the other hand, voicemail need both be shown in a notification and retain their own read/unread state, which is determined by whether the user has opened the details of the voicemail. This change introduces the IS_READ field for voicemails and exposes it also via the call log content provider. The NEW column in the voicemail content provider will be removed in a follow-up. Bug: 5036195 Change-Id: I2f8c04685a82cbf77f4778cf057ff62c7da1256a
* | | | [step4] Change service interfacesatok2011-07-252-2/+3
| | | | | | | | | | | | | | | | Change-Id: Iaf86065a2a7f075c670ebdaa60a33a815dcb8113
* | | | Merge "[Step 2] Add apis for spell checker settings"satok2011-07-245-0/+57
|\ \ \ \
| * | | | [Step 2] Add apis for spell checker settingssatok2011-07-255-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5057977 Change-Id: I4617b7f1487349c5de385e7392dbc39c69fa2ebc
* | | | | Merge "Introduce param/column for group count"Daisuke Miyakawa2011-07-241-0/+26
|\ \ \ \ \
| * | | | | Introduce param/column for group countDaisuke Miyakawa2011-07-241-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5039532 Change-Id: Ibc604770cb61ca9fd92280e58f1cd1bbf30c216a
* | | | | | Merge "Fix interface notification race"Irfan Sheriff2011-07-241-6/+9
|\ \ \ \ \ \
| * | | | | | Fix interface notification raceIrfan Sheriff2011-07-241-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In one use case, I see that if we go straight from wifi client mode to tethering operation, the interface change notifications are reported in an order that causes to enter tethered state without actually tethering through connectivity service. It is because an interface down notification (from wifi going down) comes after we have started soft ap and we think we have tethered after calling startTethering and switch to Tethered state Instead, we should make sure tethering has started before going to Tethered state. Change-Id: Iba7e8fab0feeb5637d40938862a8638871df8b02
* | | | | | | Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out ↵James Dong2011-07-242-10/+24
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | in case time out happens"
| * | | | | | Do not wait forever for output buffers in OMXCodec.cpp and error out in case ↵James Dong2011-07-152-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time out happens o Deal with vendor codec hang bug Change-Id: Ic8449afd43045f09a9e0bd3d1be9a320e59ccabe
* | | | | | | Merge "QueryCodecs() signature change"Jean-Michel Trivi2011-07-243-1/+15
|\ \ \ \ \ \ \
| * | | | | | | QueryCodecs() signature changeJean-Michel Trivi2011-07-223-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore QueryCodecs() signature exactly as used by third-party libs. Add an alternative function to select HW only codecs. Change-Id: Ibb2cb4dd36fc0c6599eb93aa5751c216397e3b6f
* | | | | | | | Merge "Updated: Wi-Fi p2p framework"repo sync2011-07-2429-222/+2938
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Updated: Wi-Fi p2p frameworkrepo sync2011-07-2429-222/+2938
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First stage. Get the bones in right now even though we are not ready on the native side. Once, we have things underneath working - we will further update the framework Change-Id: I4a7dab5cd4267373dc5f8989ae4122f91c384ed5
* | | | | | | | Merge "Do not change the number of bytes while converting 8-bit samples to ↵Gloria Wang2011-07-241-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | 16-bit, because this number will be used later to calculate mCurrentPos. Fix for bug 5063703."
| * | | | | | | Do not change the number of bytes while converting 8-bit samples to 16-bit,Gloria Wang2011-07-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because this number will be used later to calculate mCurrentPos. Fix for bug 5063703. Change-Id: I75a78ef694482aa426d82a6c5f3d2ce570a9c19e
* | | | | | | | am 051660d4: am deb62be2: Merge "Configure RAT dependent retry pattern in ↵Wink Saville2011-07-243-15/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GSM DCT." into honeycomb-LTE * commit '051660d4d6d293f4b561bc6a772c70aa077a578a': Configure RAT dependent retry pattern in GSM DCT.
| * \ \ \ \ \ \ \ am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into ↵Wink Saville2011-07-243-15/+47
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'deb62be2e87b19e9bbbc668f8d9327b12dba4a3b': Configure RAT dependent retry pattern in GSM DCT.
| | * \ \ \ \ \ \ \ Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTEWink Saville2011-07-243-15/+47
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Configure RAT dependent retry pattern in GSM DCT.Kazuhiro Ondo2011-07-233-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case GSM DCT is used with EHRPD, retry pattern should follow the ones for CDMA. Bug: 5058426 Change-Id: Id9badc9ac14fb20ac62c1746061f056fa2f9ed1b
* | | | | | | | | | | am 9820a9d2: am 4281817f: Allow suggestedRetryTime to indicate no retry is ↵Kazuhiro Ondo2011-07-242-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed. * commit '9820a9d299dc46f2a9037866ddf61c4782cf9186': Allow suggestedRetryTime to indicate no retry is needed.
| * | | | | | | | | | am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.Kazuhiro Ondo2011-07-242-1/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4281817f6b624cb51926eb24fa78c68cd9431dce': Allow suggestedRetryTime to indicate no retry is needed.
| | * | | | | | | | | Allow suggestedRetryTime to indicate no retry is needed.Kazuhiro Ondo2011-07-242-1/+7
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If suggestedRetryTime is 0x7fffffff then no retry is needed and the framework should not initiate a retry. Bug: 4949208 Change-Id: I3756ef6a3e93beec4ee95863cbc111b9952e5e06
* | | | | | | | | | Merge "Handle hostapd and tether interface changes"Irfan Sheriff2011-07-234-31/+80
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle hostapd and tether interface changesIrfan Sheriff2011-07-234-31/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The set config will only update hostapd config file right now and we need to restart after that happens. Also, softap interface is changed to be the regular interface Bug: 5069108 Change-Id: Ibe80129b58e5339f06f186870bcd8f37569c6db3
* | | | | | | | | | | Merge "TwoStatePreference does not fire click events."Svetoslav Ganov2011-07-233-25/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | TwoStatePreference does not fire click events.Svetoslav Ganov2011-07-223-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Event were send in onBindView but since we have fixed the bug of unattached views firing accessibility events and there is no guarantee that the view is attached in onBindView no events were sent. Now posting a runnable so on the next run the UI tread will send the event i.e. after the view is bound and attached. bug:5008841 Change-Id: I4ed914f7fb65d6896f0c55e7c46e6508d2b2f11f
* | | | | | | | | | | | Merge "Fix USB tethering"Mike Lockwood2011-07-234-106/+89
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix USB tetheringMike Lockwood2011-07-234-106/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous approach no longer works with the new USB drivers, since the usb0 interface is no longer enabled by default. This introduced a chicken & egg problem - usb0 will not be enabled until the user tries to start tethering, but Settings will not enable the checkbox unless usb0 is enabled. To fix this we add an explicit call to start USB tethering in the connectivity manager. This will enable RNDIS if necessary and then bring up tethering once usb0 is enabled. Change-Id: Iae1f733366aa6b0dafa66d4c97207794173ef54b Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | Merge "Tweak APIs for SpellChecker"satok2011-07-224-42/+58
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Tweak APIs for SpellCheckersatok2011-07-234-42/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Move getSupellcheckerInfo to SpellCheckerSession 2. Change the interface of getSpellCheckerSession 3. Remove a flag in SuggestionsInfo Change-Id: I3debe09e213fc0ab74618eb3504383f2a9447fd9
* | | | | | | | | | | | Merge "Display the current ime and subtype name in the ongoing notification"satok2011-07-221-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Display the current ime and subtype name in the ongoing notificationsatok2011-07-231-3/+11
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4903422 Change-Id: I3eaeb3decb75f687ad2af0d80340b819229c3ebe
* | | | | | | | | | | | Merge "Code cleaning"Fabrice Di Meglio2011-07-221-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Code cleaningFabrice Di Meglio2011-07-221-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this was a bit ugly, isnt it? Change-Id: Ic479c180977d73d333afed7696b2920840d92abf
* | | | | | | | | | | | | Merge "Deprecate two methods in MediaRecorder.java class"James Dong2011-07-223-106/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Deprecate two methods in MediaRecorder.java classJames Dong2011-07-223-106/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98fbe628fe77867b97c04f44458948ede2f49d22
* | | | | | | | | | | | | | Merge "VPN: increase timeout period to 60 seconds for legacy VPN."Chia-chi Yeh2011-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | VPN: increase timeout period to 60 seconds for legacy VPN.Chia-chi Yeh2011-07-221-1/+1
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some VPN needs more time than others in order to create the secure tunnel. For example, L2TP/IPSec PSK on average needs 15 seconds on WiFi. On mobile connection, variation gets larger, and it sometimes needs more than 30 seconds. This change increases timeout period from 30 to 60 seconds. Change-Id: I6006fd254a7bc91c22f63d2f3f20ea79ee9b05e2
* | | | | | | | | | | | | | am 3e930dba: (-s ours) am d1b4c10f: Merge "DO NOT MERGE ↵Svetoslav Ganov2011-07-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE * commit '3e930dba58442776b3c921b3dc1980fdba2caed9': DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
| * | | | | | | | | | | | | am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore ↵Svetoslav Ganov2011-07-221-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the default key binsings." into honeycomb-LTE * commit 'd1b4c10fedc04384f40ba7fc30115a1380ce014f': DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
| | * | | | | | | | | | | | Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default ↵Svetoslav Ganov2011-07-221-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key binsings." into honeycomb-LTE
| | | * | | | | | | | | | | | DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.Svetoslav Ganov2011-07-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHERRY PICK FROM MASTER 1. AccessibilityInjectorTest changes the key bindings and when done restores the defatult ones. The restoreation was not working. bug:4905620 Change-Id: I812bad0b748637ded0ce69ace12517511f62f726