ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,924 Commits 2 Branches 0 Tags 54 MiB
372c56e98b
Commit Graph

19924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
372c56e98b am 4153bf3a: Merge "[3171580] don\'t automatically log GraphicBuffer allocation failures" into gingerbread 
* commit '4153bf3a259624a2f2dc497b77b225a1fb517abc':
  [3171580] don't automatically log GraphicBuffer allocation failures
 2010-12-07 14:20:09 -08:00
Mathias Agopian
abf06a734f Merge "[3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread 2010-12-07 14:17:47 -08:00
Jeff Hamilton
a023749ff2 am 0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread 
* commit '0f74afbbf4bd0fe35889e26fc46f94c4ca6382d8':
  Remove Type X Tags from the top-level API.
 2010-12-07 14:04:40 -08:00
Daniel Sandler
b8f98c9045 am f340d082: Merge "More precise status bar battery icons." into gingerbread 
* commit 'f340d082b8488de6f131c1e5932cd3abc16b47c1':
  More precise status bar battery icons.
 2010-12-07 14:01:31 -08:00
Jeff Hamilton
3846f7a9b6 Merge "Remove Type X Tags from the top-level API." into gingerbread 2010-12-07 13:59:29 -08:00
Jean-Baptiste Queru
82b2a4b94c am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master 
* commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
  Strings for NI position request are moved to resources
 2010-12-07 13:02:22 -08:00
Jean-Baptiste Queru
f83c5e5eee resolved conflicts for merge of 78742e01 to stage-korg-master 
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
 2010-12-07 12:51:49 -08:00
Daniel Sandler
6f14ecd361 Merge "More precise status bar battery icons." into gingerbread 2010-12-07 12:03:36 -08:00
Jean-Baptiste Queru
d4d1d5a02b Merge "Strings for NI position request are moved to resources" 2010-12-07 12:01:25 -08:00
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
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
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
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
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
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
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
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
Jean-Baptiste Queru
32f0f53d40 am 005dd44b: am 864b1e00: Merge "NumberPicker: Set formatter local value to US." 
* commit '005dd44b756ccd5812ac55f07f93e3e16ce2be0b':
  NumberPicker: Set formatter local value to US.
 2010-12-06 11:05:47 -08:00
Jean-Baptiste Queru
9d2e1882cb am 864b1e00: Merge "NumberPicker: Set formatter local value to US." 
* commit '864b1e007dc741ec10c23cabc0271f97a5b8c598':
  NumberPicker: Set formatter local value to US.
 2010-12-06 11:03:11 -08:00
Jean-Baptiste Queru
907333ec69 Merge "NumberPicker: Set formatter local value to US." 2010-12-06 10:57:04 -08:00
Jeff Hamilton
a01ed4d6ac am c1576ad6: Update the docs to clarify the ordering constraints. 
* commit 'c1576ad627d3d2b2d3c0764c605ebbf3ddc24401':
  Update the docs to clarify the ordering constraints.
 2010-12-05 20:03:59 -08:00
Nick Pelly
be0ed98e3a am 3d524e56: Merge gingerbread-nfc into gingerbread 
* commit '3d524e562606e7994ede3429b37937f40f94cd41':
  First implementation of MifareUltralight
 2010-12-05 18:13:10 -08:00
Nick Pelly
4995b0cd7e Merge gingerbread-nfc into gingerbread 2010-12-05 18:08:16 -08:00
Nick Pelly
3d3f99de94 am d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread 
* commit 'd8c323321c28a0a5ff70c6e0694aa822edca4005':
  Fixed technology name typo's.
  Implement historical bytes / attrib on IsoDep
  Provide system code and manufacturer code for Felica tech.
  Fixed NfcAdapter init and getTechnology().
  Secure Element access implementation
  Rough first pass at the NFC technology API.
  Revert "Merge "Remove the My Tag feature." into gingerbread"
 2010-12-05 14:49:00 -08:00
Nick Pelly
54c9d4a79a Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread 2010-12-05 14:46:29 -08:00
Nick Pelly
130f48f5bc Merge branch gingerbread-nfc into gingerbread. 
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-12-05 14:45:29 -08:00
Irfan Sheriff
fe1b942d68 am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread 
* commit 'bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
  DO NOT MERGE Avoid nullifying dhcp target
 2010-12-04 23:45:18 -08:00
Irfan Sheriff
10484ac22a Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread 2010-12-03 17:58:17 -08:00
Mathias Agopian
678bdd6349 [3171580] don't automatically log GraphicBuffer allocation failures 
some of these failures are not fatal and even expected in some cases
so they should not emit a dump in the log in those cases.

Change-Id: Idcfa252e3bfa9d74e27fe4ad8f8623aa01aa9c5e
 2010-12-03 17:33:09 -08:00
Mathias Agopian
644bb2a29e [3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL 
(there are multiple bugs this should fix)

we now use the EGL_NATIVE_VISUAL_ID of a config to set
the ANativeWindow's format from eglCreateWindowSurface(),
this guarantees that the surface's format will match
whatever EGLConfig the user chose.

this should fix all current and future config/surface format
mismatch and allow users to easily select 32-bits surfaces.

Change-Id: I3835d0eb70c75eeecded3c3509a0a8207554c98b
 2010-12-03 14:15:40 -08:00
Hung-ying Tyan
d76844ac80 am e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread 
* commit 'e2abd103a2d311738ff1dd1e1d9b8e6c52aa870c':
  Set AudioGroup mode according to audio settings
 2010-12-02 17:56:40 -08:00
Hung-ying Tyan
33f4f32967 Merge "Set AudioGroup mode according to audio settings" into gingerbread 2010-12-02 17:50:33 -08:00
Jean-Baptiste Queru
438267d997 am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master 
* commit '4a88013a4a06a9ea80e8419f94694936e6b013f0':
  Preserve flags field of event passed to injectKeyEvent()
 2010-12-02 15:21:35 -08:00
Jean-Baptiste Queru
a4130babac resolved conflicts for merge of bf1439c5 to stage-korg-master 
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
 2010-12-02 15:16:53 -08:00
Jean-Baptiste Queru
7a039f9994 Merge "Preserve flags field of event passed to injectKeyEvent()" 2010-12-02 14:56:13 -08:00
Xia Wang
784a43fef7 am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread 
* commit '3591bebd5957a8547fc54659179a19440636e7f9':
  Restore Wi-Fi configuration after the test. DO NOT MERGE
 2010-12-02 13:44:54 -08:00
Xia Wang
147abbd117 Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread 2010-12-02 13:40:23 -08:00
James Dong
dc76df85d7 am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread 
* commit 'd4c5478a8664f64ff66db9ae25250afac78b7a74':
  Be conservative in estimating the file size limit.
 2010-12-02 10:21:06 -08:00
James Dong
11cdf95594 Merge "Be conservative in estimating the file size limit." into gingerbread 2010-12-02 10:13:36 -08:00
Jean-Baptiste Queru
34f9603301 am 40eade14: Merge from open-source master 
* commit '40eade14bb87d24903588de04449fdfe2e1795cb':
  Fix crash by "adb shell pm list permissions -f|-s"
 2010-12-02 07:59:52 -08:00
Jean-Baptiste Queru
9ee1ec38a6 am 077bc4ac: Merge from open-source master 
* commit '077bc4ac019ad33abd613448e11d3ad501218991':
  Fix HTTP redirect missing statuscode 303 and 307
 2010-12-02 07:59:49 -08:00
Jean-Baptiste Queru
4bdada2c61 Merge from open-source master 
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
 2010-12-02 07:55:06 -08:00