Commit Graph

17267 Commits

Author SHA1 Message Date
Jeff Hamilton
ecfb0ff159 Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread 2010-10-22 10:20:06 -07:00
Nick Pelly
bf38e48333 Merge "Attempt to fix simulator build." into gingerbread 2010-10-22 08:49:51 -07:00
Mike Lockwood
bcd579d785 Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread 2010-10-22 08:02:09 -07:00
Kenny Root
6d9d44aecc Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread 2010-10-22 07:55:44 -07:00
Hung-ying Tyan
21d6871a3c Merge "Clean up pending sessions on incoming call in SipService" into gingerbread 2010-10-21 23:08:59 -07:00
James Dong
33c44f267a Merge "Turn the media time adjustment in file writer back on" into gingerbread 2010-10-21 20:06:59 -07:00
Dianne Hackborn
12f3f83cec Merge "Adjust boundaries for screen sizes." into gingerbread 2010-10-21 19:21:28 -07:00
Dianne Hackborn
83a19d25f1 Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread 2010-10-21 19:20:49 -07:00
Dianne Hackborn
eab490ad03 Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread 2010-10-21 19:09:44 -07:00
Jeff Brown
73d9935e2d Merge "Fix a race condition in wallpaper move throttling." into gingerbread 2010-10-21 18:02:54 -07:00
Dianne Hackborn
9cd4354dda Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 2010-10-21 17:28:19 -07:00
Mathias Agopian
878353fb0b Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread 2010-10-21 16:43:00 -07:00
Mathias Agopian
c0f95207f4 Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 2010-10-21 16:20:07 -07:00
Mathias Agopian
6af358e0a7 fix [3119687] [Maps][4.6.0] Force close in street view
The EGLConfig attributes MUST be sorted, because they're used in a binary search.
A recent change introduced a bug where 2 of the configs had improperly
sorted attributes.

Change-Id: I1ac53e4463d62f27125ca9f82ed946e6c98ddba0
2010-10-21 15:58:25 -07:00
Kenny Root
bc9c82fb79 Use correct size of GAMEPAD_KEYCODES
Compute the actual number of indices in the GAMEPAD_KEYCODES instead of
the pure size in bytes.

Bug: 3121536
Change-Id: I71edbd8bf6eff2c8cc0ea5c6845362b3d1e06466
2010-10-21 15:46:03 -07:00
Kenny Root
06dbe50a1a Initialized check in ZipFileRO::findEntryByName
If a ZipFileRO object is uninitialized, the hash table will not have
been initialized. This condition wasn't checked in findEntryByName.

Bug: 3121109
Change-Id: Ib696e0e7e0cb4dd0fb2e456d6a847e5e8f4fe14e
2010-10-21 15:25:12 -07:00
Chia-chi Yeh
e739a5257d Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread 2010-10-21 12:53:37 -07:00
Nick Kralevich
6427fde659 Merge "allow dumpstate to work for non-root users." into gingerbread 2010-10-21 11:35:49 -07:00
John Huang
84adbf3770 Merge "Fix connect duration for un-established SIP calls." into gingerbread 2010-10-21 10:46:17 -07:00
James Dong
81b5fbfdac Merge "File writer size estimation improvement" into gingerbread 2010-10-20 20:07:57 -07:00
Mathias Agopian
a6da12c071 Merge "Add a test application to dump all the EGLConfig available" into gingerbread 2010-10-20 20:05:28 -07:00
Mathias Agopian
230fda781d Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread 2010-10-20 20:04:52 -07:00
Mathias Agopian
3c85e4ad5a Merge "Use the context_priority extension when present." into gingerbread 2010-10-20 20:04:46 -07:00
Mathias Agopian
6d44a8718a Merge "software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID" into gingerbread 2010-10-20 18:00:43 -07:00
Mathias Agopian
d8e5ceb963 software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
Change-Id: I371bc0abfee6065247bc6f04b0e0451645eb2dbf
2010-10-20 17:21:43 -07:00
Dianne Hackborn
b56d2f1a46 Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 2010-10-20 17:12:27 -07:00
Mathias Agopian
16a3e39cc0 Add a test application to dump all the EGLConfig available
Change-Id: Iddf27f2a9dd51733f6b90081a523ca37bfe310fa
2010-10-20 17:10:47 -07:00
Kenny Root
6962e7ccf2 Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread 2010-10-20 14:10:00 -07:00
Dianne Hackborn
17e20de275 Merge "Fix issue #3113424: Battery stats don't reset on Crespo" into gingerbread 2010-10-20 14:08:26 -07:00
Justin Ho
121c22ed16 Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 2010-10-20 13:35:40 -07:00
Hung-ying Tyan
d33ad71a3c Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 2010-10-20 13:28:02 -07:00
Hung-ying Tyan
a648451945 Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread 2010-10-20 11:49:26 -07:00
Hung-ying Tyan
2a9c6d0913 Merge "Remove ringtone API from SipAudioCall." into gingerbread 2010-10-20 09:47:45 -07:00
Dirk Dougherty
bcb743a1f5 Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 2010-10-20 09:34:24 -07:00
Hung-ying Tyan
89b8c939c4 Merge "Return display name in SipConnection.getCnapName()." into gingerbread 2010-10-19 23:00:16 -07:00
Mathias Agopian
1aedd5613e Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread 2010-10-19 18:23:19 -07:00
Scott Main
5124451755 am a6df4b1b: docs: add note to froyo platform doc that not all locales are 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
2010-10-19 17:29:29 -07:00
Mathias Agopian
141550bc18 fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Change-Id: Ibf46b18d7493348e189f2c93e969a6cac61f68b5
2010-10-19 14:47:08 -07:00
Brad Fitzpatrick
59c4f35280 Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 2010-10-19 12:40:53 -07:00
Joe Onorato
b99cc1dcf3 Merge "Reduce logging." into gingerbread 2010-10-19 12:23:51 -07:00
Brad Fitzpatrick
8e8732bfa9 Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 2010-10-19 12:12:31 -07:00
Joe Onorato
fc1a4df523 Reduce logging.
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
2010-10-19 15:08:05 -04:00
Andreas Huber
7961f288be Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread 2010-10-19 09:59:01 -07:00
Kenny Root
bfa020c524 Merge "Don't symlink native library paths for old apps" into gingerbread 2010-10-19 09:28:28 -07:00
Wu-cheng Li
40d4893769 Merge "Fix some camera orientation javadoc errors." into gingerbread 2010-10-19 07:54:17 -07:00
Brad Fitzpatrick
5522e5f34c Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread 2010-10-18 16:46:03 -07:00
Shimeng (Simon) Wang
95ea513755 Merge "Don't force ended when full screen video is returned manually." into gingerbread 2010-10-18 16:40:25 -07:00
Nick Pelly
77371310a6 Merge "NFC: broadcast intent constants for adapter state change" into gingerbread 2010-10-18 15:18:59 -07:00
Nick Pelly
bbb2083f33 Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread 2010-10-18 15:17:23 -07:00
Mike Lockwood
5232a101ad Merge "GPS: Enable some more logging" into gingerbread 2010-10-18 15:14:46 -07:00