ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
16,856 Commits 2 Branches 0 Tags 54 MiB
3987726555
Commit Graph

16856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
3987726555 am 021697ad: Audio effects: lvm bundle wrapper update after first integration tests. 
Merge commit '021697ad3d4ef981d0deae1fa223ed06f30df738' into gingerbread-plus-aosp

* commit '021697ad3d4ef981d0deae1fa223ed06f30df738':
  Audio effects: lvm bundle wrapper update after first integration tests.
 2010-07-23 01:03:06 -07:00
Mathias Agopian
84101fe028 am 4782cdbb: Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread 
Merge commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7' into gingerbread-plus-aosp

* commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7':
  Fix a memory corruption when writting Sensor into a parcel
 2010-07-22 20:09:09 -07:00
Mathias Agopian
625177aa35 Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread 2010-07-22 20:07:01 -07:00
Mathias Agopian
d03d9ced3f Fix a memory corruption when writting Sensor into a parcel 
Change-Id: I03f703ae2224f43924031bfea4c68aa979bb9f05
 2010-07-22 18:57:41 -07:00
Mathias Agopian
805b620794 am 19f082eb: Merge "filter sensor event by connection" into gingerbread 
Merge commit '19f082ebe859da5191ccab5f38058513c32b3d05' into gingerbread-plus-aosp

* commit '19f082ebe859da5191ccab5f38058513c32b3d05':
  filter sensor event by connection
 2010-07-22 17:26:17 -07:00
Mathias Agopian
84a7d07f45 Merge "filter sensor event by connection" into gingerbread 2010-07-22 17:23:17 -07:00
James Dong
be9a667bb2 am 53d4e0d5: Allows the authoring engine to skip frame. 
Merge commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba' into gingerbread-plus-aosp

* commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba':
  Allows the authoring engine to skip frame.
 2010-07-22 16:25:17 -07:00
Jean-Baptiste Queru
5eb81846a0 am dd299046: Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver" 
Merge commit 'dd29904638fb36cd5585560e83367d1f5565cc4c' into gingerbread-plus-aosp

* commit 'dd29904638fb36cd5585560e83367d1f5565cc4c':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
 2010-07-22 16:14:18 -07:00
Jean-Baptiste Queru
b8bd449144 Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver" 2010-07-22 15:55:31 -07:00
Mathias Agopian
6c1ed6522d am db3eb355: Merge "propagate sensor event rate properly to the sensor HAL" into gingerbread 
Merge commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa' into gingerbread-plus-aosp

* commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa':
  propagate sensor event rate properly to the sensor HAL
 2010-07-22 14:42:12 -07:00
Mathias Agopian
f35ed885c1 Merge "propagate sensor event rate properly to the sensor HAL" into gingerbread 2010-07-22 14:38:49 -07:00
Andreas Huber
98343e73aa am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread 
Merge commit '81046c8c42ff3b630c6496deafd44f2a07a25463' into gingerbread-plus-aosp

* commit '81046c8c42ff3b630c6496deafd44f2a07a25463':
  Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
 2010-07-22 13:54:47 -07:00
Andreas Huber
e99010aae2 Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread 2010-07-22 13:47:41 -07:00
Jean-Baptiste Queru
cdf63e92cf am e7486695: Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE" 
Merge commit 'e7486695ced2dd135f6e2223b582adde4155b917' into gingerbread-plus-aosp

* commit 'e7486695ced2dd135f6e2223b582adde4155b917':
  Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
 2010-07-22 12:43:07 -07:00
Jean-Baptiste Queru
661d13b9e5 Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE" 2010-07-22 12:22:56 -07:00
Jean-Baptiste Queru
72d60ccc35 am b42aa98d: Merge "Correct VM number updation during MBDN refresh." 
Merge commit 'b42aa98d44f1ad22746005264274220770de2756' into gingerbread-plus-aosp

* commit 'b42aa98d44f1ad22746005264274220770de2756':
  Correct VM number updation during MBDN refresh.
 2010-07-22 11:47:26 -07:00
Jean-Baptiste Queru
11b9e7d766 Merge "Correct VM number updation during MBDN refresh." 2010-07-22 11:38:05 -07:00
Steve Howard
851ab85ea3 am 13d08515: Remove SEE_ALL_EXTERNAL permission from Download Manager. 
Merge commit '13d08515f038db45de6028085993ae6076566867' into gingerbread-plus-aosp

