summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Mirror the preview for front-facing cameras. do not mergeWu-cheng Li2010-10-204-22/+58
| | | | | | | | Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V or FLIP_H first. The formula should be changed after overlay is fixed. bug:3059865 Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
* Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" ↵Mathias Agopian2010-10-192-2/+2
|\ | | | | | | into gingerbread
| * fix [2236865] STOPSHIP: bump soft gl and egl minor version numberMathias Agopian2010-10-192-2/+2
| | | | | | | | Change-Id: Ibf46b18d7493348e189f2c93e969a6cac61f68b5
* | DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.Mindy Pereira2010-10-192-0/+8
| | | | | | | | | | | | Fixes b/3111778 overscroll glitch in news & weather Change-Id: Ic255da1f7c4301ea3980acc4fa033c9f17a60dac
* | am a6df4b1b: docs: add note to froyo platform doc that not all locales are ↵Scott Main2010-10-191-4/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | included in the sdk image Merge commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722' into gingerbread * commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722': docs: add note to froyo platform doc that not all locales are included in the sdk image
| * | docs: add note to froyo platform doc that not all locales are included in ↵Scott Main2010-10-191-4/+9
| | | | | | | | | | | | | | | | | | the sdk image Change-Id: Icf11a14e0db6eeff535ca51de7a664a4829a35ec
* | | Periodically scan wifi when wifi is not connected and wifi lock isChung-yih Wang2010-10-191-0/+48
| | | | | | | | | | | | | | | | | | | | | grabbed in SipService. bug: http://b/3077454 Change-Id: I153974325c29e0f927c8eb7fdbc4725aaf10087d
* | | Handle dialing a SIP call to self.Hung-ying Tyan2010-10-193-1/+40
| |/ |/| | | | | | | | | | | | | | | Reply BUSY HERE response so server may redirect the call to the voice mailbox. http://b/issue?id=3103072 http://b/issue?id=3109479 Change-Id: I81f5dd59ad87298dd9dda87084538ee460eabba8
* | Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into ↵Brad Fitzpatrick2010-10-191-2/+4
|\ \ | | | | | | | | | gingerbread
| * | Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollXBrad Fitzpatrick2010-10-191-2/+4
| | | | | | | | | | | | | | | Bug: 3110967 Change-Id: I156070956528c8c7d1eb6db5d2e8bb1fe119178d
* | | Merge "Reduce logging." into gingerbreadJoe Onorato2010-10-1915-67/+76
|\ \ \ | |/ / |/| |
| * | Reduce logging.Joe Onorato2010-10-1915-67/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remember, the system and main logs are - Shared resources - Primarily for recording problems - To be used only for large grained events during normal operation Bug: 3104855 Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
* | | Merge "Fix Vibrator permission CTS test broken earlier." into gingerbreadBrad Fitzpatrick2010-10-192-3/+9
|\ \ \ | |/ / |/| |
| * | Fix Vibrator permission CTS test broken earlier.Brad Fitzpatrick2010-10-192-3/+9
| | | | | | | | | | | | | | | Bug: 3106964 Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
* | | DO NOT MERGE. Turn down backup logging for release.Chris Tate2010-10-191-1/+1
|/ / | | | | | | Change-Id: Ib9f4fd15981fcf52b5d5912995c1891836303427
* | Merge "If we encounter video stream EOS while seeking we may still need to ↵Andreas Huber2010-10-192-18/+37
|\ \ | | | | | | | | | seek audio." into gingerbread
| * | If we encounter video stream EOS while seeking we may still need to seek audio.Andreas Huber2010-10-192-18/+37
| | | | | | | | | | | | | | | Change-Id: Ie260942247b6810ca94e86328a3725d75b12181d related-to-bug: 3108724
* | | Merge "Don't symlink native library paths for old apps" into gingerbreadKenny Root2010-10-191-7/+18
|\ \ \ | |/ / |/| |
| * | Don't symlink native library paths for old appsKenny Root2010-10-181-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps that existed in an ASEC container before we put native libraries in the ASEC container will have their native libraries in the /data/data/<app>/lib directory. Don't try to symlink to the ASEC container's library directory in this case. Bug: 3108230 Change-Id: I32167341cc8ff8c005e50f456ee7c783bfb0bf22
* | | Merge "Fix some camera orientation javadoc errors." into gingerbreadWu-cheng Li2010-10-191-21/+45
|\ \ \
| * | | Fix some camera orientation javadoc errors.Wu-cheng Li2010-10-191-21/+45
| | | | | | | | | | | | | | | | | | | | bug:3105659 Change-Id: I0e54f6dd3aa8aeb2494f2596130a5aeb9e1449ba
* | | | Fix the incorrect environment variable name for the thread pool size.Chung-yih Wang2010-10-191-1/+2
|/ / / | | | | | | | | | | | | bug: http://b/3099715 Change-Id: I531048414f22c8edcd9c4f815c12a0bdd6347640
* | | Added missing implementation for NdefRecord.Sylvain Fonteneau2010-10-183-2/+98
| | | | | | | | | | | | | | | | | | | | | Implemented constructor using a byte array to parse. Added missing exception in method declaration, leading to update api/current.xml Change-Id: I2660484aef1225e90c2f32a572041a2c3aecf288
* | | add api level 9 'since' flag to docsScott Main2010-10-181-1/+2
| | | | | | | | | | | | Change-Id: Ia28ed9b4791cddfa0ee11b86c392dff7caca1dd8
* | | Remove public resource padding.Dianne Hackborn2010-10-183-3252/+3
| | | | | | | | | | | | Change-Id: I8a530a23284a1f2515b1340a1c5e5ed3a0b90780
* | | Merge "StrictMode: fix docs to actually compile and add a utility method." ↵Brad Fitzpatrick2010-10-182-1/+30
|\ \ \ | | | | | | | | | | | | into gingerbread
| * | | StrictMode: fix docs to actually compile and add a utility method.Brad Fitzpatrick2010-10-182-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yes, this is a last minute public API change, but I'm already getting a lot of inquiries about how to use StrictMode on a GB device but targetting Eclair or Froyo. I'd like a simple answer involving reflection, but the current API is too painful to use via reflection. I imagine this will be a common request, and it's much easier for us to write a little blog post about trying it out if there's an easy way to use it with reflection. Change-Id: I1f21aaac7e61e5e90d1e4facc0c787d8daf089b1
* | | | Merge "Don't force ended when full screen video is returned manually." into ↵Shimeng (Simon) Wang2010-10-181-2/+20
|\ \ \ \ | |/ / / |/| | | | | | | gingerbread
| * | | Don't force ended when full screen video is returned manually.Shimeng (Simon) Wang2010-10-181-2/+20
| | | | | | | | | | | | | | | | | | | | issue: 3102273 Change-Id: Id9983a229e103dd255b280638979712873117d10
* | | | Merge "NFC: broadcast intent constants for adapter state change" into ↵Nick Pelly2010-10-181-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | gingerbread
| * | | | NFC: broadcast intent constants for adapter state changeBrad Fitzpatrick2010-10-181-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are @hide for now. Sent by Iec9596a and used in Ief09a5a4 Bug: 3097279 Change-Id: Ie5dc05e33a98366fbe1767d19ac0253651abe862
* | | | | Merge "Cleanspec to fix incremental build failures of the form:" into ↵Nick Pelly2010-10-181-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | gingerbread
| * | | | Cleanspec to fix incremental build failures of the form:Nick Pelly2010-10-181-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/trustdlogic/trustednfc/android/ILlcpConnectionlessSocket.java:74: cannot find symbol symbol : class LlcpPacket location: package com.trustedlogic.trustednfc.android.com.trustedlogic.trustednfc.android.LlcpPacket _result = this.receiveFrom(_arg0); Change-Id: I344c3b882265049cbc11dd5433535376eaadd855 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | 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