ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
19,982 Commits 2 Branches 0 Tags 54 MiB
73b0f04171
Commit Graph

19982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Morrill
73b0f04171 am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread 
* commit '5441a9ff2128cf2c5088974c74b79d2d1734f755':
  GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
 2010-12-14 11:28:50 -08:00
Dan Morrill
78bcc605dd Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread 2010-12-14 11:27:20 -08:00
Costin Manolache
03eb37e4dd am a848d344: Merge "Fix bug in permission grant system." into gingerbread 
* commit 'a848d3445090e114cbfe61f1c7449122a665fba6':
  Fix bug in permission grant system.
 2010-12-14 10:14:10 -08:00
Costin Manolache
eaefb93b61 Merge "Fix bug in permission grant system." into gingerbread 2010-12-14 10:07:26 -08:00
Roman Nurik
da03387dc8 am 0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread 
* commit '0a97435c8d776746bb3dcf16824e2cc81eee20aa':
  Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
 2010-12-13 19:15:28 -08:00
Roman Nurik
992b150891 Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread 2010-12-13 19:12:42 -08:00
Brad Fitzpatrick
9336c2b4bf am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 
* commit '0927c9026537166cec36b2f9bb8a764ef8a7c606':
  Fix StrictMode javadoc copy/paste error.
 2010-12-13 15:27:25 -08:00
Brad Fitzpatrick
7ed1f656a6 Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 2010-12-13 15:25:09 -08:00
Nick Kralevich
82a2c8230a am 9dbef975: Merge "Avoid leaking sockets." into gingerbread 
* commit '9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
  Avoid leaking sockets.
 2010-12-13 15:05:20 -08:00
Nick Kralevich
7fcd6df049 Merge "Avoid leaking sockets." into gingerbread 2010-12-13 15:03:28 -08:00
Dianne Hackborn
b8083135a8 am e4a59519: Fix issue #3154576: battery stats checkin should include UID -> packages+ map 
* commit 'e4a5951925f16f18dae91ed65567e96528f17fee':
  Fix issue #3154576: battery stats checkin should include UID -> packages+ map
 2010-12-13 14:37:09 -08:00
Jean-Baptiste Queru
b7f42b567b am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master 
* commit 'e78a000955c283509ee8a21b8b7e448060ac8dd8':
  Added dropbox broadcast notification
 2010-12-13 13:10:23 -08:00
Jean-Baptiste Queru
fae89a5076 resolved conflicts for merge of 4b94c451 to stage-korg-master 
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
 2010-12-13 13:06:13 -08:00
Jean-Baptiste Queru
3436320d8f Merge "Added dropbox broadcast notification" 2010-12-13 12:34:48 -08:00
Martijn Coenen
87f2c87d11 am e3f6336b: Fixed API for active NDEF reading and NDEF formatting. 
* commit 'e3f6336bcffc250da90ec864bccfa73ad1d016b9':
  Fixed API for active NDEF reading and NDEF formatting.
 2010-12-13 08:14:01 -08:00
Jeff Hamilton
29ffaa34fc am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup. 
* commit '641dd62155fd2eeddd93b2036154b13c05b70ba2':
  First pass at advanced NFC tag dispatching APIs and other cleanup.
 2010-12-11 20:58:38 -08:00
Martijn Coenen
89c62f3e1f am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect. 
* commit 'b79173f6602359d00a1a89f4d6505a44d461d796':
  Changed technology close() to reconnect to the tag instead of physical disconnect.
 2010-12-10 20:40:40 -08:00
Martijn Coenen
7deb35efd0 am fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes. 
* commit 'fc5a3b6cfb85679e82a39730c7154b55b0711a0c':
  Changed transceive on all technologies to "raw", except for Mifare classes.
 2010-12-10 20:40:34 -08:00
Martijn Coenen
f3147d384f am 3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state. 
* commit '3300e4c3ea2f2317532ded6f9e79d6ad9e038679':
  Implemented isWritable() to indicate NDEF capability container r/w state.
 2010-12-10 20:40:26 -08:00
Nick Pelly
0ee0b92202 am ae56a851: Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread 
* commit 'ae56a851624c2b2e78da8a2c339d2caa64c4f981':
  Make getSystemService(NFC_SERVICE) the NFC entry point.
 2010-12-10 17:19:45 -08:00
Nick Pelly
3cb8da45a2 Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread 2010-12-10 17:18:00 -08:00
Megha Joshi
35ff21301e am 7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread 
* commit '7a1f15b1497ba2a79243448f6ac5617264f8c8d3':
  Integrating webinar hosting with developer.android.com
 2010-12-10 12:33:59 -08:00
