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

17342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Rowe
07bf64be1c am f9ea8ec5: am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2' into gingerbread-plus-aosp

* commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:18:22 -07:00
James Dong
5d453bd8b7 am 1441bdfc: Merge "Use the target color format from the camera source if possible" into gingerbread 
Merge commit '1441bdfc19d6998607adf1347ed8dafc102908c9' into gingerbread-plus-aosp

* commit '1441bdfc19d6998607adf1347ed8dafc102908c9':
  Use the target color format from the camera source if possible
 2010-08-05 15:18:16 -07:00
Eric Rowe
9aee656691 am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit '982f1521a662d274eca1216707d874f148396ac6' into gingerbread

* commit '982f1521a662d274eca1216707d874f148396ac6':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:10:15 -07:00
James Dong
b8578072b2 Merge "Use the target color format from the camera source if possible" into gingerbread 2010-08-05 15:10:03 -07:00
Eric Rowe
5df494e1df Merge "Checkin initial bluetooth stress tests." into froyo 2010-08-05 14:49:22 -07:00
Naomi Luis
32938bf45a frameworks/base/opengl: Add NULL check 
Check for the validity of the attrs_list in eglChooseConfig before using
it. This avoids a crash during tests in which the attributes are NULL.

Change-Id: I1c0a46b505ae919e2454cfdce32f8dfc21ead247
 2010-08-05 12:53:24 -07:00
James Dong
cc94894d85 am 3aad8c38: Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread 
Merge commit '3aad8c38520956708e51882f3fad63a7a217e8e4' into gingerbread-plus-aosp

* commit '3aad8c38520956708e51882f3fad63a7a217e8e4':
  Fix an issue where the track duration does not include the last sample duration
 2010-08-05 11:06:25 -07:00
James Dong
82d341ebb4 Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread 2010-08-05 11:04:14 -07:00
Brian Carlstrom
dfc4636b0e am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread 
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp

* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
  Tracking merge of dalvik-dev to gingerbread
 2010-08-05 10:40:45 -07:00
Brian Carlstrom
f62a2a12fb Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread 2010-08-05 10:35:53 -07:00
Andreas Huber
6471436a59 am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread 
Merge commit '2c37f3d3a09188f3dc66e177547709e4828918be' into gingerbread-plus-aosp

* commit '2c37f3d3a09188f3dc66e177547709e4828918be':
  Better support for fake timestamps in RTP, H.263 video now also requests FIR.
 2010-08-05 10:13:30 -07:00
Andreas Huber
d2975a1e05 am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread 
Merge commit '407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp

* commit '407ec58c6604da3255b04aa99577515deba3a26f':
  A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
 2010-08-05 10:13:26 -07:00
Andreas Huber
0f77bbece9 Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread 2010-08-05 10:11:28 -07:00
Andreas Huber
1c9711eb67 Merge "A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet." into gingerbread 2010-08-05 10:11:18 -07:00
Kenny Root
69e0d086f2 am dec43a10: Merge "Fix up PackageManager tests" into gingerbread 
Merge commit 'dec43a102226de55307de20d5779e20a435be8b1' into gingerbread-plus-aosp

* commit 'dec43a102226de55307de20d5779e20a435be8b1':
  Fix up PackageManager tests
 2010-08-05 10:04:59 -07:00
Kenny Root
b536767ab1 Merge "Fix up PackageManager tests" into gingerbread 2010-08-05 10:02:30 -07:00
Andreas Huber
1c16338fd9 am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread 
Merge commit 'fb861523318710b95c08110b9b2de28f7da74a40' into gingerbread-plus-aosp

* commit 'fb861523318710b95c08110b9b2de28f7da74a40':
  Specification of codec specific data as part of the session description is now optional.
 2010-08-05 09:25:25 -07:00
Andreas Huber
3ca9110ff1 Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread 2010-08-05 09:18:38 -07:00
Chung-yih Wang
074f16ec45 am cde66df4: Revert "Move SIP telephony related codes to framework." 
Merge commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f' into gingerbread-plus-aosp

* commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f':
  Revert "Move SIP telephony related codes to framework."
 2010-08-04 22:33:08 -07:00
Chung-yih Wang
60879b9526 am 468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread 
Merge commit '468e35efc595114354eff7ee2685ea79ed098c7f' into gingerbread-plus-aosp

* commit '468e35efc595114354eff7ee2685ea79ed098c7f':
  Move SIP telephony related codes to framework.
 2010-08-04 21:18:57 -07:00
Chung-yih Wang
ddb37ad00e Merge "Move SIP telephony related codes to framework." into gingerbread 2010-08-04 21:16:48 -07:00
Daniel Sandler
26158c247d am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 
Merge commit '9b87770f53c55a313a7fdc6f553265aabbde3446' into gingerbread-plus-aosp

* commit '9b87770f53c55a313a7fdc6f553265aabbde3446':
  Fix crash when startForeground posts a broken Notification.
 2010-08-04 20:36:09 -07:00
Daniel Sandler
d925cc553e Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 2010-08-04 20:33:32 -07:00
Chung-yih Wang
8410a45841 am 8c503569: Merge "Move the sip related codes to framework." into gingerbread 
Merge commit '8c5035696b0aaf30ae49594b845f663fe633ac88' into gingerbread-plus-aosp

* commit '8c5035696b0aaf30ae49594b845f663fe633ac88':
  Move the sip related codes to framework.
 2010-08-04 19:30:37 -07:00
Chung-yih Wang
5072094ab5 Merge "Move the sip related codes to framework." into gingerbread 2010-08-04 19:28:23 -07:00
John Wang
3221724f96 am 62f066a1: Merge "Add register methods in CallManager "do not merge"" into gingerbread 
Merge commit '62f066a14afb2774569a54c150a9d0a2601dd77a' into gingerbread-plus-aosp

* commit '62f066a14afb2774569a54c150a9d0a2601dd77a':
  Add register methods in CallManager "do not merge"
 2010-08-04 18:56:37 -07:00