ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
22,510 Commits 2 Branches 0 Tags 54 MiB
2eb1995a5d
Commit Graph

22510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
73f83b4e21 Merge "Fix 3061025: Extend wave lockscreen timeout while grabbed." 2010-10-08 12:52:24 -07:00
Mathias Agopian
d2509c8dee Merge "Fix a null dereference" 2010-10-08 12:44:19 -07:00
Dianne Hackborn
981dd48ebb am 92d29c66: am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread 
Merge commit '92d29c66f5cb69627172d21057e672eaba2eb03f'

* commit '92d29c66f5cb69627172d21057e672eaba2eb03f':
  Fix NPE if there is no accelerometer.
 2010-10-08 12:39:14 -07:00
Dianne Hackborn
7ab6d2c3a2 resolved conflicts for merge of efa4f7f8 to master 
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
 2010-10-08 11:09:38 -07:00
Hung-ying Tyan
f98a688419 am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread 
Merge commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f'

* commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f':
  CallManager/SipPhone: fix reject a ringing call
 2010-10-08 10:25:50 -07:00
Gilles Debunne
ceb931dcf2 Merge "resolved conflicts for merge of ba04dbc6 to master" 2010-10-08 09:20:57 -07:00
Daniel Sandler
028d06215e Merge "Start of input method control on system bar." 2010-10-08 08:14:12 -07:00
Shih-wei Liao
6347c28225 Merge "Move rsDebug from rs_math.rsh to rs_core.rsh: rsDebug is more like core functionalities instead of math functionalities. Also portions of rsDebug implementation has been in rs_core.rsh already. Add #define guard for rs_types.rsh to prevent multiple inclusion." 2010-10-08 02:20:13 -07:00
Gilles Debunne
8c2f721639 resolved conflicts for merge of ba04dbc6 to master 
Change-Id: I175aa21ef01b98b0c3c46aea0b754d14984128b9
 2010-10-07 20:46:03 -07:00
Mathias Agopian
954fdd27ca fix a bug where timeouts would only be handled when a message was delivered 
Change-Id: Id3127b21c1a1a1afab32911a8edbb202360d7c9b
 2010-10-07 19:59:06 -07:00
satok
4cb3f43fae Merge "Show "more" button in the dialog of InputMethodSubtypePicker" 2010-10-07 19:48:43 -07:00
Robert Greenwalt
baa61c7883 Merge "Stop using unauthorized dns" 2010-10-07 18:56:14 -07:00
Brian Carlstrom
6f2b13b1c3 Merge "Move LOG_ALWAYS_FATAL to end of app_process" 2010-10-07 16:32:02 -07:00
Romain Guy
3ca110f2ad Merge "Add 3D transforms support to all gradients." 2010-10-07 16:20:20 -07:00
Mike Lockwood
e013168cdf Merge "MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty" 2010-10-07 16:15:33 -07:00
Jeff Brown
f4f8284fa9 am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread 
Merge commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db' into gingerbread-plus-aosp

* commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db':
  Switch Looper back to using poll() instead of epoll().
 2010-10-07 15:46:57 -07:00
Gloria Wang
a34207b4f2 resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp 
Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76
 2010-10-07 15:27:17 -07:00
Mathias Agopian
58959343db Fix a null dereference 
Change-Id: I3df446b90c1607782778749de7ba0f8c00698c33
 2010-10-07 14:57:04 -07:00
Gloria Wang
74d354972d Merge "Update of DRM framework." 2010-10-07 14:40:17 -07:00
Gil Dobjanschi
a6eea28f45 Merge "Remove MediaVideoItem and AudioTrack playback APIs." 2010-10-07 14:13:21 -07:00
Andreas Huber
c501b30490 am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread 
Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp

* commit '949f7d9066e09768e570686a5695aaba4a1dafd0':
  Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
 2010-10-07 14:02:26 -07:00
Justin Ho
313fb1f3bb am b74941e3: Merge "Fixed popup assets (background)" into gingerbread 
Merge commit 'b74941e32e068ec03f90b9a53670328cd17ff4b4' into gingerbread-plus-aosp

* commit 'b74941e32e068ec03f90b9a53670328cd17ff4b4':
  Fixed popup assets (background)
 2010-10-07 14:02:22 -07:00
Adam Powell
3b800886fa am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread 
Merge commit 'f15dfbec5df911f4cedd3e302864496d77ce295b' into gingerbread-plus-aosp

* commit 'f15dfbec5df911f4cedd3e302864496d77ce295b':
  Fix bug 3071869 - text anchors are now treated as application sub-panels.
 2010-10-07 14:02:15 -07:00
Brad Fitzpatrick
bb23e1dbee am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread 
Merge commit '6275dbbea8ad7bde984a362516654004e111dc67' into gingerbread-plus-aosp

* commit '6275dbbea8ad7bde984a362516654004e111dc67':
  Quiet unnecessary debug logging.
 2010-10-07 14:02:10 -07:00
Andreas Huber
9da1364f32 am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread 
Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp

* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
 2010-10-07 14:02:01 -07:00
Kenny Root
d5f3d15f2d am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread 
Merge commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9' into gingerbread-plus-aosp

* commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9':
  Eliminate MCS_GIVE_UP state
 2010-10-07 14:01:55 -07:00
Gilles Debunne
9b6f405eae am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread 
Merge commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4' into gingerbread-plus-aosp

* commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4':
  Removed unused and broken screen_progress
 2010-10-07 14:01:48 -07:00
Brad Fitzpatrick
268ca487ac am 30f5c8fe: More DropBoxManager javadoc love. 
Merge commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc' into gingerbread-plus-aosp

* commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc':
  More DropBoxManager javadoc love.
 2010-10-07 14:01:40 -07:00
Brad Fitzpatrick
1c40b657a4 am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread 
Merge commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2' into gingerbread-plus-aosp

* commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2':
  DropBox.Entry javadoc syntax fix
 2010-10-07 14:01:30 -07:00
Kenny Root
f08308802b am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID" 
Merge commit '0145e36cad1472acafb492b3f009ca6eba9593ea' into gingerbread-plus-aosp

* commit '0145e36cad1472acafb492b3f009ca6eba9593ea':
  Revert "Only allow 8 OBBs to be mounted by a UID"
 2010-10-07 14:01:23 -07:00
John Wang
b141dacaa9 am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread 
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp

* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
  Add flag to skip restoring network seletion.
 2010-10-07 14:00:53 -07:00
Andreas Huber
0a49dee588 Merge "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback." 2010-10-07 13:57:08 -07:00
Jeff Brown
95cefd9bdc Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread 2010-10-07 13:29:56 -07:00
Jeff Brown
54e1cdacd2 Switch Looper back to using poll() instead of epoll(). 
Added a couple of micro-optimizations to avoid calling wake() unnecessarily
and reduce JNI overhead slightly.

Fixed a minor issue where we were not clearing the "next" field of Messages
returned by the MessageQueue so the Message would hold on to its successor
and potentially prevent the GC from collecting it if the message were leaked
somehow.

Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
 2010-10-07 13:26:39 -07:00
Chet Haase
41947f2a32 Merge "New TimeInterpolator interface for android.animation package." 2010-10-07 13:18:36 -07:00
Eric Laurent
22239a10c5 am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread 
Merge commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3'

* commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3':
  Fixed AudioFlinger not always pausing tracks
 2010-10-07 12:23:39 -07:00
Adam Powell
08eff4fce2 am ee7e0efc: (-s ours) am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread 
Merge commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916'

* commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916':
  DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
 2010-10-07 12:23:20 -07:00
Adam Powell
33b14f5880 am 65e8b476: am 5a5fff71: Fix bug 3064143 - remove default bold on buttons 
Merge commit '65e8b476245255a96faaa70872a4196763a95e10'

* commit '65e8b476245255a96faaa70872a4196763a95e10':
  Fix bug 3064143 - remove default bold on buttons
 2010-10-07 12:22:47 -07:00
Dianne Hackborn
3b4c2bc6ab am e112b744: am 930d6c3c: Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread 
Merge commit 'e112b744c08cd7dcffe142f3cd22c96870bad482'

* commit 'e112b744c08cd7dcffe142f3cd22c96870bad482':
  Fix issue #3056500: Problem report for ASTRO
 2010-10-07 12:22:14 -07:00
Joe Onorato
4c7d73e564 am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread 
Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba'

* commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba':
  PowerManagerService needs yet another flag...
 2010-10-07 12:22:03 -07:00
Andreas Huber
a417c7d64c am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread 
Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120'

* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
  Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
 2010-10-07 12:21:33 -07:00
Kenny Root
dea4a5468c am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread 
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'

* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
  Remove lingering system app native libs in /data
 2010-10-07 12:21:22 -07:00
Jeff Brown
6d462b1221 am 56364bcd: am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread 
Merge commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7'

* commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7':
  Make secure views tolerate IME overlays.
 2010-10-07 12:20:45 -07:00
Kenny Root
cafe0c0d52 am f2cc2e52: am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread 
Merge commit 'f2cc2e522177683145b2daa0de0ed898b865824d'

* commit 'f2cc2e522177683145b2daa0de0ed898b865824d':
  Get correct native library path on reinstall
 2010-10-07 12:20:25 -07:00
Dianne Hackborn
f16103c418 am 5d722580: (-s ours) am e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread 
Merge commit '5d722580afbca277ebc760d5b2c0400f4bca1a8d'

* commit '5d722580afbca277ebc760d5b2c0400f4bca1a8d':
  DO NOT MERGE: Get rid of status bar's dim during night.
 2010-10-07 12:20:09 -07:00
Andreas Huber
d62a1d5c82 Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread 2010-10-07 11:59:53 -07:00
Justin Ho
ae527c34f4 Merge "Fixed popup assets (background)" into gingerbread 2010-10-07 11:56:18 -07:00
Stephen Hines
059f2e5710 Merge "Add RS testing for long and long long." 2010-10-07 11:42:13 -07:00
Adam Powell
a0de478b0e Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread 2010-10-07 11:32:49 -07:00
Brad Fitzpatrick
42ea1611dd Merge "Quiet unnecessary debug logging." into gingerbread 2010-10-07 11:27:56 -07:00