ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
25,030 Commits 2 Branches 0 Tags 54 MiB
02d85b5021
Commit Graph

25030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
1218a4a2c4 am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread 
* commit '47e6ccb65ab0088cf04809c234cdb5f747579c8c':
  Corrected MIFARE default key set
 2010-12-07 09:34:47 -08:00
Nick Pelly
95e4f1e8b3 Merge "Corrected MIFARE default key set" into gingerbread 2010-12-07 09:29:21 -08:00
Amith Yamasani
c6b9dbfa7a Merge "Prevent SearchView dropdown from showing up when SearchView is hidden." 2010-12-07 08:49:51 -08:00
Chung-yih Wang
a6a0900a10 am c9cc9ab5: am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread 
* commit 'c9cc9ab590ef879877e466c0b5f5823e11bb4c47':
  Fix SIP bug of different transport/port used for requests.
 2010-12-06 23:36:23 -08:00
Dirk Dougherty
5038be2912 am 0d49a4e8: am 0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram. 
* commit '0d49a4e838769252a313738e30fe78557f769a59':
  Doc change: fix href to axis_globe_inverted orientation diagram.
 2010-12-06 23:36:18 -08:00
Martijn Coenen
a36ab6760c am 7012f1eb: am 9a9706a2: Added missing ndef technology to getTech. 
* commit '7012f1eb3759a071f06cff69cf449adb4c62192b':
  Added missing ndef technology to getTech.
 2010-12-06 23:36:09 -08:00
Nick Pelly
c5b1e1b059 am 68cea273: am e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread 
* commit '68cea273299e59e28f9ccd87c520cc57cbf5adce':
  Added NdefFormatable tag, initial class with supported methods.
 2010-12-06 23:36:03 -08:00
satok
71e26786b0 Merge "Move IME button to right side by new desing spec" 2010-12-06 22:27:54 -08:00
Chung-yih Wang
b15b1a5a49 am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread 
* commit '5f86d7f50beba9f6327b8a04defe4e989a153d4a':
  Fix SIP bug of different transport/port used for requests.
 2010-12-06 22:10:29 -08:00
Jason Sams
040869fef5 Merge "API review cleanup." 2010-12-06 22:10:18 -08:00
Chung-yih Wang
823f079024 Merge "Fix SIP bug of different transport/port used for requests." into gingerbread 2010-12-06 22:07:59 -08:00
Dirk Dougherty
06fda4c65c am 0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram. 
* commit '0871ee0c6f43a7201ce49a66211c1c850eabeb6b':
  Doc change: fix href to axis_globe_inverted orientation diagram.
 2010-12-06 19:44:36 -08:00
Martijn Coenen
6a96815d8b am 9a9706a2: Added missing ndef technology to getTech. 
* commit '9a9706a213637b396226afff53c69927283609a7':
  Added missing ndef technology to getTech.
 2010-12-06 18:48:02 -08:00
Romain Guy
829512bbca Merge "Draw text decorations correctly." 2010-12-06 18:47:03 -08:00
Nick Pelly
d9e8d48bf5 am e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread 
* commit 'e58e8a715b2c9e4f2d053e0dc95e88690a54c059':
  Added NdefFormatable tag, initial class with supported methods.
 2010-12-06 18:44:13 -08:00
