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

31619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
caa8c8088c am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 
* commit 'a74887e87c720fd100f10b2e69a027c493036e20':
  Lazy initialization must be synchronized to avoid parallel instances cretation.
 2011-03-15 12:05:37 -07:00
Brad Fitzpatrick
f9bb6d0586 am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement." 
* commit '9ac9b28576834b69561a48a4050e7ad027543bcd':
  Removing self-assignment statement.
 2011-03-15 12:05:33 -07:00
Brad Fitzpatrick
f50ebc0033 am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in copying code." 
* commit 'b01fc9fb450df941ae7c072247b67c9be32cd8b8':
  Fixing self-assignment in copying code.
 2011-03-15 12:05:29 -07:00
Xavier Ducrohet
7f0dbabda9 am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 
* commit 'f89c37295db5df34c014e0791c976cfa94509068':
  Merge 6f2fb570 from honeycomb. do not merge.
 2011-03-15 11:57:35 -07:00
Xavier Ducrohet
47b876d150 am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 
* commit '405cb57019e0b0b9c2049c2b06537c0f4981fc37':
  Merge c12b4093 from honeycomb. do not merge.
 2011-03-15 11:57:30 -07:00
Brad Fitzpatrick
d516c74c42 resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp 
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
 2011-03-15 11:54:46 -07:00
Brad Fitzpatrick
f17316f2d7 am b7d573e9: am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit 'b7d573e901e07fc249df0bc531cf94c574107556':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:43:08 -07:00
Brad Fitzpatrick
75fb24f4d1 am c86ea5e2: am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit 'c86ea5e260a70f7c48890da702f86466d587904e':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:43:03 -07:00
Brad Fitzpatrick
ba82770293 am 33dd1bae: am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long." 
* commit '33dd1bae6ef16ed1cdc4d9f82f0c608cc7601af6':
  Fixing improper boxing to Integer instead of Long.
 2011-03-15 11:42:58 -07:00
Brad Fitzpatrick
64505d4233 am cd7dfcec: (-s ours) am 40b207c1: Merge "Using proper key for removing object from the map." 
* commit 'cd7dfcec4b9a059cd67783c8abed72f74c03c4b0':
  Using proper key for removing object from the map.
 2011-03-15 11:42:53 -07:00
Brad Fitzpatrick
48f51d8243 am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 
* commit '56c4c442c0309aa91958dee6b6ed2d65db7ba17d':
  Lazy initialization must be synchronized to avoid parallel instances cretation.
 2011-03-15 11:37:32 -07:00
Brad Fitzpatrick
a71e8d2937 am b98c8fca: Merge "Removing self-assignment statement." 
* commit 'b98c8fca954718cb61d6513e623a78f1b0bd0edb':
  Removing self-assignment statement.
 2011-03-15 11:37:29 -07:00
Brad Fitzpatrick
1f604f42e5 am 8b5345fb: Merge "Fixing self-assignment in copying code." 
* commit '8b5345fb3647fee0ec5882537b6a68bb90f4ac1b':
  Fixing self-assignment in copying code.
 2011-03-15 11:37:25 -07:00
Brad Fitzpatrick
2cc788c9a6 am c73c4a36: (-s ours) am b37f7e59: Merge changes I81fc2f90,I5e7fd759 
* commit 'c73c4a36d2cf5eb3eeeca97caca25c3920dbcfa0':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 11:37:12 -07:00
Xavier Ducrohet
acfbfbc079 am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 
* commit '48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae':
  Merge 6f2fb570 from honeycomb. do not merge.
 2011-03-15 11:37:01 -07:00
Xavier Ducrohet
2f0747bc6e am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 
* commit '14e1f523c673315cbc3167448ce9252b455d252c':
  Merge c12b4093 from honeycomb. do not merge.
 2011-03-15 11:36:57 -07:00
Brad Fitzpatrick
fe95159c8e am 9a01a2f2: Merge "Fixing self-assignment in cloning code." 
* commit '9a01a2f2720632aa9cc230a4ebb0ed7aee762eec':
  Fixing self-assignment in cloning code.
 2011-03-15 11:33:40 -07:00
Brad Fitzpatrick
29c137d125 am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit '7972e382802348e7914c14507426af450aa7e30c':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:33:32 -07:00
Brad Fitzpatrick
0a81d3e158 am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit '38c6e31c88dec226271e02fbfed675181ae938b7':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:33:28 -07:00
Brad Fitzpatrick
8e67eefe36 am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long." 
* commit '29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
  Fixing improper boxing to Integer instead of Long.
 2011-03-15 11:30:08 -07:00
