ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
31,699 Commits 2 Branches 0 Tags 54 MiB
aca304bef4
Commit Graph

31699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
aca304bef4 am 76d41f57: am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '76d41f5796c73e499f05375d004b39dc9961820c':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-14 12:09:54 -07:00
Gilles Debunne
351bc62889 am f2f3627f: am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 
* commit 'f2f3627f658931e9e8162cc6d066e4cccd81bd10':
  Paste popup uses a disabled icon when there is nothing to paste.
 2011-03-14 12:06:59 -07:00
Eric Laurent
233f476f2c am 733cb79a: am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 
* commit '733cb79a27fa434a1f5548201c953131285b4e81':
  Partial fix for issue 3515250: video chat and SCO
 2011-03-14 12:06:54 -07:00
James Dong
3dda313a49 am ad707d8f: (-s ours) am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit 'ad707d8f9aaff9cd1a121cb769772c921d870117':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-14 12:05:48 -07:00
Ying Wang
805d0dae84 am 0bdf9f8c: am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread 
* commit '0bdf9f8c48be4b001de2bac65b655063ca0d58ec':
  Dist com.android.nfc_extras.jar.
 2011-03-14 12:05:44 -07:00
Robert Greenwalt
3a0babc10b am 179dd46e: (-s ours) am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 
* commit '179dd46e5de9dd61a9011708d262ca40012e9040':
  DO NOT MERGE Backport of I1f55df8a from master.
 2011-03-14 12:05:41 -07:00
Nick Pelly
50093af2a2 am a64e2ad4: resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
* commit 'a64e2ad4da3612586594a19489a2b5d44f3f23a0':
  Implement new NFC-EE API's as shared library (frameworks/base).
 2011-03-14 12:04:51 -07:00
Mike Lockwood
7cdf08b29f am 2d24213f: am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 
* commit '2d24213fca55fece8ce4a69a53abcd45983b0443':
  MtpDevice: Handle zero length packets in readResponse()
 2011-03-14 12:04:27 -07:00
Gloria Wang
6604730786 Merge "resolved conflicts for merge of c761a80d to master" 2011-03-14 12:02:58 -07:00
Gloria Wang
ab40d8bc0c resolved conflicts for merge of c761a80d to master 
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
 2011-03-14 11:56:39 -07:00
Kenny Root
ea6193c275 am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '206c62ed34dc8a48fd6c907d95456226949f42dd':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-14 11:49:56 -07:00
James Dong
33b8a8afc3 Merge "Fix PV AAC decoder crash due to out-of-boundary array access." 2011-03-14 11:46:55 -07:00
Gilles Debunne
5d8d0339b5 Merge "Removed empty block warnings in TextView" 2011-03-14 11:28:31 -07:00
Gilles Debunne
2fd4c6ba9b Merge "Wrong null check in TextView" 2011-03-14 11:28:20 -07:00
Gilles Debunne
5a45a3e528 am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 
* commit '8503af848657356411a9bb4cf15d798d4f15111b':
  Paste popup uses a disabled icon when there is nothing to paste.
 2011-03-14 11:27:54 -07:00
Gilles Debunne
4e29229f65 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
2652f094f7 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
ee76b4c19d Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 2011-03-14 11:21:50 -07:00
James Dong
7964f5ba8c 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
6e53d8e334 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
928595e7f0 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
096b928fb8 resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
 2011-03-14 10:28:11 -07:00
Mike Lockwood
33dff53e30 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
bd7c76eb79 Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 2011-03-14 09:43:14 -07:00
Gloria Wang
dc87971f72 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
50e4bf4895 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
465cab90fa Merge "Throw errors on failures to set system properties." 2011-03-14 09:27:58 -07:00
Mike Lockwood
693ba2bf0a 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
bec7f096cb 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
817b0a5efd 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
52cf8ff162 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
6f1547b9a4 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
0b72b4ebec Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 2011-03-14 04:02:29 -07:00
Christopher Tate
9cd3490c2a 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
198ee44540 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
39131b6884 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
d8389eff25 Merge "Fix some const-ness and comments" 2011-03-11 18:45:33 -08:00
Christopher Tate
e9459dcb59 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
96b60ba644 Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 2011-03-11 18:22:37 -08:00
Dianne Hackborn
108fa5a9c7 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
884c4106e2 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 2011-03-11 18:01:47 -08:00
James Dong
5ca4f48a3f Merge "If MP3 decoder output frame size were 0, media server would crash." 2011-03-11 17:55:52 -08:00
Mike Lockwood
ec7c7f0411 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
103a217104 Merge "USB: minor cleanup work" into honeycomb-mr1 2011-03-11 17:52:36 -08:00
Mathias Agopian
292db41eb8 Merge "Fix initialization order warning." 2011-03-11 17:03:45 -08:00
Mathias Agopian
1bbafb9610 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
5bf3abefb2 Fix initialization order warning. 
Change-Id: I794dfaaa3a2f2645a89abc6c45de5f76e485f7d0
 2011-03-11 17:01:40 -08:00
Ying Wang
edee8c5f10 Merge "Remove unnecessary ld flags." 2011-03-11 16:52:59 -08:00
Adam Powell
21b46b0fe8 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
938125dac3 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