Megha Joshi
ebce77e665 Merge "Integrating webinar hosting with developer.android.com" into gingerbread 2010-12-10 12:30:35 -08:00
Eric Fischer
c95e5288c5 am 767926bb: Import revised translations. DO NOT MERGE 
* commit '767926bbe90358bc3857f4b78f54c8cdacfb8773':
  Import revised translations.  DO NOT MERGE
 2010-12-10 10:03:55 -08:00
Jean-Baptiste Queru
63fa070253 am a218e014: reconcile with open-source gingerbread 
* commit 'a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
 2010-12-10 08:49:37 -08:00
Wink Saville
1999478105 am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card." 
* commit 'd0ffef4b43594e540cb867da18d4403b4f583622':
  Fix for phone app crash in Icc Card.
 2010-12-09 14:02:09 -08:00
Wink Saville
3c41ac797a am 19b23afa: Merge "Fix for phone app crash in Icc Card." 
* commit '19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
  Fix for phone app crash in Icc Card.
 2010-12-09 13:58:26 -08:00
Wink Saville
d4d8eb5060 Merge "Fix for phone app crash in Icc Card." 2010-12-09 13:50:28 -08:00
Jean-Baptiste Queru
03e3c1afbd am d9c17cc1: merge from gingerbread 
* commit 'd9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
  Add more checks for bad values to protect from corrupt files.
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
 2010-12-09 10:45:29 -08:00
Jean-Baptiste Queru
c288fb7ef3 reconcile with open-source gingerbread 
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
 2010-12-09 10:18:23 -08:00
Jean-Baptiste Queru
062afde24e merge from gingerbread 
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
 2010-12-09 09:11:06 -08:00
Wink Saville
92f18fbd33 am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 
* commit '0a5ae453e50144b31c7f544714feb5bbc7b77d18':
  frameworks/base/telephony: Release wakelock on RIL request send error
 2010-12-08 21:57:03 -08:00
Wink Saville
3495638091 am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 
* commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
  frameworks/base/telephony: Release wakelock on RIL request send error
 2010-12-08 21:53:24 -08:00
Wink Saville
bf741e9dfc Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 2010-12-08 21:37:38 -08:00
Mathias Agopian
18c35abd39 am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread 
* commit 'e1752f41d34249c891564889b07963262b1bd8bf':
  fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
 2010-12-08 16:20:23 -08:00
James Dong
a61fed0c84 am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread 
* commit '1f5b133ae29090f1807be392874f6b7a5d92c6d4':
  When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
 2010-12-08 16:20:16 -08:00
Mathias Agopian
9215cabfa8 Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread 2010-12-08 16:17:02 -08:00
Mathias Agopian
e0be194c7b am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread 
* commit '74da537f80ba36c1279c04fcb85d89fc38c246a6':
  [317580] fix issue where the screen wouldn't be rotated properly in bypass mode
 2010-12-08 16:15:08 -08:00
James Dong
a8e4eb7e51 Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread 2010-12-08 16:14:27 -08:00
Mathias Agopian
c3ce880972 fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo 
eglQueryContext(..., EGL_CONFIG_ID, ...) is dereferencing an uninitialized pointer
due to a typo.

Change-Id: I100addf3150f19cb6dfbce9987fb5239dd240878
 2010-12-08 15:34:02 -08:00
Mathias Agopian
fc84e8269b Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread 2010-12-08 15:08:33 -08:00
Brad Fitzpatrick
638ea56494 am 36af7943: Fix malformed Javadoc. 
* commit '36af79434fb62c26238132eaeda2ec5e732f3c2f':
  Fix malformed Javadoc.
 2010-12-08 13:23:03 -08:00
Nick Pelly
1f5a356bd1 am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread 
* commit '40ddd4a64908c0cbe4970d2ba1703f74717620a8':
  Implemented getSize() to return max ndef size.
 2010-12-07 22:57:23 -08:00
Nick Pelly
ce561faf57 Merge "Implemented getSize() to return max ndef size." into gingerbread 2010-12-07 22:55:21 -08:00
Martijn Coenen
8d591a9d1e am 5289b91c: Implement ndef formatting. 
* commit '5289b91c885158094988a9a7b51b3139565eb639':
  Implement ndef formatting.
 2010-12-07 22:35:01 -08:00
Wink Saville
e7bdce57c2 am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 
* commit 'a00d89e824c523c51955176b61e50472828fd8b1':
  Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
 2010-12-07 22:22:01 -08:00
Wink Saville
9d6ca87ee1 am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 
* commit '2b858caecb3c293c47b48eed12a55a49e3039874':
  Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
 2010-12-07 22:18:14 -08:00
Dianne Hackborn
759355403e am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread 
* commit '42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
  Add more checks for bad values to protect from corrupt files.
 2010-12-07 22:07:40 -08:00
Dianne Hackborn
84d86eb52b Merge "Add more checks for bad values to protect from corrupt files." into gingerbread 2010-12-07 22:04:38 -08:00
Wink Saville
b56a7b062d Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 2010-12-07 21:57:53 -08:00