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

16083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
6c424e2fb1 am 3a010fa6: am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo 
Merge commit '3a010fa6192f09121fc920810c5a8366b5b09f46' into gingerbread-plus-aosp

* commit '3a010fa6192f09121fc920810c5a8366b5b09f46':
  Doc change: remove pdf summary of guidelines from templates archive.
 2010-06-11 16:58:34 -07:00
Dirk Dougherty
d5fd97c70b am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo 
Merge commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b' into gingerbread

* commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b':
  Doc change: remove pdf summary of guidelines from templates archive.
 2010-06-11 16:56:04 -07:00
Dirk Dougherty
6c622422b6 Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo 2010-06-11 16:49:14 -07:00
Andreas Huber
13387dbf95 am 126ca6f9: Merge "Must hold lock here..." into gingerbread 
Merge commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b' into gingerbread-plus-aosp

* commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b':
  Must hold lock here...
 2010-06-11 15:59:30 -07:00
Andreas Huber
7cff0854f4 Merge "Must hold lock here..." into gingerbread 2010-06-11 15:58:19 -07:00
Irfan Sheriff
829c16e388 am c2bc66d4: Merge "Dont persist config on failure" into gingerbread 
Merge commit 'c2bc66d40510be99e748697cb12c2609cc0e23fc' into gingerbread-plus-aosp

* commit 'c2bc66d40510be99e748697cb12c2609cc0e23fc':
  Dont persist config on failure
 2010-06-11 15:30:36 -07:00
Irfan Sheriff
a62ea287da Merge "Dont persist config on failure" into gingerbread 2010-06-11 15:28:24 -07:00
James Dong
9090e5fd60 am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken 
Merge commit 'f62c57d684b83df7d2817db976c0afdb500ae92a' into gingerbread-plus-aosp

* commit 'f62c57d684b83df7d2817db976c0afdb500ae92a':
  Initial checkin for pause and resume control
 2010-06-11 14:31:49 -07:00
James Dong
f7b5648c22 Merge "Initial checkin for pause and resume control" into kraken 2010-06-11 14:28:55 -07:00
Dianne Hackborn
9921af3de8 am 9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken 
Merge commit '9f8cc518e14c7a34bc52da712afbf02d84585f67' into gingerbread-plus-aosp

* commit '9f8cc518e14c7a34bc52da712afbf02d84585f67':
  Adjust activity manager process OOM adj.
 2010-06-11 10:58:48 -07:00
Andreas Huber
7d867210ee am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken 
Merge commit 'f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9' into gingerbread-plus-aosp

* commit 'f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9':
  Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
 2010-06-11 10:58:44 -07:00
Dianne Hackborn
9717ce1e9a Merge "Adjust activity manager process OOM adj." into kraken 2010-06-11 10:53:16 -07:00
Andreas Huber
9812b9ce77 Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken 2010-06-11 10:52:00 -07:00
Andreas Huber
0ca952c7ab am e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream. 
Merge commit 'e577e87a2d80890190f14edc4a5caf70d7c566bf' into gingerbread-plus-aosp

* commit 'e577e87a2d80890190f14edc4a5caf70d7c566bf':
  Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
 2010-06-11 10:12:59 -07:00
Chih-Chung Chang
9f2fcfae26 am b8bb78f5: Change camera interface to support multiple cameras. 
Merge commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1' into gingerbread-plus-aosp

* commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1':
  Change camera interface to support multiple cameras.
 2010-06-11 03:27:30 -07:00
Chih-Chung Chang
189aab1390 Change camera interface to support multiple cameras. 
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
 2010-06-11 16:47:33 +08:00
Wu-cheng Li
271fd4ff86 am 2fd73a45: Unhide camera metering mode API. 
Merge commit '2fd73a452268d2acb6e72a1d23a422085ed3c510' into gingerbread-plus-aosp

* commit '2fd73a452268d2acb6e72a1d23a422085ed3c510':
  Unhide camera metering mode API.
 2010-06-11 00:33:37 -07:00
