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

17418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Konstantin Lopyrev
42c81a7610 am 63cca691: Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread 
Merge commit '63cca69157eae17da2a5492d1bcb7330061a52ac' into gingerbread-plus-aosp

* commit '63cca69157eae17da2a5492d1bcb7330061a52ac':
  Make sure profiling is done only for views that are actually measured, laid out and drawn.
 2010-08-09 19:53:44 -07:00
Jean-Michel Trivi
2f4289991a am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread 
Merge commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp

* commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b':
  Fix bug 2684341 Don't steal the media button event from the phone
 2010-08-09 19:53:20 -07:00
Jaikumar Ganesh
3b362bebfc am cbaef518: Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread 
Merge commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d' into gingerbread-plus-aosp

* commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d':
  Check whether Bluetooth is enabled before making any API calls.
 2010-08-09 19:53:16 -07:00
James Dong
778f649eac am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread 
Merge commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f' into gingerbread-plus-aosp

* commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f':
  Support multiple PPS and SPS in avcC box
 2010-08-09 19:53:12 -07:00
Andreas Huber
fdf9769ab0 am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread 
Merge commit '4edf85abc919b7d0e8db71c0c6166c7994269830' into gingerbread-plus-aosp

* commit '4edf85abc919b7d0e8db71c0c6166c7994269830':
  Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
 2010-08-09 19:53:01 -07:00
Eric Laurent
02083117c1 am 67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread 
Merge commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0' into gingerbread-plus-aosp

* commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0':
  Added tests for audio effects in MediaFrameworkTest
 2010-08-09 19:52:53 -07:00
Eric Laurent
ab666c7a07 am 2a6b80bc: Fixed several audio effects problems. 
Merge commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee' into gingerbread-plus-aosp

* commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee':
  Fixed several audio effects problems.
 2010-08-09 19:52:43 -07:00
Hung-ying Tyan
d7fcc4c770 am 8fb2e6e4: PhoneFactory: add makeSipPhone() 
Merge commit '8fb2e6e4720385961083a150a3e848ccaef544ae' into gingerbread-plus-aosp

* commit '8fb2e6e4720385961083a150a3e848ccaef544ae':
  PhoneFactory: add makeSipPhone()
 2010-08-09 19:52:28 -07:00
Hung-ying Tyan
3881a29a14 am d122805b: CallManager: add getAllPhones(). 
Merge commit 'd122805bbfcb770f941cac259bcefafdb2d3ad56' into gingerbread-plus-aosp

* commit 'd122805bbfcb770f941cac259bcefafdb2d3ad56':
  CallManager: add getAllPhones().
 2010-08-09 19:52:19 -07:00
Mathias Agopian
7f781d1552 improve a bit the implementation of eglGetProcAddress 
Change-Id: Ie07f33ae2162830df1e4f3d3b5e00fcfb8c350d6
 2010-08-09 18:35:43 -07:00
Jaikumar Ganesh
b5a3d0a150 Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread 2010-08-09 17:30:25 -07:00
Konstantin Lopyrev
a06eec8660 Merge "Fix focus notification" into gingerbread 2010-08-09 17:03:10 -07:00
Konstantin Lopyrev
cbceb6f2f2 Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread 2010-08-09 17:02:39 -07:00
Jean-Michel Trivi
c2fab76f69 Merge "Fix bug 2684341 Don't steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread 2010-08-09 14:19:08 -07:00
Jaikumar Ganesh
4d021abf6c Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread 2010-08-09 13:50:28 -07:00
James Dong
f13b68e556 Merge "Support multiple PPS and SPS in avcC box" into gingerbread 2010-08-09 13:35:54 -07:00
Andreas Huber
daae89bc67 Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread 2010-08-09 11:30:34 -07:00
Eric Laurent
df60362e87 Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread 2010-08-09 10:42:27 -07:00
Dan Egnor
2a6e502ea2 am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo 
Merge commit '799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp

