drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,286 Commits 1 Branch 0 Tags
Commit Graph

47286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
8503af8486 Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 2011-03-14 11:26:36 -07:00
Eric Laurent
733cb79a27 am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 
* commit '3cbfd10bbb869f763880060ebe01dd66da62bbc3':
  Partial fix for issue 3515250: video chat and SCO
 2011-03-14 11:23:56 -07:00
Eric Laurent
3cbfd10bbb Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 2011-03-14 11:21:50 -07:00
Eric Fischer
5ce32d9fde Add "new incognito window" translations. 
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.

Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
 2011-03-14 11:17:02 -07:00
James Dong
ad707d8f9a am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit '7d93b7574f741a9cd8872771faefa3c92bed6576':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-14 10:53:51 -07:00
Ying Wang
0bdf9f8c48 am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread 
* commit 'e5570255636b60ae2eb56d2f7adf270a8cc40843':
  Dist com.android.nfc_extras.jar.
 2011-03-14 10:53:44 -07:00
Robert Greenwalt
179dd46e5d am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 
* commit '2e7415564ad1d77537f9f3d5151ed480fcfc6ef9':
  DO NOT MERGE Backport of I1f55df8a from master.
 2011-03-14 10:53:38 -07:00
Nick Pelly
a64e2ad4da resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
 2011-03-14 10:28:11 -07:00
James Dong
a2e29968ab Fix PV AAC decoder crash due to out-of-boundary array access. 
Two cases were fixed:
o xover had a larger number of bands than the high frequency band, which led to some negative array index under some circumstances
o integrated a PV fix from OpenCore.git where the array index for scratch_mem may be over the array boundary

bug - 3473128

Change-Id: I844cd8797b4e5b0120fafa0c46a8c1facea78a8b
 2011-03-14 10:13:03 -07:00
Mike Lockwood
2d24213fca am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 
* commit '3ec9d06f070db3a8899ad235736abd0ffaf6f578':
  MtpDevice: Handle zero length packets in readResponse()
 2011-03-14 09:44:15 -07:00
Mike Lockwood
3ec9d06f07 Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 2011-03-14 09:43:14 -07:00
Gloria Wang
c761a80df3 am 7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin 
* commit '7ea3c7f5a31dcc40d3b5042e3eb724916b66384e':
  - Some change on the DrmManager in order to support feature request 4082089.     In DrmManager, we currently lock both processDrmInfo() and onInfo() which is     ok for now since processDrmInfo() is async call, and it will return without     waiting for onInfo() call. However, if we send an event in processDrmInfo(),     we will got deadlock here because we need to invoke onInf() which will wait     for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock.
 2011-03-14 09:35:08 -07:00
Gloria Wang
7ea3c7f5a3 Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1 2011-03-14 09:32:58 -07:00
Brad Fitzpatrick
6f3a75e13b Merge "Throw errors on failures to set system properties." 2011-03-14 09:27:58 -07:00
Mike Lockwood
90f5d75cf0 MtpDevice: Handle zero length packets in readResponse() 
Bug: 3509060

Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-14 10:33:22 -04:00
Mike Lockwood
0c5820ad8e am 151c74b3: am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 
* commit '151c74b3c679a1799d01f210a2a3f4a658154320':
  Add a dialog to ask user to start an application for a USB device or accessory
 2011-03-14 07:10:07 -07:00
Mike Lockwood
92405699cb am 0bea34fc: am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 
* commit '0bea34fc3ec5dfd8d0e7483368875b457b7e2262':
  MTP host: Fix problems reading large data packets
 2011-03-14 07:10:03 -07:00
Mike Lockwood
151c74b3c6 am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 
* commit 'e976ff4a2203e5a01c9a1c1a018ba9e5ab7777f7':
  Add a dialog to ask user to start an application for a USB device or accessory
 2011-03-14 06:55:24 -07:00
Mike Lockwood
0bea34fc3e am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 
* commit 'dec0b755fff1bf87aafd397ef0dd864f54c587cf':
  MTP host: Fix problems reading large data packets
 2011-03-14 06:55:21 -07:00
Mike Lockwood
e976ff4a22 Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 2011-03-14 04:02:50 -07:00
Mike Lockwood
dec0b755ff Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 2011-03-14 04:02:29 -07:00
Mike Lockwood
bce6f8f249 Add a dialog to ask user to start an application for a USB device or accessory 
This is used when there is only one application available and the user has
not chosen to start it by default.
If more than one application is available we continue to use UsbResolverActivity

Bug: 4074719

Change-Id: Id61f2ccc6de5b9ac70fb4670006ff1fee2028d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-13 19:18:08 -04:00
Eric Laurent
fa640154f1 Partial fix for issue 3515250: video chat and SCO 
Do not call directly into AudioSystem in setBluetoothScoOn() but
send a message to the AudioService handler instead. As the
procedure to switch audio path to BT SCO can last some time we should
not block the caller which can run in the UI thread.

Change-Id: I6ac4b5a934d69781db3aebe5d0e8137b52a0ada4
 2011-03-12 15:59:51 -08:00
Mike Lockwood
bcc0516bc8 MTP host: Fix problems reading large data packets 
Fixes problem reading large thumbnails via PTP

Bug: 4065217

