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

33727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
2f7b9bf2d1 am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." 
* commit '5bb3129c7eabce34d7c1469826e1795d4b225bb3':
  Stagefright: Return error if codec takes too long to return a buffer.
 2011-08-01 14:10:39 -07:00
Jean-Baptiste Queru
0581cb2681 am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." 
* commit 'a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
  Stagefright: Return error if codec takes too long to return a buffer.
 2011-08-01 13:59:02 -07:00
Jean-Baptiste Queru
46b0fc9b2d am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." 
* commit '5e57c2cf83ef62e9887592b46a4c3352662fb988':
  Stagefright: Return error if codec takes too long to return a buffer.
 2011-08-01 13:55:45 -07:00
Jean-Baptiste Queru
ae182598a2 Merge "Stagefright: Return error if codec takes too long to return a buffer." 2011-08-01 13:43:07 -07:00
Eric Fischer
45923cdc11 am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'f01b3cfa9ac2869e3762a90917569186039a9665':
  Import revised translations.  DO NOT MERGE
 2011-08-01 11:19:59 -07:00
Eric Fischer
c1cf37d145 am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
  Import revised translations.  DO NOT MERGE
 2011-08-01 11:17:17 -07:00
Eric Fischer
061ad637f7 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-08-01 11:15:58 -07:00
Derek Sollenberger
9dd6682a5a Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-07-29 11:24:37 -07:00
Derek Sollenberger
33e86c7a91 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp 
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
 2011-07-29 14:16:18 -04:00
Robert Greenwalt
f9c0f5aa4f am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE 
* commit '1a230885b356256e91b3bf006ec72213ba6f8f76':
  Fix NPE when going from proxy to no proxy.
 2011-07-29 10:53:16 -07:00
Robert Greenwalt
4535086245 Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE 2011-07-29 10:51:32 -07:00
Derek Sollenberger
bbfbd30383 am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." 
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
  Adding an optional param to the SurfaceTexture constructor.
 2011-07-29 09:53:09 -07:00
Derek Sollenberger
adbba1fda0 am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." 
* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
  Adding an optional param to the SurfaceTexture constructor.
 2011-07-29 09:50:11 -07:00
Derek Sollenberger
0ed90b7894 Merge "Adding an optional param to the SurfaceTexture constructor." 2011-07-29 09:43:13 -07:00
Robert Greenwalt
67020c06fc am 0d8acea9: Make copy-constructor make deep copy. 
* commit '0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
  Make copy-constructor make deep copy.
 2011-07-29 09:20:51 -07:00
Derek Sollenberger
77c988cf4e Adding an optional param to the SurfaceTexture constructor. 
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
 2011-07-29 11:06:24 -04:00
Mike Lockwood
1dc4736a33 am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit '5f7203eb258503bc5d2ba29176bdf483a68a93b8':
  gps: Adding ip address for AGps
 2011-07-28 14:04:13 -07:00
Mike Lockwood
15c8cd406b am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit '5a27a7543edbd09a56e36d04adb4cfab922e6346':
  gps: Adding ip address for AGps
 2011-07-28 14:02:14 -07:00
Mike Lockwood
7779a44043 am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit 'bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
  gps: Adding ip address for AGps
 2011-07-28 14:00:27 -07:00
Mike Lockwood
7c95ffbbcc Merge "gps: Adding ip address for AGps" 2011-07-28 13:52:55 -07:00
Mike Lockwood
94a10fa407 am bf676d46: am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 
* commit 'bf676d460d1d1fc8923982006c38d0f6785daea8':
  GPS: Changes to enable on-demand data call flow for CDMA connections
 2011-07-28 13:27:27 -07:00
Mike Lockwood
b0e2827bce am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 
* commit '7083ed44ee72d4885d01c683eb745dc4bdfb74d8':
  GPS: Changes to enable on-demand data call flow for CDMA connections
 2011-07-28 13:25:34 -07:00
Mike Lockwood
956ddf5604 am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 
* commit '0ff79e88e2d90f80d0346e0485abe773ca85c44d':
  GPS: Changes to enable on-demand data call flow for CDMA connections
 2011-07-28 13:23:01 -07:00
Mike Lockwood
a9b8a0640e Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 2011-07-28 13:13:35 -07:00
Wink Saville
a6e07f0018 am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE 
* commit 'd20f60c8a71ca0aa853bc433f74b32dcfc98f984':
  Support of LTE Only mode
 2011-07-27 20:39:09 -07:00
Wink Saville
922649c544 Merge "Support of LTE Only mode" into honeycomb-LTE 2011-07-27 20:35:52 -07:00
Xavier Ducrohet
a5afd4fdd9 am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code" 
* commit '0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0':
  Remove Debug Code
 2011-07-27 18:40:49 -07:00