* commit '799f2bb04102b4b692b52eed5c36aea9a8cde471':
  COMMENT ONLY change to fix some formatting glitches and
 2010-08-06 18:59:49 -07:00
Dan Egnor
6f678531b9 am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo 
Merge commit 'b37bca9e79489a1abd848ce762bb7d87203b3414' into gingerbread

* commit 'b37bca9e79489a1abd848ce762bb7d87203b3414':
  COMMENT ONLY change to fix some formatting glitches and
 2010-08-06 18:55:05 -07:00
Andreas Huber
545fc38ee0 am ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not. 
Merge commit 'ad98d383a04fce08a147b200e23b12f12b2681a3' into gingerbread-plus-aosp

* commit 'ad98d383a04fce08a147b200e23b12f12b2681a3':
  Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
 2010-08-06 18:54:31 -07:00
Andreas Huber
2e7237c51f am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread 
Merge commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp

* commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba':
  Properly skip the 'skip' chunk in mpeg4 files.
 2010-08-06 18:54:26 -07:00
Steve Howard
d7fe288c9b am 9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread 
Merge commit '9fbf00cb041eeb22acad93deace9712c57b4c594' into gingerbread-plus-aosp

* commit '9fbf00cb041eeb22acad93deace9712c57b4c594':
  Slight improvement (hopefully) to orientation sensing.
 2010-08-06 18:54:22 -07:00
Konstantin Lopyrev
4f76b3aece am 3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread 
Merge commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8' into gingerbread-plus-aosp

* commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8':
  Adding a way for Hierarchy Viewer to get the focused window.
 2010-08-06 18:54:18 -07:00
Steve Howard
a67f431faf am db86c59e: New drawables for the update to the maps API (DO NOT MERGE) 
Merge commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d' into gingerbread-plus-aosp

* commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d':
  New drawables for the update to the maps API (DO NOT MERGE)
 2010-08-06 18:54:13 -07:00
Steve Howard
01246bd9bb am 8e15afe7: Make downloads visible by default. 
Merge commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp

* commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625':
  Make downloads visible by default.
 2010-08-06 18:54:03 -07:00
Kenny Root
d0be18bd4e am 818490ab: Fix String8::operator+ 
Merge commit '818490ab2abe36dfc6c13d01fea5220bd64cca8c' into gingerbread-plus-aosp

* commit '818490ab2abe36dfc6c13d01fea5220bd64cca8c':
  Fix String8::operator+
 2010-08-06 18:53:48 -07:00
Dan Egnor
df78a0982c Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo 2010-08-06 16:39:02 -07:00
Andreas Huber
ce4a755725 Merge "Properly skip the 'skip' chunk in mpeg4 files." into gingerbread 2010-08-06 15:21:47 -07:00
Steve Howard
4a32a42290 Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread 2010-08-06 14:28:37 -07:00
Konstantin Lopyrev
a96dc98b46 Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread 2010-08-06 14:10:29 -07:00
Kenny Root
aa966638b9 Fix String8::operator+ 
The LHS was ignored when using:
  String8 + String8
  String8 + (const char*)

Add unit tests for above.

Bug: 2898473
Change-Id: Ic8fe7be668b665c36aaaa3fc3c3ffdfff0fbba25
 2010-08-06 09:00:10 -07:00
Mike Lockwood
e3be33998d am 5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time. 
Merge commit '5723dfe8c87d0887b8926f43637ed300466890d2' into gingerbread-plus-aosp

* commit '5723dfe8c87d0887b8926f43637ed300466890d2':
  GPS: Don't set XTRA download pending flag at boot time.
 2010-08-06 07:41:44 -07:00
Chia-chi Yeh
709067f309 am 4c5d28ce: RTP: move into frameworks. 
Merge commit '4c5d28cee0537c83ff0e5bc0daaae78f68dfc7c8' into gingerbread-plus-aosp

