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

23739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
1664611649 am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api" 2010-10-22 13:38:58 -07:00
Xavier Ducrohet
68a821e3f1 Merge "Make layoutlib use the prebuilt of layoutlib_api" 2010-10-22 13:28:39 -07:00
Brian Carlstrom
f98f11f49e Merge "Move improved cert chain handling from CertificateChainValidator to TrustManagerImpl" 2010-10-22 13:02:44 -07:00
Kenny Root
417518219a am faf53c0b: am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread 2010-10-22 12:31:26 -07:00
Justin Ho
e82f7efea3 am 02482e20: (-s ours) am 0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread 2010-10-22 12:31:22 -07:00
Dianne Hackborn
0952382eab am 4f734cab: am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread 2010-10-22 12:31:09 -07:00
Jeff Hamilton
ba0f58b141 am 8783b0e2: am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread 2010-10-22 12:30:54 -07:00
Kenny Root
e37e0f6ceb Merge "Reorganize PackageManager dump to avoid NPE" 2010-10-22 12:21:16 -07:00
Kenny Root
3da138760f am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread 2010-10-22 12:18:46 -07:00
Kenny Root
d0c1be3039 Merge "Exit immediately on some linklib failures" into gingerbread 2010-10-22 12:17:02 -07:00
Justin Ho
5f2b657328 am 0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread 2010-10-22 12:15:36 -07:00
Justin Ho
df8353fda0 Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread 2010-10-22 12:14:26 -07:00
Dianne Hackborn
0110cb557c am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread 2010-10-22 12:11:33 -07:00
Jeff Hamilton
17d9f81326 am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread 2010-10-22 12:11:23 -07:00
Romain Guy
52a2315a0a Merge "Don't use two different variables to refer to mSnapshot." 2010-10-22 11:33:53 -07:00
Wei-Ta Chen
c965ad732f Merge "Fix 3122139, where previewing an attachment for the second time will fail." 2010-10-22 11:22:59 -07:00
Daniel Sandler
d00f4a0ee0 Merge "Refinements to the notification icon area." 2010-10-22 11:15:04 -07:00
Dianne Hackborn
08c93a781d Merge "Update script for copying NDK headers/library." into gingerbread 2010-10-22 10:58:35 -07:00
Dmitri Plotnikov
2dd1f42b1d Merge "Moving cursor to the end of the search query when set explicitly." 2010-10-22 10:54:51 -07:00
Romain Guy
baea1f1bef Merge "Don't perform glCopyTextImage with coordinates outside the buffer." 2010-10-22 10:42:48 -07:00
Shimeng (Simon) Wang
98c396a5d2 Merge "Pass whether a scroll is user-scrolled or not to webkit." 2010-10-22 10:30:57 -07:00
Jeff Hamilton
ecfb0ff159 Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread 2010-10-22 10:20:06 -07:00
Joe Onorato
f6cf998109 Merge "Fix bug introduced in Change I856118d8." 2010-10-22 09:22:50 -07:00
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