Nick Pelly
7592f8f4d8 Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread 2010-12-06 18:41:36 -08:00
Mathias Agopian
b0c48b8993 am 0484a673: am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread 
* commit '0484a673c5839d2be9e615e52c6a45febdf1127b':
  [3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
 2010-12-06 18:25:58 -08:00
Mathias Agopian
d6a9c7d2db am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread 
* commit 'daef0a040de7a9825bdbcba7b2eae66195e3a95f':
  [3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
 2010-12-06 18:22:57 -08:00
Mathias Agopian
f219856d5e Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread 2010-12-06 18:20:09 -08:00
Romain Guy
a3f05bec62 Merge "Correctly render text when coordinates are not integers. Bug #3225632" 2010-12-06 18:08:46 -08:00
James Dong
bfc0c66994 Merge "Log the exception cause for better problem analysis" 2010-12-06 17:50:20 -08:00
Nick Pelly
92860d91e9 am ea294903: am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread 
* commit 'ea294903ca4c298c44b50b473b9b10ae2b77c9e3':
  Remove ACTION_TAG_DISCOVERED from protected broadcast list.
 2010-12-06 17:48:38 -08:00
Mindy Pereira
0fd0cee7fe Merge "Make webview edges behave the same way abslistview overscroll edges do." 2010-12-06 17:47:11 -08:00
Nick Pelly
15296b5486 am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread 
* commit 'eba947a32a0233b3a2b384c580ab47bc7f27bb4d':
  Remove ACTION_TAG_DISCOVERED from protected broadcast list.
 2010-12-06 17:45:25 -08:00
Nick Pelly
2361dd244d Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread 2010-12-06 17:43:46 -08:00
Adam Powell
a6222b5306 Merge "Clean up button bar styles" 2010-12-06 17:41:47 -08:00
Dan Bornstein
aa2a7ce98b Merge "Propagate the concept of "packed opcode" values." 2010-12-06 17:25:44 -08:00
Scott Main
249d8e5163 Merge "cherry pick from gingerbread: I14e59a2281fac9a437ebf52df4c846e7a1e9cc4a Do not merge: Doc change: API diff report for gingerbread." 2010-12-06 17:24:24 -08:00
Scott Main
e6b8cae7d5 Merge "cherry pick from gingerbread: I08a2f67d324484ed05b956c540facd69f9028563 Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform." 2010-12-06 17:22:48 -08:00
Robert Greenwalt
860de4844a Merge "Make Proxy change broadcast sticky" 2010-12-06 16:51:32 -08:00
James Dong
cc212759db am 23b791cd: am d57fbe88: Fixed a race condition where some recording frames may not be released 
* commit '23b791cd0f725d188b84dabfd9eeab4e3775b869':
  Fixed a race condition where some recording frames may not be released
 2010-12-06 16:45:08 -08:00
Jean-Baptiste Queru
eb7e7e6783 am 465e88eb: am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout." 
* commit '465e88eb008408d4e655ca7bdd9c2b3ac305e54b':
  Changing connect and response timeout.
 2010-12-06 16:44:50 -08:00
James Dong
02524f3b89 am d57fbe88: Fixed a race condition where some recording frames may not be released 
* commit 'd57fbe887fabd027e644caeaa2139c863143a786':
  Fixed a race condition where some recording frames may not be released
 2010-12-06 15:36:04 -08:00
Brian Carlstrom
8cb2062740 Merge "Tracking dalvik.bytecode.* API changes" 2010-12-06 15:30:34 -08:00
Jesse Wilson
7b9a5af824 Merge "Test that we use proxies specified by system properties." 2010-12-06 15:24:28 -08:00
Fred Quintana
664ceeeb43 Merge "make sure that pending operation reconstituted from disk always have an extras bundle" 2010-12-06 15:18:58 -08:00
Jean-Baptiste Queru
86705c7804 Merge "Merge from gingerbread-plus-aosp" 2010-12-06 14:33:03 -08:00
Wei-Ta Chen
aae96409ac Merge "Add inPreferQualityOverSpeed into BitmapFactory.Options." 2010-12-06 14:32:32 -08:00
Jean-Baptiste Queru
e389632fe7 Merge from gingerbread-plus-aosp 
Change-Id: I154071687cdd51c28bb377ea3f1e818e96909b56
 2010-12-06 14:31:25 -08:00
Jean-Baptiste Queru
02bf8be47f Merge "Merge from gingerbread-plus-aosp" 2010-12-06 14:21:07 -08:00
James Dong
74d65f40d1 Merge "Remove check if the target video resolution is not supported by CameraSource and clean up Camera is CameraSource could not created." 2010-12-06 14:18:18 -08:00
Jean-Baptiste Queru
1f77831f21 Merge from gingerbread-plus-aosp 
Change-Id: I0f4726870be5791e62f98fb45afd82b20f8ffba0
 2010-12-06 14:08:53 -08:00
Gilles Debunne
4568aaa9dc Merge "Moved Paste popup window up in TextView" 2010-12-06 13:57:47 -08:00
Jean-Baptiste Queru
13fd790454 am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout." 
* commit '1ee2394edd4b90111f8174862c7c0f435e1a3634':
  Changing connect and response timeout.
 2010-12-06 13:46:19 -08:00
Jean-Baptiste Queru
64b556bdc9 am 1d67fa5b: Merge "Changing connect and response timeout." 
* commit '1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
  Changing connect and response timeout.
 2010-12-06 13:43:36 -08:00
Jean-Baptiste Queru
58b879a8f6 Merge "Changing connect and response timeout." 2010-12-06 13:39:19 -08:00
Irfan Sheriff
e166ea9ebf Merge "Update scan results when frequency band is set" 2010-12-06 12:47:31 -08:00
Nick Pelly
68edd6222e am cbf4e352: am 3d524e56: Merge gingerbread-nfc into gingerbread 
* commit 'cbf4e3525be80607c4d68630faf927ce6a717f72':
  First implementation of MifareUltralight
 2010-12-06 11:55:08 -08:00
Nick Pelly
5f87205146 resolved conflicts for merge of 28e8c66d to master 
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
 2010-12-06 11:50:47 -08:00
Guang Zhu
90b9841cef Merge "disable HW acceleration" 2010-12-06 11:36:54 -08:00