drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,319 Commits 1 Branch 0 Tags
Commit Graph

25319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Howard
974c993fc3 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
d7ce227bcb 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
Steve Howard
8e15afe799 Make downloads visible by default. 
Change-Id: I8f8b325658d8afc964bddd3f1c03ed20e6bd10aa
 2010-08-06 11:06:49 -07:00
Kenny Root
818490ab2a 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
19be0bd07e 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
Mike Lockwood
5723dfe8c8 GPS: Don't set XTRA download pending flag at boot time. 
XTRA data downloads are now strictly on demand from the GPS engine.
Also fix typo in handleDownloadXtraData()

Change-Id: Ied1a6e2e62134add4d965326aae909c86f834682
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-06 10:15:15 -04:00
Chia-chi Yeh
69a8d4a872 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
Chia-chi Yeh
4c5d28cee0 RTP: move into frameworks. 
Change-Id: Ic9c17b460448c746b21526ac10b647f281ae48e9
 2010-08-06 14:12:05 +08:00
Chung-yih Wang
6866ecb927 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
1d62c7737c Fix the build 
Change-Id: I410e2fd057b68e1b5b5b33ee10178a01d3c9b2fa
 2010-08-06 11:52:38 +08:00
Chung-yih Wang
e7b92260e2 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
a06ad953a2 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
b9605886d1 Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread 2010-08-05 19:35:54 -07:00
Chung-yih Wang
7324489f18 Merge "Add SIP service into system server." into gingerbread 2010-08-05 19:35:45 -07:00
Adam Powell
a68a0ebb51 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
740aa4b286 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
9093717985 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
c2a836a5f4 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
5005a6c031 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
Chung-yih Wang
2d94231ef9 Add SIP service into system server. 
Change-Id: Icc39e4e54768cfdcc1b20a3efe6206009b9a8d10
 2010-08-06 08:40:50 +08:00
Fred Quintana
cdf16787fc Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 2010-08-05 17:36:27 -07:00
Fred Quintana
b4b7b4837b Changed SyncOperation.toKey() to not rely on the implementation of 
Account.toString()

bug: 2898033
Change-Id: I6bfac976127190d2d667312df7aa9c7d57b21555
 2010-08-05 17:26:58 -07:00
Vasu Nori
bde1fc848d 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
499b743851 Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread 2010-08-05 17:11:53 -07:00
Vasu Nori
286b9770cc (gingerbread) remove unused tests. bug:2898376 
Change-Id: Icc4c8ed20c9e910784bf202415d58e4af2366bee
 2010-08-05 16:56:09 -07:00
Scott Main
dd08aca684 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
432a2a1bc7 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
Adam Powell
a55191fe8f DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller 
Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63
 2010-08-05 15:50:31 -07:00
Scott Main
005e2400b5 Merge "fix xml sample error" into froyo 2010-08-05 15:49:08 -07:00
Scott Main
307351a22d fix xml sample error 
Change-Id: Ifd188a5866382a79c2c9de94c0682b707baffdcf
 2010-08-05 15:44:26 -07:00
Eric Rowe
5c0f1e0a87 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
9c09a60513 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
f9ea8ec57e 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
1441bdfc19 Merge "Use the target color format from the camera source if possible" into gingerbread 2010-08-05 15:10:03 -07:00
Eric Rowe
982f1521a6 Merge "Checkin initial bluetooth stress tests." into froyo 2010-08-05 14:49:22 -07:00
Eric Rowe
14db8d9978 Checkin initial bluetooth stress tests. 
Bluetooth stress tests include stress tests for enabling/disabling bluetooth,
making the device discoverable/undiscoverable, and starting and stopping scans.

Change-Id: Ic8ba09475ffe5551717438673e0ed3f4bd17cf2f
 2010-08-05 14:45:44 -07:00
James Dong
afd97e82cf Use the target color format from the camera source if possible 
- If the target color format is unavailable, the default
  platform-dependent color format will be used.

- Also add some logic to prevent looping forever if the
  omx component is buggy supporting color format enumeration.

Change-Id: I119a78f0d6201b4c3621235cca2f523ec14e24e3
 2010-08-05 13:47:01 -07:00
James Dong
41b29cb0a8 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
3aad8c3852 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
James Dong
91b22a9453 Fix an issue where the track duration does not include the last sample duration 
Change-Id: Ib6e01c1c84ad9b7404536f9c40bf90a13340ae53
 2010-08-05 10:46:13 -07:00
Brian Carlstrom
1b7e4d5adc 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
4ae1e382f4 Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread 2010-08-05 10:35:53 -07:00
Andreas Huber
870678a954 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
2405988fa0 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
2c37f3d3a0 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
407ec58c66 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
983d4583e7 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
dec43a1022 Merge "Fix up PackageManager tests" into gingerbread 2010-08-05 10:02:30 -07:00
Andreas Huber
1f7fba1ffb A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet. 
Change-Id: I001fa36d3f5bf385b9f9d086c802673071c65db9
related-to-bug: 2896814
 2010-08-05 10:00:10 -07:00
Andreas Huber
3eaa3006a8 Better support for fake timestamps in RTP, H.263 video now also requests FIR. 
Change-Id: I2385461887197fe4062d329086e0204f6d6620fc
 2010-08-05 09:28:17 -07:00