Brad Fitzpatrick
|
ee13e7f06b
|
Merge "Allocate SQLiteQueryBuilder's WHERE clause StringBuilder lazily."
|
2010-03-15 13:02:44 -07:00 |
|
Andreas Huber
|
61463baf21
|
Merge "Hack to "support" "enhanced" podcasts... slang for malformed .mp4 files."
|
2010-03-15 10:38:16 -07:00 |
|
Andreas Huber
|
e5a1316220
|
Merge "Fix the media metadata retriever (tests). The native constants must match those published at the java layer."
|
2010-03-15 10:38:00 -07:00 |
|
Andreas Huber
|
4b8b0150ea
|
Merge "Tag the "testid3" commandline tool as "debug-only". It doesn't need to be included in release builds."
|
2010-03-15 10:37:34 -07:00 |
|
Derek Sollenberger
|
0303840b15
|
Merge "Allow plugin's surface to handle touch when in full-screen."
|
2010-03-15 10:32:25 -07:00 |
|
Leon Scroggins
|
141adfe0c5
|
Merge "Call close on Cursors in finally blocks."
|
2010-03-15 10:24:02 -07:00 |
|
Dianne Hackborn
|
78d3bb9de2
|
Merge "Fix issue 2512221: Car Dock Notification doesn't go away"
|
2010-03-15 07:26:26 -07:00 |
|
Mike Reed
|
d6e534fb47
|
Merge "misc fixes, including 0xB0B8"
|
2010-03-15 05:03:41 -07:00 |
|
Amith Yamasani
|
0890bc8e98
|
Merge "Use a Go button instead of a magnifying glass in the keyboard for in-app search."
|
2010-03-14 08:00:22 -07:00 |
|
Christopher Tate
|
7f2d3df232
|
Merge "API CHANGE: expose the backup-related ApplicationInfo flag masks"
|
2010-03-12 18:34:53 -08:00 |
|
Jack Palevich
|
7c5fe4c4f6
|
Fix glCopyTexSubImage2D inverted texture bug.
This bug only affects the software OpenGL ES
driver.
|
2010-03-12 17:32:26 -08:00 |
|
Dianne Hackborn
|
ad50679130
|
Merge "resolved conflicts for merge of 2ecce34f to master"
|
2010-03-12 17:07:48 -08:00 |
|
Elliott Hughes
|
e2978821b2
|
Merge "Replace the outdated table with links to the benchmarks."
|
2010-03-12 16:52:58 -08:00 |
|
Wink Saville
|
53e5e0f60f
|
Merge "Fix data error handling."
|
2010-03-12 16:51:21 -08:00 |
|
Dianne Hackborn
|
5a7753f91b
|
resolved conflicts for merge of 2ecce34f to master
Change-Id: Ic4e38199beaf8c16f9d28ac5296e8aaa61788b36
|
2010-03-12 16:46:46 -08:00 |
|
Eric Fischer
|
0657fac79f
|
Merge "Add documentation for LeadingMarginSpan2."
|
2010-03-12 16:43:07 -08:00 |
|
Nicolas Catania
|
1ac3e951de
|
Merge "ListActivity.onDestroy, remove any pending callbacks."
|
2010-03-12 15:55:51 -08:00 |
|
Adam Powell
|
714d424e27
|
Merge "Make sure visible View state is updated before dispatching clicks"
|
2010-03-12 14:58:32 -08:00 |
|
Ken Shirriff
|
8f0abfd81f
|
Merge "Make sure Browser cursors are closed"
|
2010-03-12 14:52:24 -08:00 |
|
Andreas Huber
|
f3a6dfe556
|
Merge "Boost OMX callback dispatcher thread priority to prevent audio playback stuttering under increased system load"
|
2010-03-12 14:40:29 -08:00 |
|
Kenny Root
|
dccdc9ab3c
|
Merge "Give an 9-patch error on too many rows and columns"
|
2010-03-12 14:16:56 -08:00 |
|
Adam Powell
|
95e3f7ac5d
|
Merge "Improvements to ScaleGestureDetector"
|
2010-03-12 14:11:46 -08:00 |
|
Grace Kloba
|
f5a26dc0a6
|
Merge "Expose smart-zoom, or centerFitRect to native."
|
2010-03-12 13:58:03 -08:00 |
|
Yu Shan Emily Lau
|
981344af3b
|
Merge "Fix the bug that it should write the zero diff to the output file when the actual diff is negative."
|
2010-03-12 12:09:52 -08:00 |
|
Yu Shan Emily Lau
|
fa3479608b
|
Merge "Update the new activity name."
|
2010-03-12 11:10:56 -08:00 |
|
Kenny Root
|
907bc86eeb
|
Merge "Add missing licensing headers for test classes"
|
2010-03-12 11:04:13 -08:00 |
|
Dianne Hackborn
|
250ac5424e
|
Merge "Fix: Retrieval of location to caclulate twilight"
|
2010-03-12 10:54:44 -08:00 |
|
Andreas Huber
|
7b409b07e5
|
Merge "HTTPStream and HTTPDataSource now support cancellation of the connection process, AwesomePlayer takes advantage of this in cases where ::reset() or ::suspend() is called while in the preparation phase to bail out early. Also fixes in issue where the audio codec was not properly stopped if no audio player object ever took ownership."
|
2010-03-12 09:39:33 -08:00 |
|
Grace Kloba
|
ffc4b0c4c7
|
Merge "If we can't over scroll horizontally, set vx to 0 in doFling. Otherwise if vx is greater than vy, as we pin x later in onOverscrolled(), the fling doesn't work as expected."
|
2010-03-12 09:38:49 -08:00 |
|
Mike Lockwood
|
63b2833d85
|
Merge "Fix problems with new PowerManager.reboot() implementation."
|
2010-03-12 09:37:44 -08:00 |
|
Wink Saville
|
31b1a60b78
|
Merge "Make sure that pause dialing works even when screen is off."
|
2010-03-12 09:35:43 -08:00 |
|
Steve Block
|
8cda6af223
|
Merge "Puts two regex layout tests back on the DumpRenderTree skipped list"
|
2010-03-12 09:35:37 -08:00 |
|
Grace Kloba
|
fb2277bf52
|
Merge "If the Picture is not ready, just draw the background and return. This should help to avoid the flash in gm."
|
2010-03-12 09:13:01 -08:00 |
|
Wink Saville
|
ef27c57bca
|
Merge "Add Copyright assignement."
|
2010-03-12 09:10:44 -08:00 |
|
Kenny Root
|
a15de9fa02
|
Merge "Add missing license notices to files"
|
2010-03-12 08:55:42 -08:00 |
|
Dan Egnor
|
a49c6b051b
|
Merge "Dump the phone process stack (as well as the system process) on watchdog reset."
|
2010-03-12 08:50:12 -08:00 |
|
Amith Yamasani
|
378db24077
|
Merge "Fix for 2175289 : Can't get keyboard in search dialog after switching to landscape"
|
2010-03-12 06:47:00 -08:00 |
|
Mike Lockwood
|
eb15a2bb7a
|
Merge "Fix LocationManager.getProvider() API breakage."
|
2010-03-12 05:30:35 -08:00 |
|
Dianne Hackborn
|
abdbc53db6
|
Merge "The return of rawbu. For other nefarious purposes."
|
2010-03-11 21:44:48 -08:00 |
|
Kenny Root
|
b001e99f67
|
Merge "Add correct copyright headers to multiple files"
|
2010-03-11 21:23:51 -08:00 |
|
Marc Blank
|
23e1e31e4c
|
Merge "Add ORGANIZER_CAN_RESPOND to Calendars column"
|
2010-03-11 20:32:26 -08:00 |
|
Adam Powell
|
ccefbe4493
|
Merge "Tame some monkeys"
|
2010-03-11 20:16:36 -08:00 |
|
Ray Chen
|
a708d1ebdb
|
Merge "Add GPSProcessingMethod tag to ExifInterface."
|
2010-03-11 19:54:52 -08:00 |
|
Kenny Root
|
bd393b7f39
|
Add correct copyright headers to multiple files
Format for the list of changes shows the origin commit reference followed
by the file name.
33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java
33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java
133776-p9 core/java/android/app/IntentService.java
127013-p9 core/java/android/appwidget/AppWidgetHost.java
27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java
60765-p9 core/java/android/content/SyncResult.java
43920-p9 core/java/android/content/pm/ActivityInfo.java
43920-p9 core/java/android/content/pm/ApplicationInfo.java
43920-p9 core/java/android/content/pm/InstrumentationInfo.java
43920-p9 core/java/android/content/pm/PackageInfo.java
44103-p9 core/java/android/content/pm/PackageItemInfo.java
68960-p9 core/java/android/content/pm/PackageStats.java
43920-p9 core/java/android/content/pm/ResolveInfo.java
43920-p9 core/java/android/content/pm/ServiceInfo.java
60641-p9 core/java/android/content/res/Configuration.java
60734-p9 core/java/android/content/res/TypedArray.java
137672-p9 core/java/android/inputmethodservice/ExtractButton.java
123112-p9 core/java/android/inputmethodservice/ExtractEditText.java
119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java
115078-p9 core/java/android/os/BatteryStats.java
124790-p9 core/java/android/text/style/UpdateAppearance.java
45083-p9 core/java/android/view/RawInputEvent.java
101491-p9 core/java/android/view/inputmethod/EditorInfo.java
114701-p9 core/java/android/view/inputmethod/ExtractedText.java
123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java
119291-p9 core/java/com/android/internal/os/HandlerCaller.java
129279-p9 core/java/com/android/internal/os/PkgUsageStats.java
114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java
114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java
84364-p9 opengl/java/android/opengl/EGLLogWrapper.java
11355-p9 opengl/tools/glgen/src/CFunc.java
11355-p9 opengl/tools/glgen/src/CType.java
11355-p9 opengl/tools/glgen/src/CodeEmitter.java
11355-p9 opengl/tools/glgen/src/GenerateGL.java
11355-p9 opengl/tools/glgen/src/JFunc.java
11355-p9 opengl/tools/glgen/src/JType.java
11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java
11355-p9 opengl/tools/glgen/src/ParameterChecker.java
57236-p9 services/java/com/android/server/status/AnimatedImageView.java
66754-p9 services/java/com/android/server/status/CloseDragHandle.java
57188-p9 services/java/com/android/server/status/DateView.java
46928-p9 services/java/com/android/server/status/ExpandedView.java
70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java
45968-p9 services/java/com/android/server/status/IconData.java
57470-p9 services/java/com/android/server/status/IconMerger.java
82719-p9 services/java/com/android/server/status/LatestItemView.java
45968-p9 services/java/com/android/server/status/NotificationData.java
66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java
57458-p9 services/java/com/android/server/status/NotificationViewList.java
45968-p9 services/java/com/android/server/status/StatusBarException.java
45968-p9 services/java/com/android/server/status/StatusBarIcon.java
46130-p9 services/java/com/android/server/status/StatusBarNotification.java
45968-p9 services/java/com/android/server/status/StatusBarView.java
46199-p9 services/java/com/android/server/status/Ticker.java
62286-p9 services/java/com/android/server/status/TickerView.java
57188-p9 services/java/com/android/server/status/TrackingView.java
86041-p9 telephony/java/android/telephony/PhoneStateListener.java
87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java
136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java
34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java
55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java
127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java
129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java
25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java
46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java
77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java
9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java
53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java
93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java
328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java
eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java
49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java
a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java
3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java
5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java
c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java
9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java
21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java
e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java
192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java
1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java
69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java
c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java
df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java
Copyright header moved to top in following file:
core/tests/coretests/src/android/widget/ListViewTest.java
Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
|
2010-03-11 18:22:10 -08:00 |
|
Romain Guy
|
b04de526b7
|
Merge "Preserve widgets on upgrade. Bug #2464545"
|
2010-03-11 18:14:23 -08:00 |
|
Kenny Root
|
661a6826eb
|
Merge "Add copyright header for new file"
|
2010-03-11 17:45:38 -08:00 |
|
Roy West
|
d6d456b287
|
Merge "Second of three sets of minor edits for SD card storage text."
|
2010-03-11 17:29:32 -08:00 |
|
Robert Greenwalt
|
f8c309d7fc
|
Merge "Stop creating threads for tethering."
|
2010-03-11 17:21:12 -08:00 |
|
Dianne Hackborn
|
1a50ab420b
|
Merge "Need to keep new package's cert when using original-package."
|
2010-03-11 17:12:48 -08:00 |
|
Adam Powell
|
5fe8399d3c
|
Merge "Fix tap detection after a long press"
|
2010-03-11 16:33:58 -08:00 |
|