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

30486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mathias Agopian
cf8b94562c revert the surface purgatory list and dependent changes. 
6d0f6cb Revert "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only"
6154412 Revert "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)"
37c2a37 fix [3408713] Dialog window invisible sometimes

It looks like there is a surface leak, it's unclear where it is.
Without those reverts, this would cause a leak of the associated buffers
which is far more problematic. this change might hide the surface leak.

Bug: 4078032
Change-Id: Iedcda3ffcdd2f69d41047b5c3134c1e867ff90d7
 2011-03-09 17:00:41 -08:00
Mathias Agopian
b4341ba697 am b710a50a: Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread 
* commit 'b710a50ab6ca36b502f548e8551f620e98bbb1d8':
  fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
 2011-03-09 16:57:32 -08:00
Mathias Agopian
a7c836ddc0 am c05d35db: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread 
* commit 'c05d35db1c57de97888f16ed74718e4c676e4a9b':
  fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
 2011-03-09 16:57:28 -08:00
Mathias Agopian
b710a50ab6 Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread 2011-03-09 16:54:21 -08:00
Mathias Agopian
c05d35db1c Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread 2011-03-09 16:54:14 -08:00
Robert Greenwalt
4c89b14db4 Don't accept a user-defined dun-capable connection 
If we're asked to connect to a DUN APN and we have a carrier specified
DUN APN setting, verify what we're connected to is the same as what the
carrier specified before accepting it.

bug:4048013
Change-Id: I91edc4a1342cb40c1f6959e149303b7d76710f96
 2011-03-09 16:33:33 -08:00
Lorenzo Colitti
8df2477c4e am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming. 
* commit 'bd0e806a61df9b67890dc3b1390db554e7468b4a':
  Support IPv6->IPv4 fallback in HTTP streaming.
 2011-03-09 15:09:20 -08:00
Lorenzo Colitti
e4a02b6129 am b9da16a1: Support IPv6 in HTTP streaming. 
* commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
  Support IPv6 in HTTP streaming.
 2011-03-09 15:09:04 -08:00
Lorenzo Colitti
bd0e806a61 Support IPv6->IPv4 fallback in HTTP streaming. 
Bug: 4068057
Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
 2011-03-08 15:01:15 -08:00
Lorenzo Colitti
b9da16a1e3 Support IPv6 in HTTP streaming. 
Bug: 4068057
Change-Id: I1e141ec99fbfa43722eeb2e4161d56548ffc0640
 2011-03-08 15:01:15 -08:00
Mathias Agopian
de6a47a3e9 am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread 
* commit 'df6410dce3dae0bdb7e13118b3878079a1dcce03':
  Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
 2011-03-07 18:04:06 -08:00
Mathias Agopian
df6410dce3 Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread 2011-03-07 18:00:20 -08:00
Mathias Agopian
5f94c315a6 fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE] 
make sure to not pass negative numbers to sqrt().

Change-Id: Ia31f7ebb7b75c79b548e428c6084fa55031617d0
related-bug: 3452750
 2011-03-07 17:58:56 -08:00
Mathias Agopian
241d8a84e5 fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE] 
Just make sure to clamp the argument to zero.

Bug: 4026375
Change-Id: Idd3d4ef977e87c1b3f6b54371105c3152d7dc6b9
 2011-03-07 17:58:34 -08:00
Mathias Agopian
951d3fec41 Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only 
37c2a37 fix [3408713] Dialog window invisible sometimes
d35c666 fix [3385504] Surface flinger hang when adding dim surface
1723b04 fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
1b0114f fix a surface leak in SurfaceFlinger

Bug: 3513017

Change-Id: Ia13ed8c9cdcb1f484e177cdcaff687e7c88a10c3
 2011-03-07 16:56:16 -08:00
Simon Wilson
10993b2d1e am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread 
* commit '6b6869d5c1a203e79dc272f2f0e53c184f44f24a':
  mms: mms wap push length check before pdu processing.
 2011-03-07 15:42:59 -08:00
Simon Wilson
6b6869d5c1 Merge "mms: mms wap push length check before pdu processing." into gingerbread 2011-03-07 15:39:19 -08:00
Soojung Shin
7ac1cb787c mms: mms wap push length check before pdu processing. 
Change-Id: Id5b5572bcd2953e496f03142d13bd2d012225e30
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
 2011-03-07 15:37:01 -08:00
James Dong
b1be086e1d am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch... 
* commit 'd581c04722e2610ca5471b9c3d1881043b1205b1':
  Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
 2011-03-07 15:10:26 -08:00
James Dong
d581c04722 Add missing copyright headers for a couple of files. DO NOT MERGE 
Cherry-picked from other branch...

bug - 4025673

Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
 2011-03-07 14:50:40 -08:00
Soojung Shin
fa680a18f6 am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding. 
* commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c':
  Added to check for supporting mms content-disposition, utf8 decoding.
 2011-03-04 17:16:49 -08:00
Soojung Shin
ff5a09904f Added to check for supporting mms content-disposition, utf8 decoding. 
Change-Id: Ieae1bb2ac36675f569fb21285ca6ef289c367bf7
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
 2011-03-04 14:32:31 -08:00
Lorenzo Colitti
362da50989 am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread 
* commit 'b028ce55cac88f1778cdad59c63c52a5b66afb69':
  Add a protocol property to the APNs and use it.
 2011-03-03 17:07:56 -08:00