ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
20,478 Commits 2 Branches 0 Tags 54 MiB
db7b742f65
Commit Graph

20478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
db7b742f65 am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread 
* commit '919853ce244f853966817d4adb2f3b7b6e4bbe74':
  Prevent SurfaceFlinger from using layer token 31.
 2011-02-27 15:44:36 -08:00
Jamie Gennis
eafc33acff Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread 2011-02-27 15:27:22 -08:00
Samyeoul Choi
2a4d60e301 am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint 
* commit '092238916fd5d10090c0bcad33644778a1f366e7':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
 2011-02-25 12:08:08 -08:00
Svetoslav Ganov
c93b9968b2 am 9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gingerbread 
* commit '9e5b1a49022d08aee8653fd34f3a8cd878618aa5':
  Use different version of CLDR data in DatePicker
 2011-02-25 00:09:03 -08:00
Svetoslav Ganov
c174c6696c Merge "Use different version of CLDR data in DatePicker" into gingerbread 2011-02-24 23:56:52 -08:00
Jeff Hamilton
5f40f7c53f am 5644d0e1: Support for NDEF on iCODE. 
* commit '5644d0e18ad847b66a8cb4f185cb28edebe75d88':
  Support for NDEF on iCODE.
 2011-02-24 20:30:14 -08:00
Xavier Ducrohet
a79113be34 am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread 
* commit '1175ef7e2e4f68532d8ade672d7f5502d9946ce4':
  LayoutLib: Adapt the HC layoutlib to GB. do not merge.
 2011-02-24 16:21:41 -08:00
Xavier Ducrohet
c806fe1560 resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp 
Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7
 2011-02-24 16:15:11 -08:00
Xavier Ducrohet
be82ce21d5 Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread 2011-02-24 14:44:58 -08:00
Xavier Ducrohet
e90a80a73d Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread 2011-02-24 14:44:52 -08:00
repo sync
492301161b resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp 
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
 2011-02-24 09:58:25 -08:00
Alon Albert
1f3dcff801 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread 2011-02-24 09:20:46 -08:00
Jason Chen
0b270d3d0e am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
 2011-02-23 18:03:34 -08:00
Jason Chen
9281fda8e0 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 2011-02-23 17:23:53 -08:00
Jamie Gennis
a5c7de658a am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread 
* commit 'fa238f033203f8e722b060af3f0095762b134f37':
  egl: fixes for object refcounts
 2011-02-23 12:46:57 -08:00
Jamie Gennis
8a5d77b8e5 Merge "egl: fixes for object refcounts" into gingerbread 2011-02-23 12:30:55 -08:00
Justin Ho
3c48c35ec7 am 9208875e: Updated iconography for network status and adding 4G assets 
* commit '9208875e92ec190d49864b92823dd7011b9b443a':
  Updated iconography for network status and adding 4G assets
 2011-02-22 21:19:05 -08:00
Alon Albert
9427552e6a am ccc802e1: Merge "Support quoted parameters" into gingerbread 
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
  Support quoted parameters
 2011-02-22 21:18:52 -08:00
Michael I. Gold
3e52713ffd egl: fixes for object refcounts 
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
 2011-02-22 18:15:08 -08:00
Alon Albert
61d36d7cc4 Merge "Support quoted parameters" into gingerbread 2011-02-22 10:31:26 -08:00
Maarten Hooft
b36b9f3446 am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '99cca89f41e500f8b39fd75eb17f337422c4ac90':
  Import revised translations.  DO NOT MERGE
 2011-02-18 15:22:48 -08:00
Romain Guy
8ca2b0d566 am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 
* commit 'a2090bea4824cf153c4d9c735ee779613cf2e3d7':
  Fix for #12945: ProgressBar.setMax() will always redraw.
 2011-02-18 08:06:01 -08:00
Romain Guy
d4cd30cbcf am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 
* commit '7118bdec523568842e70555e353951df9f2596fd':
  Fix for #12945: ProgressBar.setMax() will always redraw.
 2011-02-18 07:53:50 -08:00
