Romain Guy
cd0aa764b7
Merge "Reduce number of GL calls when drawing with shaders."
2010-11-11 12:18:03 -08:00
Leon Scroggins
45216994a0
Merge "Ensure that text passed in is non-null."
2010-11-11 11:41:07 -08:00
Brad Fitzpatrick
633e9d6d68
Merge "StrictMode.Span support"
2010-11-11 11:33:18 -08:00
Jaikumar Ganesh
3fc4d4fd63
Merge "Make AUDIO_STATE_CONNECTING in BluetoothHeadset public."
2010-11-11 11:20:14 -08:00
Scott Main
27ecc860b8
am 93896ad8: am dfb12218: docs: revise adding components with info about platform-tools
...
* commit '93896ad8792ba53d1990d61ee6193339f7b5d51d':
docs: revise adding components with info about platform-tools
2010-11-11 11:03:28 -08:00
Scott Main
28ab211dab
am dfb12218: docs: revise adding components with info about platform-tools
...
* commit 'dfb122180c7028764136ac3a4fa07104f601de84':
docs: revise adding components with info about platform-tools
2010-11-11 11:00:44 -08:00
Eric Fischer
92d19f8990
Merge "Import revised translations."
2010-11-11 10:28:30 -08:00
James Dong
5e2d741451
Merge "Fix testWAVSeekToEnd() testcase"
2010-11-11 09:58:44 -08:00
Amith Yamasani
82d6359f3b
am f8d2aff4: am db65907a: Merge "Adding pan behavior on preference dialog."
...
* commit 'f8d2aff41d347e029c9c0b1f51f20c92cd1cce8e':
Adding pan behavior on preference dialog.
2010-11-11 09:10:51 -08:00
Amith Yamasani
b92039e82b
am db65907a: Merge "Adding pan behavior on preference dialog."
...
* commit 'db65907a2148f053e51f941979f0f7694acd5923':
Adding pan behavior on preference dialog.
2010-11-11 09:06:02 -08:00
Steve Block
3c68d32162
Merge "Remove the failing expectation for fast/encoding/char-encoding.html for DRT"
2010-11-11 08:56:02 -08:00
Amith Yamasani
2d79e36cd1
Merge "Adding pan behavior on preference dialog."
2010-11-11 08:50:52 -08:00
Mike Lockwood
cc41fe7f5c
Merge "MTP: Add missing call to closedir() in recursive delete code"
2010-11-11 08:44:19 -08:00
John Wang
8b8b35405f
am 1ed7d65b: am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
...
* commit '1ed7d65b5d781d10de91a199fbd94d6d445d1def':
Fix the audio mode glitch during hangup.
2010-11-10 19:32:42 -08:00
John Wang
6e3ab4c9c4
am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
...
* commit 'fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a':
Fix the audio mode glitch during hangup.
2010-11-10 19:28:31 -08:00
John Wang
b629c885d0
Merge "Fix the audio mode glitch during hangup." into gingerbread
2010-11-10 19:11:20 -08:00
Romain Guy
0a44b63075
Merge "Add new runtime debug flags."
2010-11-10 19:06:17 -08:00
Dianne Hackborn
e6571ff277
am 63f40387: am 34594e75: Merge "Fix issue #3177284 : Account for wake lock power usage on Crespo" into gingerbread
...
* commit '63f40387d931b5cd555b4743a4d8ff4f1ccf9558':
Fix issue #3177284 : Account for wake lock power usage on Crespo
2010-11-10 18:06:55 -08:00
Dianne Hackborn
543ccefc88
am 34594e75: Merge "Fix issue #3177284 : Account for wake lock power usage on Crespo" into gingerbread
...
* commit '34594e75e4a7962840f34c0b57116ecf1497f118':
Fix issue #3177284 : Account for wake lock power usage on Crespo
2010-11-10 18:01:21 -08:00
Dianne Hackborn
bb356a2721
Merge "Fix issue #3177284 : Account for wake lock power usage on Crespo" into gingerbread
2010-11-10 17:58:28 -08:00
Adam Cohen
7684aa7c94
Merge "Adding widget auto-advance capability"
2010-11-10 17:26:10 -08:00
Adam Powell
e781f173de
Merge "Refine AbsListView transcript mode behavior."
2010-11-10 17:21:23 -08:00
Jim Shuma
5501172387
Merge "Fix summary for FragmentTransaction.show()"
2010-11-10 16:11:32 -08:00
Jeff Brown
6a026cea05
am 5314335c: (-s ours) am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
...
* commit '5314335c9e28673923ad034e5f8a5ba765552a08':
Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
2010-11-10 16:09:02 -08:00
Jeff Brown
86ec841f92
am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
...
* commit '00e5dd44f6d014fff8c65b9c718f5641f5eae4bb':
Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
2010-11-10 16:04:13 -08:00
Jeff Brown
82a517475a
Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
2010-11-10 16:00:37 -08:00
Scott Main
5d9a8d6ecb
am d4b5d85e: (-s ours) am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
...
* commit 'd4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2':
docs: remove "new" tags from sample apps
2010-11-10 15:10:13 -08:00
Jamie Gennis
37b126a3b2
Remove a problematic empty update optimization.
...
This change removes an optimization from SurfaceFlinger that skipped
composition when it got window updates that had an empty dirty region.
This optimization caused problems because it would skip the hwcomposer
set call, which could leave the window's previous frame buffer bound to
an overlay plane. When the application subsequently dequeued and tried
to lock its next buffer (which would be the buffer currently bound to
the overlay), the lock call would block until the next hwcomposer set
call (which may never happen).
Change-Id: I563b626a1d52c1f30eb82489eae0ceb4edc79936
Bug: 3138752
2010-11-10 15:09:09 -08:00
Brad Fitzpatrick
7e358cb73c
Merge "Move ApplicationPackageManager out of ContextImpl.java"
2010-11-10 15:07:28 -08:00
Brad Fitzpatrick
fb673c8b81
Merge "Move SharedPreferencesImpl out of ContextImpl.java"
2010-11-10 15:07:15 -08:00
Chris Tate
50fa3a8d73
Merge "Add description and configuration methods to the transport interface"
2010-11-10 15:00:48 -08:00
Scott Main
bbea7710b7
am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
...
* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
docs: remove "new" tags from sample apps
2010-11-10 14:55:48 -08:00
Scott Main
ee6ceed44a
resolved conflicts for merge of 5a726729 to gingerbread
...
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
2010-11-10 14:46:44 -08:00
Gil Dobjanschi
fdeadb99f4
Merge "Close the file input stream if the XML file parsing fails."
2010-11-10 14:43:19 -08:00
Mathias Agopian
6bdad0357d
am d6c7893d: (-s ours) am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
...
* commit 'd6c7893d663aa74840bb491ddbce500bc0752ac5':
DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
2010-11-10 14:20:26 -08:00
James Dong
339c9c3c75
Merge "Fix uninitialized variable"
2010-11-10 14:18:26 -08:00
Mathias Agopian
a8422af09e
am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
...
* commit '17fd21fc0638d8734867b6f189efbabb227f3ae1':
DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
2010-11-10 14:15:57 -08:00
Mathias Agopian
70745094cc
Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
2010-11-10 14:09:17 -08:00
Alex Sakhartchouk
7fc79fe297
Merge "Code cleanup to make formatting consistent across all the renderscript files."
2010-11-10 12:16:50 -08:00
Adam Powell
6ad4459d7d
Merge "Fix bug 3183378 - make theme attribute selectableItemBackground public."
2010-11-10 12:11:47 -08:00
Romain Guy
c2d82ba1a5
Merge "Move all debug flags in a single place."
2010-11-10 12:04:05 -08:00
Brad Fitzpatrick
0c248032cd
am bf44ebae: am 9de93424: Merge "Without SD card the shutdown sequence was delayed"
...
* commit 'bf44ebae04f837596b9942ccb15d3d47bad4acec':
Without SD card the shutdown sequence was delayed
2010-11-10 11:11:40 -08:00
Brad Fitzpatrick
3c978c6f67
am 9de93424: Merge "Without SD card the shutdown sequence was delayed"
...
* commit '9de93424cc05446e3a216f406c55a3937c028416':
Without SD card the shutdown sequence was delayed
2010-11-10 11:07:18 -08:00
Scott Main
a27eba8ff9
am 12a22635: am f4724cdd: Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
...
* commit '12a22635ebfcdf9f5dff7081740da680c9b689ae':
docs: update eclipse guide for eclipse 3.6 also update system requirements
2010-11-10 11:05:39 -08:00
Scott Main
badf9397e3
am f4724cdd: Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
...
* commit 'f4724cdd0b39eddb14a686ecaec05ff44258a7f7':
docs: update eclipse guide for eclipse 3.6 also update system requirements
2010-11-10 10:59:45 -08:00
Brad Fitzpatrick
dfa88ec75b
Merge "Without SD card the shutdown sequence was delayed"
2010-11-10 10:58:50 -08:00
Scott Main
cfc1ecf6da
Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
2010-11-10 10:46:36 -08:00
Eric Fischer
3873d6e2cd
Merge changes I40bfa0f8,I9fe6a999
...
* changes:
Restore deleted string still referenced from AndroidManifest.
Import revised translations.
2010-11-10 10:26:08 -08:00
Robert Greenwalt
e8d83500b6
Merge "Fix data state change callbacks"
2010-11-10 10:12:09 -08:00
Mike Lockwood
09be538033
Merge changes I49b383d3,I70809401
...
* changes:
MTP: Don't dump data packets twice in debug output.
Add support for range and enum forms in MTP ObjectPropDescs
2010-11-10 09:57:34 -08:00