Change-Id: I643672512829c93ab0827091f39103dbb1918071
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-12 14:03:23 -05:00
Christopher Tate
01d74576cc am c37febe2: am 767d7a03: Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 
* commit 'c37febe285defa623e456678f63fbd27b3317ebb':
  Add a test app: quota exceeded doing a backup
 2011-03-11 23:11:16 -08:00
Dianne Hackborn
df35762758 am ce3bcbad: am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 
* commit 'ce3bcbade5ca3eac5bae2e06fa37d17f00006a15':
  Fix issues #4087362 and #4087356
 2011-03-11 23:10:55 -08:00
Mike Lockwood
e1976e5c61 am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 
* commit '3b473d958c46ea6511b9599f727b47636e5cbc4a':
  USB: minor cleanup work
 2011-03-11 23:10:41 -08:00
Mathias Agopian
718e64b17f Merge "Fix some const-ness and comments" 2011-03-11 18:45:33 -08:00
Christopher Tate
c37febe285 am 767d7a03: Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 
* commit '767d7a03733c867da7cad466a9303208eb51699f':
  Add a test app: quota exceeded doing a backup
 2011-03-11 18:24:49 -08:00
Christopher Tate
767d7a0373 Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 2011-03-11 18:22:37 -08:00
Dianne Hackborn
ce3bcbade5 am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 
* commit '9ff6483843bfa23751b1acf32b169fca9ad97f7f':
  Fix issues #4087362 and #4087356
 2011-03-11 18:04:04 -08:00
Dianne Hackborn
9ff6483843 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 2011-03-11 18:01:47 -08:00
Christopher Tate
38507bb993 Add a test app: quota exceeded doing a backup 
This is a simple test app (a clone of the Backup/Restore sample code)
that deliberately backs up 20 megabytes of data every time it performs
a backup pass.  This is to trigger the quota-exceeded logic both on
the client and on the backend, for testing purposes.

Change-Id: I01f04d0f85c827baadf1990c09643d5eb5f88266
 2011-03-11 17:58:01 -08:00
James Dong
a7727dc887 Merge "If MP3 decoder output frame size were 0, media server would crash." 2011-03-11 17:55:52 -08:00
Mike Lockwood
3b473d958c am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 
* commit '9fffd9a8bb73e9b225878686862d49b27e98c659':
  USB: minor cleanup work
 2011-03-11 17:54:23 -08:00
Mike Lockwood
9fffd9a8bb Merge "USB: minor cleanup work" into honeycomb-mr1 2011-03-11 17:52:36 -08:00
Mathias Agopian
248ce94c57 Merge "Fix initialization order warning." 2011-03-11 17:03:45 -08:00
Mathias Agopian
f0ff906fa4 Fix some const-ness and comments 
mDrawingState doesn't need to be accessed by the
mStateLock, because by definition it's only accessed
from the main thread.

Similarily, the list of layers in the drawing state
cannot change (ie: is const).

Change-Id: I2e5da7f4d8caee7af7802b432cd45cc81c7c08b0
 2011-03-11 17:01:40 -08:00
Mathias Agopian
ccf94df600 Fix initialization order warning. 
Change-Id: I794dfaaa3a2f2645a89abc6c45de5f76e485f7d0
 2011-03-11 17:01:40 -08:00
Gilles Debunne
d40cc3c58a Removed empty block warnings in TextView 
Change-Id: Ieec52faa6fa7160fb3f8fca30cdd25125ccd51ee
 2011-03-11 16:59:32 -08:00
Ying Wang
86ad55028b Merge "Remove unnecessary ld flags." 2011-03-11 16:52:59 -08:00
Gilles Debunne
6a85508e94 Wrong null check in TextView 
Bug 4087576

Change-Id: I907cb08b24b23715f3900bc076de2cc856650981
 2011-03-11 16:51:41 -08:00
Adam Powell
e5c1bdfa98 am f7db87f0: am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 
* commit 'f7db87f0730ce91e3230b798b3a85bb47f655ba8':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances
 2011-03-11 16:44:09 -08:00
Adam Powell
f7db87f073 am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 
* commit '87584f51a865cfe8ef19c2b24e858a63cb3e475c':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances
 2011-03-11 16:41:50 -08:00
Adam Powell
87584f51a8 Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 2011-03-11 16:39:42 -08:00
Glenn Kasten
977d1fbf47 am dd264f21: am 76470914: Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 
* commit 'dd264f21e6e9952b3d2ef53ea8a8a9e918e5ce96':
  Bug 3515073 Add ANativeWindow_fromSurfaceTexture
 2011-03-11 16:36:42 -08:00
Glenn Kasten
dd264f21e6 am 76470914: Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 
* commit '7647091436c45af2d82f12c9ea9ec77fa309b49b':
  Bug 3515073 Add ANativeWindow_fromSurfaceTexture
 2011-03-11 16:34:30 -08:00
Glenn Kasten
7647091436 Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 2011-03-11 16:31:55 -08:00
James Dong
69ad25e0ff If MP3 decoder output frame size were 0, media server would crash. 
This is to log an error message should that happen.

Change-Id: I0f947cd7a8e6639b4f11a928bf90286a34cc652e
 2011-03-11 16:13:15 -08:00
Ying Wang
eab30df281 Remove unnecessary ld flags. 
This fixes the x86 buid, in which bfd linker is unavailabe.

Change-Id: Ibce1b5cbfb0435644b2d75056003578371510929
 2011-03-11 16:06:02 -08:00