* commit '4c5d28cee0537c83ff0e5bc0daaae78f68dfc7c8':
  RTP: move into frameworks.
 2010-08-05 23:17:23 -07:00
Chung-yih Wang
d2dd367058 am 1d62c773: Fix the build 
Merge commit '1d62c7737c33f92e79f0a180b05969f52484e64c' into gingerbread-plus-aosp

* commit '1d62c7737c33f92e79f0a180b05969f52484e64c':
  Fix the build
 2010-08-05 21:10:06 -07:00
Chung-yih Wang
bce20fffef am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread 
Merge commit 'b9605886d1a94de624b6feb5a81bb37f41653437' into gingerbread-plus-aosp

* commit 'b9605886d1a94de624b6feb5a81bb37f41653437':
  Revert "Revert "Move SIP telephony related codes to framework.""
 2010-08-05 19:38:04 -07:00
Chung-yih Wang
1f0b5d455c am 7324489f: Merge "Add SIP service into system server." into gingerbread 
Merge commit '7324489f18ee01586931f577f00567092cbf52df' into gingerbread-plus-aosp

* commit '7324489f18ee01586931f577f00567092cbf52df':
  Add SIP service into system server.
 2010-08-05 19:37:59 -07:00
Chung-yih Wang
9dcf6cf541 Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread 2010-08-05 19:35:54 -07:00
Chung-yih Wang
16458c8ee7 Merge "Add SIP service into system server." into gingerbread 2010-08-05 19:35:45 -07:00
Adam Powell
348765d7c4 am 740aa4b2: am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo 
Merge commit '740aa4b2865a20700254314158bcb685514b2ac2' into gingerbread-plus-aosp

* commit '740aa4b2865a20700254314158bcb685514b2ac2':
  DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
 2010-08-05 18:44:49 -07:00
Adam Powell
63e0b0d647 am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo 
Merge commit '9093717985095913934c079abfa879049bd33ba5' into gingerbread

* commit '9093717985095913934c079abfa879049bd33ba5':
  DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
 2010-08-05 18:39:37 -07:00
Adam Powell
2ce397899c Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo 2010-08-05 18:33:31 -07:00
Fred Quintana
2a45dcec26 am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 
Merge commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803' into gingerbread-plus-aosp

* commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803':
  Changed SyncOperation.toKey() to not rely on the implementation of
 2010-08-05 17:51:28 -07:00
Fred Quintana
6b5cdc76df am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 
Merge commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39' into gingerbread

* commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39':
  Changed SyncOperation.toKey() to not rely on the implementation of
 2010-08-05 17:42:05 -07:00
Fred Quintana
3e56d0b4a8 Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 2010-08-05 17:36:27 -07:00
Vasu Nori
3a489ccd2d am 499b7438: Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread 
Merge commit '499b743851aa84b9fc1a7e445e189946bc47ad5d' into gingerbread-plus-aosp

* commit '499b743851aa84b9fc1a7e445e189946bc47ad5d':
  (gingerbread) remove unused tests. bug:2898376
 2010-08-05 17:15:08 -07:00
Vasu Nori
9cd0c539f3 Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread 2010-08-05 17:11:53 -07:00
Scott Main
56dbd906bc am 432a2a1b: am 005e2400: Merge "fix xml sample error" into froyo 
Merge commit '432a2a1bc7fb66e604772052f770857c149b2f97' into gingerbread-plus-aosp

* commit '432a2a1bc7fb66e604772052f770857c149b2f97':
  fix xml sample error
 2010-08-05 15:56:13 -07:00
Scott Main
1f1dfc8936 am 005e2400: Merge "fix xml sample error" into froyo 
Merge commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c' into gingerbread

* commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c':
  fix xml sample error
 2010-08-05 15:53:04 -07:00
Scott Main
6180fa278e Merge "fix xml sample error" into froyo 2010-08-05 15:49:08 -07:00