summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "GPS: Enable some more logging" into gingerbreadMike Lockwood2010-10-182-2/+5
|\
| * GPS: Enable some more loggingMike Lockwood2010-10-182-2/+5
| | | | | | | | | | Change-Id: I7d13c859002fa96fa8c361c0c709931c6b12eb99 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | Merge "Fix bug where home presses were not poking user activity." into ↵Jeff Brown2010-10-182-45/+29
|\ \ | | | | | | | | | gingerbread
| * | Fix bug where home presses were not poking user activity.Jeff Brown2010-10-182-45/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now poke user activity twice: once upon dequeueing an event for dispatch and then again just before we dispatch it. The second poke is to compensate for the fact that it can take a few seconds to identify the dispatch target (if the application is responding slowly) but we want to keep the display from going to sleep for X amount of time after the app gets a chance to actually receive the event. This mirrors pre-Gingerbread behavior. Removed some unnecessary code that filters user activity pokes when sending events to KeyGuard. We don't need this because KeyGuard already tells the power manager to disable user activity. Bug: 3101397 Change-Id: I8c3a77601fdef8f584e84cfdd11aa79da0ff51db
* | | An attempt to unregister a handler that's no longer registered should not ↵Andreas Huber2010-10-181-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cause an assertion. There are edge cases in which a handler attempts to unregister itself while on another thread a message fails to be delivered to that very handler and causes automatic unregistration. In this case the handler's good cleanup intentions are thwarted by the CHECK. Change-Id: I4e41b5e7b619159ecce4856c15cccca031a28b5b related-to-bug: 3101247 QA-impact: no(!!!) risk
* | | Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" ↵Adam Powell2010-10-181-0/+5
|\ \ \ | | | | | | | | | | | | into gingerbread
| * | | DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebViewAdam Powell2010-10-181-0/+5
| | | | | | | | | | | | | | | | Change-Id: I7f31270c713cdfa3b49f7e9f8d8457c77067516a
* | | | Merge "Enable framework GPS and location manager logging" into gingerbreadMike Lockwood2010-10-182-8/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | Enable framework GPS and location manager loggingMike Lockwood2010-10-182-8/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: Id54fc01e7288e7d90d7b76824b708bcb2ee88333 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | Merge "DO NOT MERGE Add additional options and receiver to BT tests" into ↵Eric Rowe2010-10-183-157/+292
|\ \ \ \ | |_|_|/ |/| | | | | | | gingerbread
| * | | DO NOT MERGE Add additional options and receiver to BT testsEric Rowe2010-10-133-157/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add address and iterations options to bluetooth pair stress test. Refactored BroadcastReceiver into two receivers with one specific to pairing. The pairing receiver checks that we are pairing with the correct device, and also will accept the pairing dialogue/enter a predefined password automatically. Change-Id: I9c5283f8e9747e8b0129b7400a6b1345e78e46eb
* | | | Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbreadJohn Huang2010-10-181-6/+0
|\ \ \ \
| * | | | Uncomment SIP/VOIP feature check in SipManager.Hung-ying Tyan2010-10-181-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/issue?id=2971947 Change-Id: I3afa8eb03c4e347b382213dd388354365f766b2f
* | | | | Merge "Set the thread pool size of NIST sip stack to one." into gingerbreadJohn Huang2010-10-181-0/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Set the thread pool size of NIST sip stack to one.Chung-yih Wang2010-10-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the thread pool size to one to fix the out-of-order packets seen in sip service when the device is waken up from sleep. bug:http://b/3099715 Change-Id: Ia169e3fde77488068c369e3345ecf6a6d8ddf792
* | | | | Merge "Pressing the power button quickly needs to turn the screen on and off ↵Joe Onorato2010-10-181-22/+21
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | correctly." into gingerbread
| * | | | Pressing the power button quickly needs to turn the screen on and off correctly.Joe Onorato2010-10-181-22/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This does the animation with the power manager lock held, which isn't great, but is safe. Bug: 3102208 Change-Id: Ib0af3fab1cf6ba47053c10ae8b701376d63802ff
* | | | Merge "Prevent use of NFC api if device is not featurized for NFC." into ↵Nick Pelly2010-10-181-1/+31
|\ \ \ \ | | | | | | | | | | | | | | | gingerbread
| * | | | Prevent use of NFC api if device is not featurized for NFC.Nick Pelly2010-10-181-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8724cb947223b7b60814d0be51e1122123ebb98a Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | Merge "For thumbnail extraction make sure we instantiate a decoder that ↵Andreas Huber2010-10-183-3/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread
| * | | | | For thumbnail extraction make sure we instantiate a decoder that allows ↵Andreas Huber2010-10-183-3/+51
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder. related-to-bug: 3106534 Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
* | | | | Merge "Link against the static libcrypto in external/openssl." into gingerbreadYing Wang2010-10-181-14/+11
|\ \ \ \ \
| * | | | | Link against the static libcrypto in external/openssl.Ying Wang2010-10-141-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad41ec975f9b9a4aec0b8470678320f5abe03e1f
* | | | | | Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 ↵Andreas Huber2010-10-181-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | instead. This is valid for video content according to the specs." into gingerbread
| * | | | | | If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. ↵Andreas Huber2010-10-181-0/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is valid for video content according to the specs. Change-Id: I686320d9d4cd826f43c0813c6ba1dc4949d1115f
* | | | | | Merge "Removed "Select word" option on password fields." into gingerbreadGilles Debunne2010-10-181-4/+28
|\ \ \ \ \ \
| * | | | | | Removed "Select word" option on password fields.Gilles Debunne2010-10-151-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would return an arbitrary selection around current position. Rely on select all instead. Bug: 3100750 Change-Id: I73d995e6481d7c230cc9f334c72fbfb7e9828007
* | | | | | | Merge "Add the HTML5Audio class, to support the audio tag." into gingerbreadBen Murdoch2010-10-181-0/+224
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add the HTML5Audio class, to support the audio tag.Nicolas Roard2010-10-181-0/+224
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE. Cherry pick to GingerBread. Bug: 3101402 Change-Id: Id7c9418c102d871933c7534fbde18a4bde5f353b
* | | | | | Fix up NFC permissions.Nick Pelly2010-10-186-66/+44
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial (vendor) implementation had 4 perms, replace with 1. Requires no permissions: - Viewing UID, type of discovered tags and cards. - Viewing the NDEF message contents of NDEF formatted tags and cards. Requires android.permission.NFC - Get/Set the local tag "MyTag" - Creating or using a RawTagConnection (transceive()) - Creating or using a NdefTagConnection (write()/read()) Change-Id: I1b585c7d91738bed6261277061a48cf7c939482a Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.Nick Pelly2010-10-179-610/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9bb67de2956b1ecb765ca4ac142ed9455060bec4 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | Implement methods introduced in draft #5 NFC API.Sylvain Fonteneau2010-10-175-22/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is implemented but still do not support muli-protocol tags. Change-Id: I5cea3eec7b5b92e8e1106d4660e2400e4433e943 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-169-18/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3094621: add "wipe sd card" option to factory data reset 3094609: collapse unmount/format into one command Also since we have decided that it is important to consider the Crespo storage as internal storage, DevicePolicyManager gets a new API to be able to wipe it. (No big deal, since all of the work for this is now done in the implementation of the new UI.) Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
* | | | | Set default heap size to 5MB.Romain Guy2010-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac8ae3cbe6b431767776653c9f430983172cfb6f
* | | | | Merge "Fix issue 3098880." into gingerbreadEric Laurent2010-10-151-0/+4
|\ \ \ \ \
| * | | | | Fix issue 3098880.Eric Laurent2010-10-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test value returned by getJNIEnv() in android_media_AudioSystem_error_callback() and exit if NULL. Change-Id: If30e5a05c585f34c66e6ad8cece3f7b46ef4be8e
* | | | | | Merge "range checking for tnf" into gingerbreadNick Kralevich2010-10-151-0/+4
|\ \ \ \ \ \
| * | | | | | range checking for tnfNick Kralevich2010-10-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie94acd598d3b8b349ffa98cef0f64ef8fa9f9612
* | | | | | | Merge "Import revised translations DO NOT MERGE" into gingerbreadKenny Root2010-10-1520-601/+601
|\ \ \ \ \ \ \
| * | | | | | | Import revised translations DO NOT MERGEKenny Root2010-10-1520-601/+601
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifa466bf152e7331f2ea16e925e714690d9034f3a
* | | | | | | | Merge "Fix a native crash in input dispatcher when windows are removed." ↵Jeff Brown2010-10-151-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| * | | | | | | | Fix a native crash in input dispatcher when windows are removed.Jeff Brown2010-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3101826 Change-Id: I040838600a6105c8d9f3235025dc0a7b5b27da2e
* | | | | | | | | Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbreadJeff Brown2010-10-156-7/+27
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add support for secure system overlays. (DO NOT MERGE)Jeff Brown2010-10-156-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new window type for secure system overlays created by the system itself from non-secure system overlays that might be created by applications that have the system alert permission. Secure views ignore the presence of secure system overlays. Bug: 3098519 Change-Id: I8f8398f4fdeb0469e5d71124c21bedf121bd8c07
* | | | | | | | Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" ↵Justin Ho2010-10-152-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | into gingerbread
| * | | | | | | DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)Justin Ho2010-10-152-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f86585618b008b727de2236b75b357c87840ecf
* | | | | | | | Revise some javadocs for NFC; add package descriptionScott Main2010-10-158-68/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60223e2ad24af98b3b16a74960365185096ae614
* | | | | | | | Merge "DO NOT MERGE" into gingerbreadShimeng (Simon) Wang2010-10-151-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | DO NOT MERGEShimeng (Simon) Wang2010-10-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add wrapper method for native JNI call. This is to check whether a given mimeType is supported in Android media framework. issue: 3101402 Change-Id: Ic8b412c045c36113c830296dacb42ed5f7371c9d
* | | | | | | | | Merge "Include the framework copy of the OpenMAX headers instead of ↵Andreas Huber2010-10-1517-20/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | referencing external/opencore." into gingerbread