Brad Fitzpatrick
a76bec273a am 40b207c1: Merge "Using proper key for removing object from the map." 
* commit '40b207c131e224554e30cde30fe4ee49817432ee':
  Using proper key for removing object from the map.
 2011-03-15 11:30:04 -07:00
Brad Fitzpatrick
16dfc303e2 am b37f7e59: Merge changes I81fc2f90,I5e7fd759 
* commit 'b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 11:29:56 -07:00
Xavier Ducrohet
124eb84c5e Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:16 -07:00
Xavier Ducrohet
1d0284b613 Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:07 -07:00
Brad Fitzpatrick
6c8eb099e4 Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 2011-03-15 11:22:43 -07:00
Brad Fitzpatrick
3b2122f9a2 Merge "Removing self-assignment statement." 2011-03-15 11:19:23 -07:00
Brad Fitzpatrick
47c8e50c57 Merge "Fixing self-assignment in copying code." 2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
03af2d42a4 Merge "Fixing self-assignment in cloning code." 2011-03-15 11:15:19 -07:00
Brad Fitzpatrick
201c38b39c Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:13:01 -07:00
Brad Fitzpatrick
9860849b8d Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:12:15 -07:00
Dianne Hackborn
780b0476c9 am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit 'cffde30fc10ecdfca53877fbee61525028eb47ba':
  Add some debug code to try to track down issue 3183612
 2011-03-15 11:03:42 -07:00
Brad Fitzpatrick
5a98e39e1c Merge "Fixing improper boxing to Integer instead of Long." 2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
d42a9b74bc Merge "Using proper key for removing object from the map." 2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
c53163a4a3 Merge changes I81fc2f90,I5e7fd759 
* changes:
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 10:56:16 -07:00
Dianne Hackborn
152f8c41d0 am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
  Add some debug code to try to track down issue 3183612
 2011-03-15 10:52:27 -07:00
Robert Greenwalt
08f43db273 am eea577e0: Remove redundant network types. 
* commit 'eea577e0c41babadf4f07fd9d5e822bd7faa9385':
  Remove redundant network types.
 2011-03-15 10:48:22 -07:00
Jamie Gennis
05f6941e51 am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1 
* commit '41a894ad1379a046b0b7471a33d974c6241a91a9':
  SurfaceTextureClient: Add ISurfaceTexture getter.
 2011-03-15 10:40:26 -07:00
Jamie Gennis
07294053e7 am 1b7dbf45: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '1b7dbf45f18bea3346a8296cbfd5c1a51cf3e01d':
 2011-03-15 10:40:24 -07:00
Jamie Gennis
8d7cd7c633 am c8bff5d9: ANativeWindow: add query for the concrete type. 
* commit 'c8bff5d9b72482487e6e62c72236bf14abed2aaf':
  ANativeWindow: add query for the concrete type.
 2011-03-15 10:40:21 -07:00
Jamie Gennis
0a69ff8981 am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1 
* commit '75597105e6e03f656bdc1e40acac44afb9a3b01b':
  SurfaceTextureClient: Add ISurfaceTexture getter.
 2011-03-15 10:38:00 -07:00
Jamie Gennis
636452b7f4 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-15 10:37:59 -07:00
Jamie Gennis
5d8fcc583e ANativeWindow: add query for the concrete type. 
This change adds a query to the ANativeWindow interface for getting the
concrete type of the ANativeWindow.

Bug: 4086509
Change-Id: I64aa86d72fbca3b52a98e1fc35608737781a3178
 2011-03-15 10:37:57 -07:00
Jamie Gennis
efeeec2564 am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1 
* commit '02805a40d44fa038549e771ec9a15f52b5fa3538':
  ANativeWindow: add query for the concrete type.
 2011-03-15 10:36:01 -07:00
Jamie Gennis
f9a20d77fa Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1 2011-03-15 10:34:35 -07:00
Jamie Gennis
3c742ef11b Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1 2011-03-15 10:33:35 -07:00
Dianne Hackborn
bebc96ba62 Merge "Add some debug code to try to track down issue 3183612" into gingerbread 2011-03-15 10:29:04 -07:00
Svetoslav Ganov
60b25c2c28 am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1 
* commit 'e65711b21f1b351f28d4f04819e1e05a9ac8dfee':
  Tapping on the week number sends the DatePicker to epoch start.
 2011-03-14 23:15:24 -07:00
Svetoslav Ganov
f15a7cdbfb Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1 2011-03-14 23:13:49 -07:00
satok
3b2e2da8ab am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1 
* commit 'b02b8369c6549417561e2ae1467b615645b5d04c':
  Remove a workaround for the data inconsistency of SystemProperties
 2011-03-14 22:47:11 -07:00
satok
6fbddcf3af Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1 2011-03-14 22:44:23 -07:00