Xavier Ducrohet
126c631581 am cd01ad7c: am 20339b24: Merge "Remove Debug Code" 
* commit 'cd01ad7cc7813e3067826945c2a472602f1d3509':
  Remove Debug Code
 2011-07-27 18:38:50 -07:00
Xavier Ducrohet
7fa726e769 am 20339b24: Merge "Remove Debug Code" 
* commit '20339b24394be06c5bfe5157a4b35adc48f665eb':
  Remove Debug Code
 2011-07-27 18:36:17 -07:00
Xavier Ducrohet
eff4cc7766 Merge "Remove Debug Code" 2011-07-27 18:26:01 -07:00
Ramesh Sudini
30060f6c76 am 9a87deb5: DataConnection: Clear cid when entering inactive state. 
* commit '9a87deb538caed347621e57c5c83e0185a963bb4':
  DataConnection: Clear cid when entering inactive state.
 2011-07-27 16:32:48 -07:00
Xavier Ducrohet
fba44526c0 am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" 
* commit 'c682559d3c39aa4503d5c4d60ae046393aa45b79':
  DO NOT MERGE. may fix build on some version of gcc
 2011-07-27 14:03:35 -07:00
Xavier Ducrohet
e32af36b39 am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" 
* commit '4d21c7732c978a593dfa78f8da1fed7511b38e95':
  DO NOT MERGE. may fix build on some version of gcc
 2011-07-27 14:01:23 -07:00
Xavier Ducrohet
44f57c061a am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" 
* commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16':
  DO NOT MERGE. may fix build on some version of gcc
 2011-07-27 13:59:57 -07:00
Xavier Ducrohet
060c1a8f1a Merge "DO NOT MERGE. may fix build on some version of gcc" 2011-07-27 13:45:05 -07:00
Mathias Agopian
aa599086f8 DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
 2011-07-27 11:31:57 -07:00
Robert Greenwalt
5bf7250ab7 resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp 
Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
 2011-07-27 09:27:00 -07:00
Robert Greenwalt
de44ac30a0 Merge "Use dns proxy a bit." into honeycomb-LTE 2011-07-26 13:21:09 -07:00
John Michelau
709305efe7 am ac74551b: Disable name lookups for dumpstate calls to "iptables -L" 
* commit 'ac74551bb42eb2d6775d994357481113375574e7':
  Disable name lookups for dumpstate calls to "iptables -L"
 2011-07-25 22:26:38 -07:00
Wink Saville
f8c4987f71 am 32d106e1: Filter out addresses that are 0. 
* commit '32d106e154d0388ac13774fad3c58ff60ba9ae8f':
  Filter out addresses that are 0.
 2011-07-25 15:31:44 -07:00
Robert Greenwalt
7bec2ec07d Merge "Fix build." into honeycomb-plus-aosp 2011-07-25 14:05:23 -07:00
Dianne Hackborn
b52318eecc am 20bf46af: am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." 
* commit '20bf46af14130314ae1aeb1e5482c38556c8f0f8':
  frameworks/base: Cap the number of toasts that a package can post.
 2011-07-25 12:21:32 -07:00
Dianne Hackborn
8ba02b7ee8 am 9ce1ecdf: am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests" 
* commit '9ce1ecdfde98c7b5b5ec346b883df0a50d9722e1':
  frameworks/base: unlink death notifications of Vibrate requests
 2011-07-25 12:21:29 -07:00
Xavier Ducrohet
9ab8104b9c am 55775e5f: am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." 
* commit '55775e5f34af8d7c22ab3212c253b3a7d34a6f8a':
  Layoutlib_create flag -p: don't change all accesses to public.
 2011-07-25 12:21:17 -07:00
Kenny Root
66a2eec564 am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails." 
* commit 'e612c881ecf74770098aa9c07d4f0611ac982038':
  Continue idmap generation even if name lookup fails.
 2011-07-25 12:21:06 -07:00
Robert Greenwalt
476ceb890a resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp 
Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
 2011-07-25 12:08:19 -07:00
Wink Saville
c2263c2148 am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE 
* commit 'deb62be2e87b19e9bbbc668f8d9327b12dba4a3b':
  Configure RAT dependent retry pattern in GSM DCT.
 2011-07-24 09:13:26 -07:00
Kazuhiro Ondo
743c693bde am 4281817f: Allow suggestedRetryTime to indicate no retry is needed. 
* commit '4281817f6b624cb51926eb24fa78c68cd9431dce':
  Allow suggestedRetryTime to indicate no retry is needed.
 2011-07-24 09:11:42 -07:00
Wink Saville
0785a79c4e Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE 2011-07-24 09:11:28 -07:00
Svetoslav Ganov
f31250adb3 am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE 
* commit 'd1b4c10fedc04384f40ba7fc30115a1380ce014f':
  DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
 2011-07-22 17:07:28 -07:00