OSDN Git Service
Nick Pelly [Tue, 4 Jan 2011 06:32:56 +0000 (22:32 -0800)]
Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 04:58:26 +0000 (20:58 -0800)]
Merge "Added getType() to NDEF technology class (API part)." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 04:09:03 +0000 (20:09 -0800)]
Merge "Removed selectAid() from IsoDep." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 02:33:09 +0000 (18:33 -0800)]
Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
John Wang [Mon, 3 Jan 2011 16:44:17 +0000 (08:44 -0800)]
Merge "Clear request list while timeout." into gingerbread
Alon Albert [Tue, 28 Dec 2010 22:44:51 +0000 (14:44 -0800)]
Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
Dianne Hackborn [Thu, 23 Dec 2010 22:19:03 +0000 (14:19 -0800)]
Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
Jeff Brown [Thu, 23 Dec 2010 20:41:59 +0000 (12:41 -0800)]
Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
Dianne Hackborn [Thu, 23 Dec 2010 02:34:40 +0000 (18:34 -0800)]
Merge "Another stab at fixing issue #
3149290 java.lang.RuntimeException:..." into gingerbread
Jeff Brown [Sat, 30 Oct 2010 04:50:21 +0000 (21:50 -0700)]
Fix policy issues when screen is off. (DO NOT MERGE)
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
is not showing (the proximity sensor turned off the screen).
Previously we passed all non-wake keys through in this case which
caused a bug on Crespo where the screen would come back on if a soft key
was held at the time of power off because the resulting key up event
would sneak in just before the keyguard was shown. It would then be
passed through to the dispatcher which would poke user activity and
wake up the screen.
- We propagate the key flags when broadcasting media keys which
ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).
Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.
Changed the lock screen so that it does not poke the wake lock when the
grab handle is released. This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.
Bug:
3144874
Change-Id: Iebb91e10592b4ef2de4b1dd3a2e1e4254aacb697
James Dong [Wed, 22 Dec 2010 20:38:11 +0000 (12:38 -0800)]
Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
Hung-ying Tyan [Wed, 22 Dec 2010 02:34:15 +0000 (18:34 -0800)]
Merge "Check if VoIP API is supported in SipManager." into gingerbread
Robert Greenwalt [Wed, 22 Dec 2010 00:02:13 +0000 (16:02 -0800)]
Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
Dianne Hackborn [Tue, 21 Dec 2010 21:27:15 +0000 (13:27 -0800)]
Merge "Fix issue #
3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread
Simon Wilson [Mon, 20 Dec 2010 22:09:52 +0000 (14:09 -0800)]
Merge "fix [
3127755] Launcher is missing anti-aliasing" into gingerbread
Mike LeBeau [Mon, 20 Dec 2010 19:55:56 +0000 (11:55 -0800)]
Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread
Mathias Agopian [Sat, 18 Dec 2010 11:35:05 +0000 (03:35 -0800)]
disable the bypass mode. DO NOT MERGE.
SF bypass mode triggers a bug in the display controller that
case cause the device to freeze.
Change-Id: If29b4d5132f463d13831b082b904c235f15a19fb
Dianne Hackborn [Fri, 17 Dec 2010 18:37:25 +0000 (10:37 -0800)]
Merge "Fix issue #
3289835: NullPointerException in..." into gingerbread
Hung-ying Tyan [Fri, 17 Dec 2010 02:04:54 +0000 (18:04 -0800)]
Merge "Check port in create peer's SIP profile." into gingerbread
Nick Pelly [Fri, 17 Dec 2010 00:35:51 +0000 (16:35 -0800)]
Merge "Need to check ndef before writing ndef." into gingerbread
Eric Laurent [Thu, 16 Dec 2010 19:18:29 +0000 (11:18 -0800)]
Merge "Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
Scott Main [Thu, 16 Dec 2010 01:47:02 +0000 (17:47 -0800)]
Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread
Dianne Hackborn [Wed, 15 Dec 2010 20:56:53 +0000 (12:56 -0800)]
Merge "Fix issue #
3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread
Dianne Hackborn [Tue, 14 Dec 2010 22:12:37 +0000 (14:12 -0800)]
Merge "Work on issue #
3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread
Dan Morrill [Tue, 14 Dec 2010 19:27:20 +0000 (11:27 -0800)]
Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
Costin Manolache [Tue, 14 Dec 2010 18:07:26 +0000 (10:07 -0800)]
Merge "Fix bug in permission grant system." into gingerbread
Roman Nurik [Tue, 14 Dec 2010 03:12:42 +0000 (19:12 -0800)]
Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
Brad Fitzpatrick [Mon, 13 Dec 2010 23:25:09 +0000 (15:25 -0800)]
Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
Nick Kralevich [Mon, 13 Dec 2010 23:03:28 +0000 (15:03 -0800)]
Merge "Avoid leaking sockets." into gingerbread
Nick Pelly [Sat, 11 Dec 2010 01:18:00 +0000 (17:18 -0800)]
Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
Megha Joshi [Fri, 10 Dec 2010 20:30:35 +0000 (12:30 -0800)]
Merge "Integrating webinar hosting with developer.android.com" into gingerbread
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:18:23 +0000 (10:18 -0800)]
reconcile with open-source gingerbread
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
Mathias Agopian [Thu, 9 Dec 2010 00:17:02 +0000 (16:17 -0800)]
Merge "fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
James Dong [Thu, 9 Dec 2010 00:14:27 +0000 (16:14 -0800)]
Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
Mathias Agopian [Wed, 8 Dec 2010 23:34:02 +0000 (15:34 -0800)]
fix [
3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
eglQueryContext(..., EGL_CONFIG_ID, ...) is dereferencing an uninitialized pointer
due to a typo.
Change-Id: I100addf3150f19cb6dfbce9987fb5239dd240878
Mathias Agopian [Wed, 8 Dec 2010 23:08:33 +0000 (15:08 -0800)]
Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread
Nick Pelly [Wed, 8 Dec 2010 06:55:21 +0000 (22:55 -0800)]
Merge "Implemented getSize() to return max ndef size." into gingerbread
Dianne Hackborn [Wed, 8 Dec 2010 06:04:38 +0000 (22:04 -0800)]
Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
Mathias Agopian [Wed, 8 Dec 2010 05:00:25 +0000 (21:00 -0800)]
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
In some situations, the screen transformation would not be
applied while in bypass mode.
Change-Id: I3d6dd52e4c12b11aae97b54bf8e2322536eee37f
Mathias Agopian [Tue, 7 Dec 2010 22:18:56 +0000 (14:18 -0800)]
Merge changes Ie03796ae,Ide3e980a into gingerbread
* changes:
[
3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[
3171580] Add transform field to native buffers. (DO NOT MERGE)
Mathias Agopian [Tue, 7 Dec 2010 22:18:21 +0000 (14:18 -0800)]
Merge changes I244b5469,I32044e91 into gingerbread
* changes:
[
3253328,
3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
[
3171580] Fix two typos related to fixed-size buffers
Mathias Agopian [Tue, 7 Dec 2010 22:17:47 +0000 (14:17 -0800)]
Merge "[
3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread
Jeff Hamilton [Tue, 7 Dec 2010 21:59:29 +0000 (13:59 -0800)]
Merge "Remove Type X Tags from the top-level API." into gingerbread
Daniel Sandler [Tue, 7 Dec 2010 20:03:36 +0000 (12:03 -0800)]
Merge "More precise status bar battery icons." into gingerbread
Nick Pelly [Tue, 7 Dec 2010 17:29:21 +0000 (09:29 -0800)]
Merge "Corrected MIFARE default key set" into gingerbread
Chung-yih Wang [Tue, 7 Dec 2010 06:07:59 +0000 (22:07 -0800)]
Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
Nick Pelly [Tue, 7 Dec 2010 02:41:36 +0000 (18:41 -0800)]
Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
Mathias Agopian [Tue, 7 Dec 2010 02:20:09 +0000 (18:20 -0800)]
Merge "[
3229973,
3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread
Nick Pelly [Tue, 7 Dec 2010 01:43:46 +0000 (17:43 -0800)]
Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
Nick Pelly [Mon, 6 Dec 2010 02:08:16 +0000 (18:08 -0800)]
Merge gingerbread-nfc into gingerbread
Nick Pelly [Sun, 5 Dec 2010 22:46:29 +0000 (14:46 -0800)]
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
Nick Pelly [Sun, 5 Dec 2010 22:42:45 +0000 (14:42 -0800)]
Merge branch gingerbread-nfc into gingerbread.
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
Irfan Sheriff [Sat, 4 Dec 2010 01:58:17 +0000 (17:58 -0800)]
Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
Mathias Agopian [Tue, 2 Nov 2010 06:32:18 +0000 (23:32 -0700)]
[
3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
This is a poor's man precursor to the h/w composer HAL.
Basically we detect when a window is full screen and in
that case we bypass surfaceflinger's composition step, which
yields to much improved performance.
Change-Id: Ie03796ae81a1c951949b771c9323044b980cb347
Mathias Agopian [Wed, 3 Nov 2010 03:57:14 +0000 (20:57 -0700)]
[
3171580] Add transform field to native buffers. (DO NOT MERGE)
This field indicate how the content of the buffer
needs to be transformed.
Change-Id: Ide3e980a90599e931406135693231276626adbbb
Mathias Agopian [Fri, 3 Dec 2010 05:32:29 +0000 (21:32 -0800)]
[
3171580] Fix two typos related to fixed-size buffers
mFixedSize was never set, this bug was introduced during some "cleanup", in
practice this could cause some issues when a fixed-size buffer was used and
the window was resized.
Layer::drawForSreenShot() had a typo that had no effect.
mFixedSize was used to determine if filtering was needed, which was a bit too
conservative and created a dependency between filtering and "fixed size" states
which should exist.
Now we enable filtering based on the size of the buffer vs. the size of the layer.
Change-Id: I32044e91b0c944c1b137efdceb3f01dfaa78119d
Mathias Agopian [Sat, 4 Dec 2010 01:33:09 +0000 (17:33 -0800)]
[
3171580] don't automatically log GraphicBuffer allocation failures
some of these failures are not fatal and even expected in some cases
so they should not emit a dump in the log in those cases.
Change-Id: Idcfa252e3bfa9d74e27fe4ad8f8623aa01aa9c5e
Mathias Agopian [Wed, 24 Nov 2010 23:59:35 +0000 (15:59 -0800)]
[
3229973,
3247470, ...] set EGLNativeWindowSurface's format in EGL
(there are multiple bugs this should fix)
we now use the EGL_NATIVE_VISUAL_ID of a config to set
the ANativeWindow's format from eglCreateWindowSurface(),
this guarantees that the surface's format will match
whatever EGLConfig the user chose.
this should fix all current and future config/surface format
mismatch and allow users to easily select 32-bits surfaces.
Change-Id: I3835d0eb70c75eeecded3c3509a0a8207554c98b
Hung-ying Tyan [Fri, 3 Dec 2010 01:50:33 +0000 (17:50 -0800)]
Merge "Set AudioGroup mode according to audio settings" into gingerbread
Xia Wang [Thu, 2 Dec 2010 21:40:23 +0000 (13:40 -0800)]
Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
James Dong [Thu, 2 Dec 2010 18:13:36 +0000 (10:13 -0800)]
Merge "Be conservative in estimating the file size limit." into gingerbread
Jeff Hamilton [Thu, 2 Dec 2010 15:41:16 +0000 (09:41 -0600)]
Merge remote branch 'ohd/gingerbread' into merge
Eric Laurent [Wed, 1 Dec 2010 23:59:31 +0000 (15:59 -0800)]
Merge "Fix issue
2641884: Bluetooth volume is dependent on in call volume." into gingerbread
Kenny Root [Wed, 1 Dec 2010 22:18:23 +0000 (14:18 -0800)]
Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
Scott Main [Wed, 1 Dec 2010 20:59:42 +0000 (12:59 -0800)]
am
a45d6937: docs: dashboard update
* commit '
a45d693757c14c2d97a81f1fd8faa3ba38b53021':
docs: dashboard update
Eric Laurent [Wed, 1 Dec 2010 19:26:37 +0000 (11:26 -0800)]
Merge "Fix issue
3142808." into gingerbread
Irfan Sheriff [Wed, 1 Dec 2010 18:17:56 +0000 (10:17 -0800)]
Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread
Irfan Sheriff [Wed, 1 Dec 2010 17:51:27 +0000 (09:51 -0800)]
Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
Brad Fitzpatrick [Wed, 1 Dec 2010 16:46:52 +0000 (08:46 -0800)]
Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread
Hung-ying Tyan [Wed, 1 Dec 2010 06:53:26 +0000 (22:53 -0800)]
Merge "Do not suppress error feedback during a SIP call." into gingerbread
Mathias Agopian [Tue, 30 Nov 2010 23:38:38 +0000 (15:38 -0800)]
Merge "allow rotation-vector to have 4 components" into gingerbread
David Brown [Tue, 30 Nov 2010 23:20:45 +0000 (15:20 -0800)]
Merge "Fix bug
3121292: Contact photo not shown correctly for SIP calls" into gingerbread
Andreas Huber [Tue, 30 Nov 2010 22:30:00 +0000 (14:30 -0800)]
Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
Mathias Agopian [Tue, 30 Nov 2010 22:15:22 +0000 (14:15 -0800)]
Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread
Andreas Huber [Tue, 30 Nov 2010 22:06:26 +0000 (14:06 -0800)]
Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
Mathias Agopian [Tue, 30 Nov 2010 22:03:43 +0000 (14:03 -0800)]
Merge "don't attempt to normalize the rotation vector" into gingerbread
Robert Ly [Tue, 30 Nov 2010 21:51:05 +0000 (13:51 -0800)]
Merge "Doc change: updating ndk download and overview page" into gingerbread
Andreas Huber [Tue, 30 Nov 2010 21:00:14 +0000 (13:00 -0800)]
Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
Eric Laurent [Tue, 30 Nov 2010 19:50:25 +0000 (11:50 -0800)]
Merge "Update java doc for visualizer FFT capture." into gingerbread
Andreas Huber [Tue, 30 Nov 2010 19:42:22 +0000 (11:42 -0800)]
Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
Dirk Dougherty [Tue, 30 Nov 2010 19:27:15 +0000 (11:27 -0800)]
Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
Eric Fischer [Tue, 30 Nov 2010 18:12:46 +0000 (10:12 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Wink Saville [Tue, 30 Nov 2010 16:15:41 +0000 (08:15 -0800)]
Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
Ben Murdoch [Tue, 30 Nov 2010 10:43:29 +0000 (02:43 -0800)]
Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
Hung-ying Tyan [Tue, 30 Nov 2010 08:56:57 +0000 (00:56 -0800)]
Merge "Correct SipService.isOpened() implementation." into gingerbread
Hung-ying Tyan [Tue, 30 Nov 2010 08:54:51 +0000 (00:54 -0800)]
Merge "Notify SipSessions before closing SIP stack." into gingerbread
Hung-ying Tyan [Tue, 30 Nov 2010 08:51:22 +0000 (00:51 -0800)]
Merge "Throw proper exceptions in SipManager" into gingerbread
Chia-chi Yeh [Tue, 30 Nov 2010 06:56:56 +0000 (22:56 -0800)]
Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
Irfan Sheriff [Tue, 30 Nov 2010 06:26:52 +0000 (22:26 -0800)]
Merge "DO NOT MERGE fix runstate race condition" into gingerbread
Chia-chi Yeh [Tue, 30 Nov 2010 06:19:57 +0000 (22:19 -0800)]
Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread
Trevor Johns [Thu, 25 Nov 2010 00:21:16 +0000 (16:21 -0800)]
Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
Xia Wang [Wed, 24 Nov 2010 21:27:53 +0000 (13:27 -0800)]
Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
Scott Main [Wed, 24 Nov 2010 20:39:42 +0000 (12:39 -0800)]
am
3577f51d: docs: clarify <include> layout properties bug:
3227820
* commit '
3577f51d4bc236a11e283855337752a7b6897f8b':
docs: clarify <include> layout properties bug:
3227820
Xia Wang [Mon, 22 Nov 2010 22:44:49 +0000 (14:44 -0800)]
Merge "Add Wifi Tethering stress test" into gingerbread
Dirk Dougherty [Sat, 20 Nov 2010 03:03:03 +0000 (19:03 -0800)]
Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
Wu-cheng Li [Sat, 20 Nov 2010 02:14:43 +0000 (18:14 -0800)]
Merge "Improve camera documentation." into gingerbread
Mathias Agopian [Sat, 20 Nov 2010 01:18:21 +0000 (17:18 -0800)]
Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
Scott Main [Sat, 20 Nov 2010 00:48:50 +0000 (16:48 -0800)]
Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462" into gingerbread
Dirk Dougherty [Fri, 19 Nov 2010 18:47:10 +0000 (10:47 -0800)]
Merge "Doc change: update media formats table." into gingerbread
Justin Ho [Thu, 18 Nov 2010 23:03:39 +0000 (15:03 -0800)]
Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread