drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,668 Commits 1 Branch 0 Tags
Commit Graph

30668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
48a2a5ad1b Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:16 -07:00
Xavier Ducrohet
14e1f523c6 Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:07 -07:00
Brad Fitzpatrick
8d25eab105 Merge "Releasing lock even if exception is thrown." 2011-03-15 11:23:44 -07:00
Brad Fitzpatrick
56c4c442c0 Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 2011-03-15 11:22:43 -07:00
Brad Fitzpatrick
b98c8fca95 Merge "Removing self-assignment statement." 2011-03-15 11:19:23 -07:00
Brad Fitzpatrick
8b5345fb36 Merge "Fixing self-assignment in copying code." 2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
9a01a2f272 Merge "Fixing self-assignment in cloning code." 2011-03-15 11:15:19 -07:00
Brad Fitzpatrick
7972e38280 Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:13:01 -07:00
Brad Fitzpatrick
38c6e31c88 Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:12:15 -07:00
Brad Fitzpatrick
29d75c9a10 Merge "Fixing improper boxing to Integer instead of Long." 2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
40b207c131 Merge "Using proper key for removing object from the map." 2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
b37f7e59ee 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
cffde30fc1 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
Dianne Hackborn
44220a5602 Merge "Add some debug code to try to track down issue 3183612" into gingerbread 2011-03-15 10:29:04 -07:00
Xavier Ducrohet
2652b618a8 Merge 6f2fb570 from honeycomb. do not merge. 
LayoutLib: Fix dimension parsing to handle negative value.

Also make TypedArray.getDimensionPixelSize properly
handle negative values (which are not allowed).

Change-Id: I03ffcef5ab7ec7ef95419566776dcc798845fd88
 2011-03-14 15:28:50 -07:00
Xavier Ducrohet
f354ad108c Merge c12b4093 from honeycomb. do not merge. 
Change-Id: Icfbb70c097d87bf92415c6f0534346adde4c02fe
LayoutLib: Implement some missing add###() method in Path.
 2011-03-14 15:28:50 -07:00
Dianne Hackborn
cf3004a46e Add some debug code to try to track down issue 3183612 
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.

Change-Id: I3e84f8795941744e697824a5e5b2e651f565b253
 2011-03-14 14:24:04 -07:00
Ying Wang
e422f7a21a am bf079216: Dist classes.jar with full class files inside 
* commit 'bf079216c607b660a0ad219df6c4752906a7fc61':
  Dist classes.jar with full class files inside
 2011-03-14 13:45:34 -07:00
Mike Lockwood
ccdac700df am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 
* commit '78b8e1be97c61f7e0b28b145fadd0c646fd1c46b':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
 2011-03-14 13:37:54 -07:00
Ying Wang
bf079216c6 Dist classes.jar with full class files inside 
Instead of the final jar with classes.dex inside.

Change-Id: I2bc7eb6faedf328a93a6e2eacc4334d87761f597
 2011-03-14 13:35:59 -07:00
Simon Wilson
81e1ed7eb5 am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread 
* commit 'ee3f6ef2fc7bcfae9d8af8430760388f653a10c8':
  DO NOT MERGE Support WiMAX Settings & ticker message
 2011-03-14 13:34:18 -07:00
Daniel Sandler
9bbaa1564b am 45660662: Merge "Workaround unknown ERI indices." into gingerbread 
* commit '45660662e61e8cc3ff13144668767a86d1d5b7f4':
  Workaround unknown ERI indices.
 2011-03-14 13:34:08 -07:00
Mike Lockwood
78b8e1be97 Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 2011-03-14 13:17:24 -07:00
Gilles Debunne
816dd3d443 resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp 
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
 2011-03-14 12:57:01 -07:00
Simon Wilson
ee3f6ef2fc Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread 2011-03-14 11:40:17 -07:00
TK MUN
9999ad20df DO NOT MERGE Support WiMAX Settings & ticker message 
Change to save UI setting value
Add new Icons for ticker message

Change-Id: I3294f40c9853311f74877e197675f48bf271d468
 2011-03-14 11:39:01 -07:00
Daniel Sandler
45660662e6 Merge "Workaround unknown ERI indices." into gingerbread 2011-03-14 11:37:12 -07:00
Daniel Sandler
97ac3ef4a8 Workaround unknown ERI indices. 
Bug: 4075878
Change-Id: I18b793ebccbd1332e3e153acca34056d26bf10a0
 2011-03-14 14:35:06 -04:00
Gilles Debunne
9c06c0ffc9 Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread 2011-03-14 11:30:17 -07:00
Mike Lockwood
2cc0377200 DO NOT MERGE: backport recent USB accessory changes from honeycomb 
Bug: 4082651

Change-Id: Ie7c2fc796dd3c64f803acbd14210e5949683f4ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 20:02:43 -05:00
Kenny Root
206c62ed34 am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-11 15:45:34 -08:00
James Dong
7d93b7574f am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit '68f66b945e7a69549689becd2e656d9056f1e7f5':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-11 14:31:37 -08:00
Kenny Root
2fdf829a17 Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 2011-03-11 14:22:22 -08:00
James Dong
68f66b945e Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 2011-03-11 13:38:02 -08:00
Ying Wang
e557025563 am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread 
* commit '69e725eb8806180749b66903382754c86a15d0f6':
  Dist com.android.nfc_extras.jar.
 2011-03-11 12:05:22 -08:00
Robert Greenwalt
2e7415564a am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 
* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
  DO NOT MERGE Backport of I1f55df8a from master.
 2011-03-11 11:52:31 -08:00
James Dong
070b2e1a5c MP3Extractor and MP3 decoder fixes - DO NOT MERGE 
cherry-picked the following patches from HC branch:
o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits
o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
o When the temp buffer wraps around, the next read position should start
    from what have been read to avoid reading the same remaining bytes in
    the buffer again.
o Speed up MP3Extractor using cached reads

bug - 4083532

Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
 2011-03-11 11:02:17 -08:00
Ying Wang
69e725eb88 Merge "Dist com.android.nfc_extras.jar." into gingerbread 2011-03-11 10:17:49 -08:00
Robert Greenwalt
b5c51d5fa8 Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread 2011-03-11 10:14:28 -08:00
Ying Wang
89b959b46f Dist com.android.nfc_extras.jar. 
Change-Id: I409106d641a3a68ef1c6885b36d226411c8fe356
 2011-03-10 18:04:54 -08:00
Robert Greenwalt
6b09916eb2 DO NOT MERGE Backport of I1f55df8a from master. 
Fixes false reporting of NO_CONNECTION.
bug:4057115

Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6
 2011-03-10 17:04:21 -08:00
Nick Pelly
38d0d5628d am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base). 
* commit '367f41f8f61126c2ab34a34cc676756a9fc23ac2':
  Implement new NFC-EE API's as shared library (frameworks/base).
 2011-03-10 16:32:28 -08:00
Nick Pelly
367f41f8f6 Implement new NFC-EE API's as shared library (frameworks/base). 
Change-Id: I45c4eaf59ec78167fc236fdd59676465a5e1bcb7
 2011-03-10 16:03:46 -08:00
Robert Greenwalt
55b53d3510 am dfcb8c51: Merge "Don\'t accept a user-defined dun-capable connection" into gingerbread 
* commit 'dfcb8c511635431d536fd3ef1894378f4424ef1a':
  Don't accept a user-defined dun-capable connection
 2011-03-10 11:59:17 -08:00
Robert Greenwalt
dfcb8c5116 Merge "Don't accept a user-defined dun-capable connection" into gingerbread 2011-03-10 10:41:36 -08:00
Chih-Wei Huang
c2d68c9096 Remove unnecessary SkImageDecoder_libjpeg.cpp 
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's

out/target/external/skia/src/images/SkImageDecoder_libjpeg.o

It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.

Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.

Change-Id: I3e7533126ef60fe2fd424fdc777760e73c93489b
 2011-03-10 17:52:31 +08:00
TK MUN
c01fd043a9 am 4bdab175: DO NOT MERGE WiMAX support 
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
  DO NOT MERGE WiMAX support
 2011-03-09 22:54:44 -08:00
TK MUN
4bdab1751f DO NOT MERGE WiMAX support 
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX

Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com>
 2011-03-09 22:37:08 -08:00
Mathias Agopian
a15b5290f5 am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread 
* commit '33029221619f14577bd0d0e7c2f815abc8f1b8ea':
  revert the surface purgatory list and dependent changes.
 2011-03-09 17:11:10 -08:00
Mathias Agopian
3302922161 Merge "revert the surface purgatory list and dependent changes." into gingerbread 2011-03-09 17:07:27 -08:00