Commit Graph

18471 Commits

Author SHA1 Message Date
Mathias Agopian
d671e2b957 am 1db0e88e: am 4782cdbb: Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread
Merge commit '1db0e88e60ca4f99edff149fe2ab8499e749df47'

* commit '1db0e88e60ca4f99edff149fe2ab8499e749df47':
  Fix a memory corruption when writting Sensor into a parcel
2010-07-22 20:11:54 -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
Irfan Sheriff
0da155aeb4 Merge "Fix wifi status icon" 2010-07-22 18:57:55 -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
Romain Guy
084fb9baaf Merge "Add a way to query GL extensions." 2010-07-22 18:53:03 -07:00
Mathias Agopian
710efe8c61 am f595a8f7: am 19f082eb: Merge "filter sensor event by connection" into gingerbread
Merge commit 'f595a8f7a90bc7f3b947b05cfbcd209d3e94ba89'

* commit 'f595a8f7a90bc7f3b947b05cfbcd209d3e94ba89':
  filter sensor event by connection
2010-07-22 17:29:04 -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
521be60f8b am 9bc4dc11: am 53d4e0d5: Allows the authoring engine to skip frame.
Merge commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae'

* commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae':
  Allows the authoring engine to skip frame.
2010-07-22 16:28:26 -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
a93772164d am 83a23630: am dd299046: Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
Merge commit '83a236303438453740d5db41b0d017be9e5d56c1'

* commit '83a236303438453740d5db41b0d017be9e5d56c1':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
2010-07-22 16:18:35 -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
Winson Chung
ed23d63cf1 Merge "Fixing indexing issue causing certain items not to load. Performance improvements + testing temporary loading scheme." 2010-07-22 15:41:29 -07:00
Jason Sams
d67ee81ead Merge "Minor ImageProcessing script optimization to make it a better FP benchmark." 2010-07-22 15:11:52 -07:00
Jason Sams
46093c5521 Merge "Update filltest." 2010-07-22 15:11:08 -07:00
Adam Cohen
4c993de45f Merge "Fixing build breakage (current.xml)" 2010-07-22 14:54:46 -07:00
Mathias Agopian
9e472f47e9 am 422e700e: am db3eb355: Merge "propagate sensor event rate properly to the sensor HAL" into gingerbread
Merge commit '422e700ee4f312c7d3c87e26bc2b0c7061c9aa8a'

* commit '422e700ee4f312c7d3c87e26bc2b0c7061c9aa8a':
  propagate sensor event rate properly to the sensor HAL
2010-07-22 14:45:59 -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
7840d8cbeb am b72d3180: am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread
Merge commit 'b72d3180dc8d41d6269664bea808b04410bbe40f'

* commit 'b72d3180dc8d41d6269664bea808b04410bbe40f':
  Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
2010-07-22 13:57:39 -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
Romain Guy
e92bec26c6 Merge "Add support for text culling." 2010-07-22 13:09:14 -07:00
Jean-Baptiste Queru
8975b7a0f2 am 1cb7b2e9: am e7486695: Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
Merge commit '1cb7b2e961fdbdfc39013846e97a918be2a14e07'

* commit '1cb7b2e961fdbdfc39013846e97a918be2a14e07':
  Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
2010-07-22 12:47:04 -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
1f0ad8d890 am 4ef923d8: am b42aa98d: Merge "Correct VM number updation during MBDN refresh."
Merge commit '4ef923d849ec74c7208eaf650b169b5459276fc2'

* commit '4ef923d849ec74c7208eaf650b169b5459276fc2':
  Correct VM number updation during MBDN refresh.
2010-07-22 11:50:55 -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
Adam Powell
02398a047a Merge "Make finish() a no-op on a context mode that is not active." 2010-07-22 11:38:56 -07:00
Jean-Baptiste Queru
11b9e7d766 Merge "Correct VM number updation during MBDN refresh." 2010-07-22 11:38:05 -07:00
Steve Howard
1461c61334 am 82ab8d95: am 13d08515: Remove SEE_ALL_EXTERNAL permission from Download Manager.
Merge commit '82ab8d9554bac7370d1fe1bba320a740a8813de2'

* commit '82ab8d9554bac7370d1fe1bba320a740a8813de2':
  Remove SEE_ALL_EXTERNAL permission from Download Manager.
2010-07-22 11:35:16 -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
Robert Greenwalt
e6487402e6 Merge "Remove an unneeded and improper import." 2010-07-22 10:51:57 -07:00
Daniel Sandler
25cdf44878 Merge "Fix pressed states on system bar buttons." 2010-07-22 06:19:21 -07:00
Ben Murdoch
715f0a6be3 Merge "Make sure to set a Resource Response on the native side in all cases." 2010-07-22 02:25:28 -07:00
Romain Guy
94989aed75 Merge "Add text rendering." 2010-07-21 21:34:47 -07:00
Steve Howard
e70e61f324 am 5e43c5a6: am b8e07a51: DL manager support for broadcasts + connectivity control
Merge commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746'

* commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746':
  DL manager support for broadcasts + connectivity control
2010-07-21 21:27:02 -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
267e73c675 am 1f2ec407: am 23e8de26: propagate sensor event rate properly
Merge commit '1f2ec4070aa9c999d41dc50a892a896e894c5710'

* commit '1f2ec4070aa9c999d41dc50a892a896e894c5710':
  propagate sensor event rate properly
2010-07-21 18:13:39 -07:00
Mathias Agopian
7137392f2c am 994fff70: am 5df13ef3: SensorService doesn\'t crash if correct HAL is not present
Merge commit '994fff705ee8a7a8e9826ade53a5220949a28192'

* commit '994fff705ee8a7a8e9826ade53a5220949a28192':
  SensorService doesn't crash if correct HAL is not present
2010-07-21 18:13:35 -07:00
Mathias Agopian
4c1fd8bfd9 am 042efd6c: am b9cdead4: Merge "Better dumpsys logs" into gingerbread
Merge commit '042efd6c9251064f09705882180d9ab18ce4e914'

* commit '042efd6c9251064f09705882180d9ab18ce4e914':
  Better dumpsys logs
2010-07-21 18:13:32 -07:00
Mathias Agopian
8cdc770d3a am 808fd2ff: am 865991b0: Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread
Merge commit '808fd2ff89fa2feee568bb64017eece73d6b24cb'

* commit '808fd2ff89fa2feee568bb64017eece73d6b24cb':
  Added partial support for repporting sensor activity to IBatteryStats
2010-07-21 18:13:27 -07:00
Mathias Agopian
c8d6daf88a Merge "resolved conflicts for merge of bc54e63c to master" 2010-07-21 18:11:33 -07:00
Mathias Agopian
a7a3160daa resolved conflicts for merge of bc54e63c to master
Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
2010-07-21 18:10:22 -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