ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
23,716 Commits 2 Branches 0 Tags 54 MiB
90a85fed7c
Commit Graph

23716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
9e001ba322 am c81ec79d: am 0592832c: Merge "Attempt to fix simulator build." into gingerbread 
Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e'

* commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e':
  Attempt to fix simulator build.
 2010-10-22 09:17:41 -07:00
Mike Lockwood
ab9e756f77 am d78c8d8b: am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread 
Merge commit 'd78c8d8bb9516878eb5042a28d76bd6bcf4c6780'

* commit 'd78c8d8bb9516878eb5042a28d76bd6bcf4c6780':
  GPS: Fix network type logic in requestRefLocation
 2010-10-22 09:17:38 -07:00
Kenny Root
4b3d8bd9a4 am 7ba8c44e: am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread 
Merge commit '7ba8c44ef7ba22d83a670e50314d69d0ddce1b9c'

* commit '7ba8c44ef7ba22d83a670e50314d69d0ddce1b9c':
  Initialized check in ZipFileRO::findEntryByName
 2010-10-22 09:14:28 -07:00
Chet Haase
21a910158f Merge "Fix native resource leak when OpenGL renderer is not being used." 2010-10-22 09:07:13 -07:00
Nick Pelly
4dac7a8da2 am 0592832c: Merge "Attempt to fix simulator build." into gingerbread 
Merge commit '0592832c5e61b9c0008a4410f263ea0b0b991f05' into gingerbread-plus-aosp

* commit '0592832c5e61b9c0008a4410f263ea0b0b991f05':
  Attempt to fix simulator build.
 2010-10-22 09:03:21 -07:00
Mike Lockwood
93828eab05 am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread 
Merge commit 'f6572e7ee413a87f5d243b3d44f798260ac1a18b' into gingerbread-plus-aosp

* commit 'f6572e7ee413a87f5d243b3d44f798260ac1a18b':
  GPS: Fix network type logic in requestRefLocation
 2010-10-22 09:03:17 -07:00
Kenny Root
9f46e87d1e am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread 
Merge commit '8ad30b5b7e380428701a44458393cbc2381f205b' into gingerbread-plus-aosp

* commit '8ad30b5b7e380428701a44458393cbc2381f205b':
  Initialized check in ZipFileRO::findEntryByName
 2010-10-22 08:59:24 -07:00
Nick Pelly
bf38e48333 Merge "Attempt to fix simulator build." into gingerbread 2010-10-22 08:49:51 -07:00
Mike Lockwood
bcd579d785 Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread 2010-10-22 08:02:09 -07:00
Kenny Root
6d9d44aecc Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread 2010-10-22 07:55:44 -07:00
Hung-ying Tyan
e36b92c71e am d4d3f36f: am 1257d330: Merge "Clean up pending sessions on incoming call in SipService" into gingerbread 
Merge commit 'd4d3f36f4c25b41f4253eadd5e67035fe220cad3'

* commit 'd4d3f36f4c25b41f4253eadd5e67035fe220cad3':
  Clean up pending sessions on incoming call in SipService
 2010-10-22 06:01:29 -07:00
Jean-Baptiste Queru
45ed37324a Merge de8635e4 from gingerbread-plus-aosp 
Change-Id: Ice15f34cc3ab7d938d8acde1033886b2765fee9d
 2010-10-22 05:44:37 -07:00
Steve Block
e4af24a8e7 Merge "Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack" 2010-10-22 03:56:58 -07:00
Hung-ying Tyan
6a382f4bf4 am 1257d330: Merge "Clean up pending sessions on incoming call in SipService" into gingerbread 
Merge commit '1257d330dcfdb87214278c8fc9718ea9fc663df6' into gingerbread-plus-aosp

* commit '1257d330dcfdb87214278c8fc9718ea9fc663df6':
  Clean up pending sessions on incoming call in SipService
 2010-10-21 23:15:20 -07:00
Hung-ying Tyan
21d6871a3c Merge "Clean up pending sessions on incoming call in SipService" into gingerbread 2010-10-21 23:08:59 -07:00
Jason Sams
9447d0515d Merge "Fix refcounting bugs where the sys refcount could be corrupted during async type creation." 2010-10-21 21:21:50 -07:00
Jeff Hamilton
525ebe17e3 am 389a440a: Backport ParcelFileDescriptor.createPipe() from master. 
Merge commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a' into gingerbread-plus-aosp

* commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a':
  Backport ParcelFileDescriptor.createPipe() from master.
 2010-10-21 21:08:20 -07:00
James Dong
95c929cb8d am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread 
Merge commit '6123e0f7c91ffc7534da99b4668879dacf662227'

* commit '6123e0f7c91ffc7534da99b4668879dacf662227':
  Turn the media time adjustment in file writer back on
 2010-10-21 20:27:34 -07:00
Dianne Hackborn
ad98b1677e am eb5aeae6: am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread 
Merge commit 'eb5aeae676fb23b2ad748185867c085e3cd65314'

* commit 'eb5aeae676fb23b2ad748185867c085e3cd65314':
  Adjust boundaries for screen sizes.
 2010-10-21 20:27:30 -07:00
Dianne Hackborn
993bfc3ca8 am 101f14b2: (-s ours) am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread 
Merge commit '101f14b275ab2451aef50dec427376d721d17aea'

* commit '101f14b275ab2451aef50dec427376d721d17aea':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE
 2010-10-21 20:27:26 -07:00
Dianne Hackborn
579d8598b2 am 86f1b643: am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread 
Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295'

* commit '86f1b643d10e0b5b17ae01db3b81020db87b3295':
  Fix issue #3117918: No way to finish a native activity
 2010-10-21 20:27:15 -07:00
James Dong
2418a4974f am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread 
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp

* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
  Turn the media time adjustment in file writer back on
 2010-10-21 20:18:16 -07:00
Dianne Hackborn
5dcaf70eb3 am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread 
Merge commit 'fdbb2168f7a9a202ee9406d65e7ef98a6745b488' into gingerbread-plus-aosp

* commit 'fdbb2168f7a9a202ee9406d65e7ef98a6745b488':
  Adjust boundaries for screen sizes.
 2010-10-21 20:18:11 -07:00
Dianne Hackborn
3b7d0066bb am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread 
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp

* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE
 2010-10-21 20:17:56 -07:00
Dianne Hackborn
d07349ee7f am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread 
Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp

* commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc':
  Fix issue #3117918: No way to finish a native activity
 2010-10-21 20:17:50 -07:00
James Dong
33c44f267a Merge "Turn the media time adjustment in file writer back on" into gingerbread 2010-10-21 20:06:59 -07:00
Dianne Hackborn
12f3f83cec Merge "Adjust boundaries for screen sizes." into gingerbread 2010-10-21 19:21:28 -07:00
Dianne Hackborn
83a19d25f1 Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread 2010-10-21 19:20:49 -07:00
Dianne Hackborn
eab490ad03 Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread 2010-10-21 19:09:44 -07:00
Jeff Brown
804de7daef am 482284ad: am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread 
Merge commit '482284ad0e3226b49c27bf41442c1cb150853226'

* commit '482284ad0e3226b49c27bf41442c1cb150853226':
  Fix a race condition in wallpaper move throttling.
 2010-10-21 18:10:24 -07:00
Jeff Brown
37e376f2ed am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread 
Merge commit '6b3178a6323e015644590ebaee86523e4bb81773' into gingerbread-plus-aosp

* commit '6b3178a6323e015644590ebaee86523e4bb81773':
  Fix a race condition in wallpaper move throttling.
 2010-10-21 18:05:53 -07:00
Jeff Brown
73d9935e2d Merge "Fix a race condition in wallpaper move throttling." into gingerbread 2010-10-21 18:02:54 -07:00
Dianne Hackborn
b1bf683ff3 am 2f1eee34: am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 
Merge commit '2f1eee34706cf42855541def5737c37a071d7293'

* commit '2f1eee34706cf42855541def5737c37a071d7293':
  Fix issue #3117472: Format storage dialog still broken
 2010-10-21 17:44:40 -07:00
Dianne Hackborn
fcd9ecd064 am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 
Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp

* commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307':
  Fix issue #3117472: Format storage dialog still broken
 2010-10-21 17:35:12 -07:00
Dianne Hackborn
9cd4354dda Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 2010-10-21 17:28:19 -07:00
Mathias Agopian
2e6153ee11 am 49af98ed: am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread 
Merge commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7'

* commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7':
  fix [3119687] [Maps][4.6.0] Force close in street view
 2010-10-21 17:23:24 -07:00
Mathias Agopian
50efa3bc4c am 46beb433: (-s ours) am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 
Merge commit '46beb43357e32507189203db4626d0df954abe62'

* commit '46beb43357e32507189203db4626d0df954abe62':
  Mirror the preview for front-facing cameras. do not merge
 2010-10-21 17:22:05 -07:00
Kenny Root
a209aa866e am d7cd560a: am 1d79a9d9: Use correct size of GAMEPAD_KEYCODES 
Merge commit 'd7cd560af506f75d07034c136bea09b409b4d408'

* commit 'd7cd560af506f75d07034c136bea09b409b4d408':
  Use correct size of GAMEPAD_KEYCODES
 2010-10-21 17:21:56 -07:00
Mathias Agopian
613493c424 am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread 
Merge commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685' into gingerbread-plus-aosp

* commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685':
  fix [3119687] [Maps][4.6.0] Force close in street view
 2010-10-21 17:07:15 -07:00
Mathias Agopian
878353fb0b Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread 2010-10-21 16:43:00 -07:00
Mathias Agopian
fb0163b8d0 am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp

* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
  Mirror the preview for front-facing cameras. do not merge
 2010-10-21 16:26:02 -07:00
Kenny Root
bd3f24e7f1 am 1d79a9d9: Use correct size of GAMEPAD_KEYCODES 
Merge commit '1d79a9d9f85f932a1fd6dcddba335450b65ba4e6' into gingerbread-plus-aosp

* commit '1d79a9d9f85f932a1fd6dcddba335450b65ba4e6':
  Use correct size of GAMEPAD_KEYCODES
 2010-10-21 16:22:58 -07:00
Mathias Agopian
c0f95207f4 Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 2010-10-21 16:20:07 -07:00
Chia-chi Yeh
1e207d67fb am 044fcd64: am 703aae06: Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread 
Merge commit '044fcd64fe999dca0f986dfce9cb3b5b1da77f44'

* commit '044fcd64fe999dca0f986dfce9cb3b5b1da77f44':
  RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.
 2010-10-21 16:08:47 -07:00
Mathias Agopian
6af358e0a7 fix [3119687] [Maps][4.6.0] Force close in street view 
The EGLConfig attributes MUST be sorted, because they're used in a binary search.
A recent change introduced a bug where 2 of the configs had improperly
sorted attributes.

Change-Id: I1ac53e4463d62f27125ca9f82ed946e6c98ddba0
 2010-10-21 15:58:25 -07:00
Kenny Root
bc9c82fb79 Use correct size of GAMEPAD_KEYCODES 
Compute the actual number of indices in the GAMEPAD_KEYCODES instead of
the pure size in bytes.

Bug: 3121536
Change-Id: I71edbd8bf6eff2c8cc0ea5c6845362b3d1e06466
 2010-10-21 15:46:03 -07:00
Nick Kralevich
dcb4191350 am 9a430d8c: am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread 
Merge commit '9a430d8c0e376160f287e50cdad99177e69ec384'

* commit '9a430d8c0e376160f287e50cdad99177e69ec384':
  allow dumpstate to work for non-root users.
 2010-10-21 15:31:07 -07:00
John Huang
437a550f53 am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread 
Merge commit '33051ad1785a84ad5d814d6acf337b54d5fab36c'

* commit '33051ad1785a84ad5d814d6acf337b54d5fab36c':
  Fix connect duration for un-established SIP calls.
 2010-10-21 15:29:48 -07:00
Kenny Root
06dbe50a1a Initialized check in ZipFileRO::findEntryByName 
If a ZipFileRO object is uninitialized, the hash table will not have
been initialized. This condition wasn't checked in findEntryByName.

Bug: 3121109
Change-Id: Ib696e0e7e0cb4dd0fb2e456d6a847e5e8f4fe14e
 2010-10-21 15:25:12 -07:00
Marc Blank
64408a3878 Merge "Don't stop FlingRunnable when deltaY is rounded to zero" 2010-10-21 15:01:13 -07:00