ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,418 Commits 2 Branches 0 Tags 54 MiB
a7a3160daa
Commit Graph

18418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
a7a3160daa resolved conflicts for merge of bc54e63c to master 
Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
 2010-07-21 18:10:22 -07:00
Mathias Agopian
65b04b8740 am e4764521: Merge "new SensorService" into gingerbread 
Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp

* commit 'e4764521353e898554931a557460fc49209fb0a9':
  new SensorService
 2010-07-21 16:09:55 -07:00
Mathias Agopian
39e1a83cad Merge "new SensorService" into gingerbread 2010-07-21 16:06:46 -07:00
Vasu Nori
521e48c2f3 Merge "don't store mDatabase in SQLiteCursor as it is already in SQLiteQuery" 2010-07-21 16:05:14 -07:00
Dan Egnor
4d5e5cc69f am 7da38863: am 3685db7f: am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo 
Merge commit '7da38863d4382746090bf50413b1774ab04f6bc1'

* commit '7da38863d4382746090bf50413b1774ab04f6bc1':
  Avoid leaking file descriptors when returning drop box events.
 2010-07-21 15:00:27 -07:00
Adam Powell
510acafc39 Merge "Fix bug 2859423 - action bar: need a way to choose item in spinner" 2010-07-21 14:35:41 -07:00
Dan Egnor
633bc6b86e am 3685db7f: am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo 
Merge commit '3685db7f5dd8a830a4e096404d4924e12697fb78' into gingerbread-plus-aosp

* commit '3685db7f5dd8a830a4e096404d4924e12697fb78':
  Avoid leaking file descriptors when returning drop box events.
 2010-07-21 13:58:08 -07:00
Dan Egnor
2307948dde am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo 
Merge commit 'e8605af513e846f6cd223c9e92461189727d8c9b' into gingerbread

* commit 'e8605af513e846f6cd223c9e92461189727d8c9b':
  Avoid leaking file descriptors when returning drop box events.
 2010-07-21 13:55:13 -07:00
Dan Egnor
e39c274841 Merge "Avoid leaking file descriptors when returning drop box events." into froyo 2010-07-21 13:53:23 -07:00
Chet Haase
f90b734c29 Merge "Fix issue with touch MOVE events on transformed containers" 2010-07-21 13:34:23 -07:00
Ben Komalo
5292ae4ee7 Merge "Relay stopLoading() on the loader from LoaderInfo.stop()" 2010-07-21 13:28:45 -07:00
Andreas Huber
152c520878 am f0d87989: am ff0ab64c: Merge "Add a seek test to the stagefright commandline tool." into gingerbread 
Merge commit 'f0d87989931757cdc50524d282fc151ef88eeafe'

* commit 'f0d87989931757cdc50524d282fc151ef88eeafe':
  Add a seek test to the stagefright commandline tool.
 2010-07-21 13:07:41 -07:00
Andreas Huber
e93e62659a am ff0ab64c: Merge "Add a seek test to the stagefright commandline tool." into gingerbread 
Merge commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e' into gingerbread-plus-aosp

* commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e':
  Add a seek test to the stagefright commandline tool.
 2010-07-21 13:04:33 -07:00
Shih-wei Liao
9aa76b5760 Merge "rs_types.rsh and rs_math.rsh are default include files. Remove their #include." 2010-07-21 12:46:01 -07:00
Andreas Huber
4745f5aea6 Merge "Add a seek test to the stagefright commandline tool." into gingerbread 2010-07-21 12:31:14 -07:00
Jaikumar Ganesh
e898dce6a4 Merge "Allow multiple HID devices to be connected." 2010-07-21 12:10:35 -07:00
Tom Taylor
a0f4d0496c Merge "Fix a merge problem with html mms" 2010-07-21 11:51:56 -07:00
Daniel Sandler
bd81784d74 Merge "Disable hiding of the system bar on xlarge devices." 2010-07-21 11:45:48 -07:00
Jaikumar Ganesh
7163e16b39 Merge "Add HID to the state machine and add native call backs." 2010-07-21 11:42:21 -07:00
Tom Taylor
25aaba99ef am aa0f5550: am 92010ff5: am dbac180d: Fix a merge problem with html mms 
Merge commit 'aa0f5550cbfe713d5a08e25b734b6b976ca1a127'

* commit 'aa0f5550cbfe713d5a08e25b734b6b976ca1a127':
  Fix a merge problem with html mms
 2010-07-21 11:29:39 -07:00
Tom Taylor
366cd9b7e9 am 92010ff5: am dbac180d: Fix a merge problem with html mms 
Merge commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9' into gingerbread-plus-aosp

* commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9':
  Fix a merge problem with html mms
 2010-07-21 11:26:17 -07:00
Tom Taylor
36cdee48ec am dbac180d: Fix a merge problem with html mms 
Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread

* commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff':
  Fix a merge problem with html mms
 2010-07-21 11:22:22 -07:00
Chet Haase
0e3367ccc0 Merge "Add keyframes to animation framework." 2010-07-21 11:08:29 -07:00
Andreas Huber
f8978f0c77 am 8a9a931f: am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread 
Merge commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd'

* commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd':
  Support finer seek control on MediaSources.
 2010-07-21 10:41:45 -07:00
Andreas Huber
eb32ea5cc8 am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread 
Merge commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce' into gingerbread-plus-aosp

* commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce':
  Support finer seek control on MediaSources.
 2010-07-21 10:39:00 -07:00
Andreas Huber
976f08643c Merge "Support finer seek control on MediaSources." into gingerbread 2010-07-21 10:36:08 -07:00
Eric Laurent
779396a12b am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer. 
Merge commit '34161132030254bac7dd64c9713832e2f961a061'

* commit '34161132030254bac7dd64c9713832e2f961a061':
  Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
 2010-07-21 09:52:17 -07:00
Eric Laurent
368d342e18 am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer. 
Merge commit '7070b36549d511d6627538c73dfbab23fbae5b43' into gingerbread-plus-aosp

* commit '7070b36549d511d6627538c73dfbab23fbae5b43':
  Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
 2010-07-21 09:49:27 -07:00
jsh
947265f8d4 Merge "Add support for PSC of serving cell." 2010-07-21 09:27:04 -07:00
The Android Open Source Project
22e341613f am 42ef77f3: merge from open-source master 
Merge commit '42ef77f3603ae54990d6718db79afae61e91dc61'

* commit '42ef77f3603ae54990d6718db79afae61e91dc61':
  Shoud specify the Resource class instance as an argument of the method
 2010-07-21 08:15:45 -07:00
The Android Open Source Project
185dd8939f am e9e04673: merge from open-source master 
Merge commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530'

* commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530':
  replaced deprecated setButton Methods
 2010-07-21 08:13:02 -07:00
The Android Open Source Project
154ad59ade merge from open-source master 
Change-Id: Ide1539b6777faf232d5360d6dc89a5d255982747
 2010-07-21 08:07:26 -07:00
The Android Open Source Project
e090c99860 merge from open-source master 
Change-Id: I5d220f16c319e95547f133ee9bcbd0b5caabc597
 2010-07-21 08:05:45 -07:00
Maksymilian Osowski
7aa9a5151e Merge "LayoutTest class with supporting classes (AbstractResult, TextResult)." 2010-07-21 07:22:09 -07:00
Adam Powell
8ef336d3b0 Merge "Refactored contextual modes out of action bar." 2010-07-20 20:28:31 -07:00
Yu Shan Emily Lau
2f635c11e7 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-07-20 16:55:33 -07:00
Adam Powell
65c2d8ded3 Merge "Fix a bug with closing action bar context modes" 2010-07-20 16:55:15 -07:00
James Dong
c946350329 am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbread 
Merge commit '9049fe60c20640bd606741c8f45f3f781a1684f5'

* commit '9049fe60c20640bd606741c8f45f3f781a1684f5':
  Progress status notification
 2010-07-20 16:55:12 -07:00
Jason Parks
2aca40963d am bc4fcec7: am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7'

* commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 16:55:01 -07:00
Dan Egnor
b6db3ac0b1 am c78f9a0e: am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67'

* commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 16:54:57 -07:00
Scott Main
6acd983605 am 3b3e368c: am 60a20061: am 2316d626: docs: add information about using color resources as drawables 
Merge commit '3b3e368c73f4224b055635e6e79f57cc702d8938'

* commit '3b3e368c73f4224b055635e6e79f57cc702d8938':
  docs: add information about using color resources as drawables
 2010-07-20 16:54:52 -07:00
Dan Egnor
6db036de9d am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit '79102ad0f56135335bccc935bbaeb4c5d8115214'

* commit '79102ad0f56135335bccc935bbaeb4c5d8115214':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 16:54:38 -07:00
Shih-wei Liao
2912d5e023 Merge "Use bccGetExportVars to get mFieldCount, instead of hardwiring "100" in calloc." 2010-07-20 16:44:29 -07:00
Romain Guy
40de41c85d Merge "Add preliminary support for text rendering." 2010-07-20 16:43:31 -07:00
Jason Sams
83cf94d7b5 Merge "Attempt to fix build '<>' works on mac but does not appear to work on linux yet." 2010-07-20 15:44:55 -07:00
Vasu Nori
fcf3290f00 Merge "make disableWriteAheadLogging method public so apps can disable WAL" 2010-07-20 15:36:31 -07:00
Jason Sams
5bfd57cda2 Merge "Update imageprocessing to remove generated files. Fix thread launch race condition." 2010-07-20 15:10:44 -07:00
Mike Lockwood
469c8b1613 Merge "Add resource configuration flag to indicate whether USB host support exists." 2010-07-20 15:04:01 -07:00
James Dong
cb3df93031 am d7514ec6: Merge "Progress status notification" into gingerbread 
Merge commit 'd7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9' into gingerbread-plus-aosp

* commit 'd7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9':
  Progress status notification
 2010-07-20 14:32:39 -07:00
James Dong
97a5e2992a Merge "Progress status notification" into gingerbread 2010-07-20 14:29:39 -07:00