Romain Guy
2151cef42c Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 2011-02-17 22:40:33 -08:00
Maarten Hooft
1db90719b3 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-17 17:17:40 -08:00
Andreas Huber
38519517c5 am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests. 
* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
  DO NOT MERGE: Respond to RTSP server->client requests.
 2011-02-16 14:24:53 -08:00
Robert Greenwalt
c6ef3a4c15 am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 
* commit '3259d8853760a72b811757e1711119d041962a1c':
  DO NOT MERGE - backport of l92a02b31 from master
 2011-02-16 10:51:04 -08:00
Robert Greenwalt
b9ce99c940 Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 2011-02-16 10:44:26 -08:00
Alon Albert
92b31b9c0b am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 
* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
  DO NOT MERGE - Clear backoffs on reconnect
 2011-02-16 10:24:15 -08:00
Alon Albert
b088416f08 Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -08:00
daniel_tomas
380b267bf3 am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation 
* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
  New API added in NfcAdapter to enable/disable SE card emulation
 2011-02-16 09:41:00 -08:00
Nick Pelly
a112a94833 am 1df862a4: Minor doc update. 
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.
 2011-02-16 09:23:08 -08:00
Andreas Huber
d145fc1770 am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 
* commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
 2011-02-16 09:02:08 -08:00
Andreas Huber
071969e5d3 Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 2011-02-16 08:50:37 -08:00
Robert Ly
3520ddc132 am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread 
* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
  Adding package summary for nfc.tech package
 2011-02-15 22:54:52 -08:00
Robert Ly
08f2087b06 Merge "Adding package summary for nfc.tech package" into gingerbread 2011-02-15 17:44:56 -08:00
John Wang
e85d8d6620 am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread 
* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
  Only decode EXT1 tag when it is available.
 2011-02-15 12:38:38 -08:00
John Wang
6ac7359b83 Merge "Only decode EXT1 tag when it is available." into gingerbread 2011-02-15 12:34:37 -08:00
Andreas Huber
81147459b8 am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers. 
* commit 'd1ba051a465518fa4325c364ed77025fc1a2a794':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
 2011-02-15 11:49:03 -08:00
Scott Main
1f14e87b4c am d4952380: fix md5sum for windows installer 
* commit 'd49523809714b04636a9ac43de1c508ed1dbfc38':
  fix md5sum for windows installer
 2011-02-14 09:14:12 -08:00
Robert Ly
6619488871 am 322891c6: Doc change: nfc dev guide 
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
  Doc change: nfc dev guide
 2011-02-11 13:18:31 -08:00
Jean-Baptiste Queru
fd32f41763 am 6901f963: am 93552de8: Merge "stubs" 
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
  stubs
 2011-02-11 10:04:53 -08:00
Jean-Baptiste Queru
a240734bae am 93552de8: Merge "stubs" 
* commit '93552de8e305027fb003401e347b9493c64c981f':
  stubs
 2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
3edab5a44e Merge "stubs" 2011-02-11 09:39:46 -08:00
Steve Block
58c40337d0 stubs 
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
 2011-02-11 09:33:40 -08:00
Jamie Gennis
8a08392833 Prevent SurfaceFlinger from using layer token 31. 
Bug: 2964479
Change-Id: I81e948924bff35b8b300d409f2c09f3779bcdeec
 2011-02-10 16:18:36 -08:00
Gilles Debunne
4dffae1718 am 2050de5b: Text selection is broken. 
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
  Text selection is broken.
 2011-02-09 16:49:42 -08:00
Wink Saville
614a618526 am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation" 
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
  Telephony: Fix cb sms implementation
 2011-02-09 13:45:37 -08:00
Wink Saville
76615d7b6f am 6e25789f: Merge "Telephony: Fix cb sms implementation" 
* commit '6e25789fbe7ac283021156b17f406acb48850292':
  Telephony: Fix cb sms implementation
 2011-02-09 13:42:45 -08:00
Wink Saville
0db20b9d86 Merge "Telephony: Fix cb sms implementation" 2011-02-09 13:09:24 -08:00