Irfan Sheriff
ec49dd6dab am f4f614f5: am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 19:02:23 -07:00
Irfan Sheriff
deaae079f4 am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo 
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken

* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
  Remove indefinite DHCP retries
 2010-06-10 18:59:42 -07:00
Irfan Sheriff
c17564db5a Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 18:56:04 -07:00
Mathias Agopian
434216dbcf am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:15:12 -07:00
Mathias Agopian
5f86a2d33c Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:12:42 -07:00
Mike Lockwood
555602e9ae am 4001120e: am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo 2010-06-10 15:32:51 -07:00
Mike Lockwood
dddfaba20c am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo 
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into kraken

* commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
  Don't adjust lights if screen or button brightness is changed when the screen is off.
 2010-06-10 15:30:41 -07:00
Mike Lockwood
68c92f3410 Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo 2010-06-10 15:28:31 -07:00
Andreas Huber
1d9f6d21f3 am 4d61f602: Switch stagefright\'s approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages. 2010-06-10 15:19:29 -07:00
Andreas Huber
0b8689f36f am a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken 2010-06-10 15:17:40 -07:00
Andreas Huber
a1cd5a7730 am fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken 2010-06-10 15:17:35 -07:00
Andreas Huber
7385722784 am 8f864513: Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string\'s original contents." into kraken 2010-06-10 15:17:30 -07:00
Andreas Huber
4f1605b06d am c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken 2010-06-10 15:17:24 -07:00
Andreas Huber
be6de699d2 Merge "Simplify the code in the stagefright commandline utility." into kraken 2010-06-10 15:15:50 -07:00
Andreas Huber
ade8fbc2df Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken 2010-06-10 15:15:43 -07:00
Andreas Huber
8428e036ab Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents." into kraken 2010-06-10 15:15:37 -07:00
Andreas Huber
5517af4491 Merge "Initial check-in of new caching/prefetching data source implementation." into kraken 2010-06-10 15:15:29 -07:00
Brad Fitzpatrick
3fc3c14a85 am 438d0595: Introduce "StrictMode" 2010-06-10 15:03:26 -07:00
Adam Powell
afbcb1193b am 8f1bfb00: am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo 2010-06-10 14:16:32 -07:00
Adam Powell
07345784cb am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo 
Merge commit '8f2ca788f369892370477212cf9e7a67721a8c16' into kraken

* commit '8f2ca788f369892370477212cf9e7a67721a8c16':
  Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down.
 2010-06-10 14:13:51 -07:00
Adam Powell
a9d563290e Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo 2010-06-10 14:09:50 -07:00
Andreas Huber
ba3598e7c1 am 8d300280: Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken 2010-06-10 12:42:10 -07:00
Andreas Huber
c6d9172f67 am 75c1c8e3: Merge "Initial check in of a new http data source implementation." into kraken 2010-06-10 12:42:06 -07:00
Andreas Huber
84ccc74833 Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken 2010-06-10 12:41:05 -07:00
Andreas Huber
b537e5c360 Merge "Initial check in of a new http data source implementation." into kraken 2010-06-10 12:40:39 -07:00
Nick Kralevich
eab454e14a am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch 2010-06-10 11:57:05 -07:00
Nick Kralevich
7984c8c7ab am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch 
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into kraken

* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
  do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
 2010-06-10 11:54:53 -07:00
Andreas Huber
a637eb4869 Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents. 
Change-Id: I6961f3cf10ba3b728579ea63262db750a4cf8577
 2010-06-10 11:25:51 -07:00
James Dong
83c15e016a am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken 2010-06-10 10:16:55 -07:00
Andreas Huber
b2030f3bde am 66b89a62: Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken 2010-06-10 10:14:50 -07:00
James Dong
c419e471fa Merge "Remove the lock/unlock workaround from CameraService" into kraken 2010-06-10 10:14:38 -07:00
Andreas Huber
7f1c756f1a Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken 2010-06-10 10:12:57 -07:00
Kenny Root
b3eeac55a7 am 36921ad8: am b00854d4: Import revised translations 2010-06-09 22:33:47 -07:00