* commit '13d08515f038db45de6028085993ae6076566867':
  Remove SEE_ALL_EXTERNAL permission from Download Manager.
 2010-07-22 11:31:37 -07:00
Steve Howard
148fbb344b am b8e07a51: DL manager support for broadcasts + connectivity control 
Merge commit 'b8e07a51c1849d6894c5773a3daacedd01294218' into gingerbread-plus-aosp

* commit 'b8e07a51c1849d6894c5773a3daacedd01294218':
  DL manager support for broadcasts + connectivity control
 2010-07-21 21:22:58 -07:00
Mathias Agopian
7e2ac50874 am 23e8de26: propagate sensor event rate properly 
Merge commit '23e8de26b7b3d04daf08526f314c2fdd2f8fee65' into gingerbread-plus-aosp

* commit '23e8de26b7b3d04daf08526f314c2fdd2f8fee65':
  propagate sensor event rate properly
 2010-07-21 16:12:28 -07:00
Mathias Agopian
96244f7e2c am 5df13ef3: SensorService doesn\'t crash if correct HAL is not present 
Merge commit '5df13ef30e7dd58e4e718e6d949ac3d1f5af94e0' into gingerbread-plus-aosp

* commit '5df13ef30e7dd58e4e718e6d949ac3d1f5af94e0':
  SensorService doesn't crash if correct HAL is not present
 2010-07-21 16:12:25 -07:00
Mathias Agopian
8df98c0ff3 am b9cdead4: Merge "Better dumpsys logs" into gingerbread 
Merge commit 'b9cdead457fb86efc125db8c1c6954c4af1d7388' into gingerbread-plus-aosp

* commit 'b9cdead457fb86efc125db8c1c6954c4af1d7388':
  Better dumpsys logs
 2010-07-21 16:10:04 -07:00
Mathias Agopian
78c5611eed am 865991b0: Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread 
Merge commit '865991b075de1df8144426b5c2b2f341e4e33d33' into gingerbread-plus-aosp

* commit '865991b075de1df8144426b5c2b2f341e4e33d33':
  Added partial support for repporting sensor activity to IBatteryStats
 2010-07-21 16:10:00 -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
e3c8234765 propagate sensor event rate properly 
Change-Id: I32e67d30e4295285a6827956cc8161b2025d70bc
 2010-07-21 16:09:39 -07:00
Mathias Agopian
49f2aee90c Merge "Better dumpsys logs" into gingerbread 2010-07-21 16:07:32 -07:00
Mathias Agopian
883b3e9206 Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread 2010-07-21 16:07:15 -07:00
Mathias Agopian
39e1a83cad Merge "new SensorService" into gingerbread 2010-07-21 16:06:46 -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
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
Andreas Huber
4745f5aea6 Merge "Add a seek test to the stagefright commandline tool." into gingerbread 2010-07-21 12:31:14 -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
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
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
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
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
Jason Parks
d316e20f7f am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp

* commit '29e25bd3418b04e395119bf99abe92898830a796':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 14:04:41 -07:00
Dan Egnor
817379ca66 am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp

* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 14:04:33 -07:00
Jason Parks
24e0cd34aa Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 2010-07-20 14:01:39 -07:00
Scott Main
e29d19c006 am 60a20061: am 2316d626: docs: add information about using color resources as drawables 
Merge commit '60a200617791cf4dd3660c514ac6bf17dfcb85de' into gingerbread-plus-aosp

* commit '60a200617791cf4dd3660c514ac6bf17dfcb85de':
  docs: add information about using color resources as drawables
 2010-07-20 14:01:33 -07:00
Dan Egnor
95127e043b am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread

* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 13:59:43 -07:00
Dan Egnor
0dda53db5e am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp

* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 13:58:57 -07:00
Dan Egnor
468c4f6de9 Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 2010-07-20 13:57:08 -07:00
Scott Main
5933744aa3 am 2316d626: docs: add information about using color resources as drawables 
Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread

* commit '2316d6260862230af10d8ca3ff446ad3f560f712':
  docs: add information about using color resources as drawables
 2010-07-20 13:53:55 -07:00