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

49173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kazuhiro Ondo
921c9d2425 Fix occasional phone app crash 
bug #4263503

if GsmDCT is just initialized and LTE/GPRS attach happens
before SIM is completely loaded, phone app would crash
as there is no DataConnection associated with ApnContext.

Change-Id: Ie8007c718c3f68a7b3e42154e60e5b25631ec3c8
 2011-04-12 14:42:02 -07:00
Scott Main
f42937a8aa docs: fix doc typo 
Change-Id: Ia5c32723489a045d865307dbad41edb29b2cfb29
 2011-04-12 14:38:54 -07:00
Elliott Hughes
4390758f27 Use an @hide libcore API to get the FileDescriptor from a Socket. 
Saves having your own native code...

Change-Id: Ib082a6530bcf743a35031500cee6318bc92d4d35
 2011-04-12 14:25:23 -07:00
Eric Fischer
a5228c51ea am 70cf1b97: (-s ours) am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations. DO NOT MERGE 
* commit '70cf1b97586a4f1ffa04fe0d83c3590fc22f6a56':
  Import revised translations.  DO NOT MERGE
 2011-04-12 13:28:14 -07:00
Scott Main
150b4cba73 am 6ce11bb0: am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links 
* commit '6ce11bb0e1d8e0366f4321f90826d60ee1e52193':
  docs: fix broken links
 2011-04-12 13:27:43 -07:00
Bill Gruber
81b98cc9bb am e3aa4ec6: am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations 
* commit 'e3aa4ec6b1c0d1e732fb686c0d8adc7d729b6fc6':
  Doc fix-corrects the cited download locations
 2011-04-12 13:27:38 -07:00
Eric Fischer
70cf1b9758 am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations. DO NOT MERGE 
* commit '68cb0ffad05323dc1df7faeefa8f41586744c293':
  Import revised translations.  DO NOT MERGE
 2011-04-12 13:18:52 -07:00
Scott Main
6ce11bb0e1 am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links 
* commit '91470be46644493be89dc277f3c0f987f34bc937':
  docs: fix broken links
 2011-04-12 13:08:50 -07:00
Scott Main
91470be466 am c7b94371: am b9fedd97: docs: fix broken links 
* commit 'c7b94371a0a4cbe853c17c4610a564a5a4d3efd5':
  docs: fix broken links
 2011-04-12 13:06:50 -07:00
Scott Main
c7b94371a0 am b9fedd97: docs: fix broken links 
* commit 'b9fedd9771a6aedf068155fd91f15baf52e668cd':
  docs: fix broken links
 2011-04-12 13:02:43 -07:00
Eric Fischer
68cb0ffad0 am 71a556f2: Import revised translations. DO NOT MERGE 
* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
  Import revised translations.  DO NOT MERGE
 2011-04-12 13:02:15 -07:00
Scott Main
b9fedd9771 docs: fix broken links 
Change-Id: I20a2f70bc588d9eeec79419d12790f1da9b79863
 2011-04-12 12:58:01 -07:00
Kenny Root
461fa8b05d resolved conflicts for merge of 18490fb9 to master 
Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37
 2011-04-12 12:51:08 -07:00
Bill Gruber
e3aa4ec6b1 am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations 
* commit 'a8c68be89d3735e5d579e521d0798032303330d3':
  Doc fix-corrects the cited download locations
 2011-04-12 12:42:26 -07:00
Bill Gruber
a8c68be89d am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations 
* commit 'df8fc2e1bfb6abcbea107636f36fae464faf976f':
  Doc fix-corrects the cited download locations
 2011-04-12 12:23:33 -07:00
Elliott Hughes
d3a6956a6d Merge "More native code cleanup." 2011-04-12 12:09:01 -07:00
Eric Fischer
71a556f24e Import revised translations. DO NOT MERGE 
Change-Id: Idd866750d0c53ae0665ef2dd6b64230182d185ae
 2011-04-12 12:08:59 -07:00
Andy McFadden
b00be00160 Merge "Fix typos." 2011-04-12 12:02:36 -07:00
Bill Gruber
df8fc2e1bf am 9a693ed9: Doc fix-corrects the cited download locations 
* commit '9a693ed9870cf2d5817a3bfc8dc0fbec4456a3c2':
  Doc fix-corrects the cited download locations
 2011-04-12 11:48:00 -07:00
Doug Zongker
a4f39a6edd Merge "protect all /cache/recovery/last_* files from deletion" 2011-04-12 11:30:47 -07:00
Elliott Hughes
dd66bcbf9d More native code cleanup. 
Don't keep unused global references to classes, don't throw exceptions
when an exception is already pending, and fix a (harmless) misunderstanding
about how GetStringChars works.

Change-Id: Ie445036f057daa8a1c76aceb7bad2a84fb81d820
 2011-04-12 11:28:59 -07:00
Andy McFadden
338d12102b Fix typos. 
Change-Id: I455d305f34b07d9ef78fd92ff55ae6f590862f01
 2011-04-12 11:19:25 -07:00
Kenny Root
18490fb93e resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp 
Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
 2011-04-12 10:27:15 -07:00
Elliott Hughes
ae447967b5 Merge "Kill the global references in the OpenGL wrappers." 2011-04-12 10:19:11 -07:00
Andreas Huber
3f9659a096 Merge "Experimental support for changing the video surface/texture on an active mediaplayer" 2011-04-12 09:25:32 -07:00
Doug Zongker
3d5040f8d4 protect all /cache/recovery/last_* files from deletion 
Preserve any files name /cache/recovery/last_*, not just last_log,
when booting.

Change-Id: Ie36da5b9552e4a7100ecf3774fb1a8aaa22bfdbd
 2011-04-12 09:23:51 -07:00
Andreas Huber
dfad483298 Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame." 2011-04-12 08:36:59 -07:00
Mathias Agopian
27cd07ca80 changes to SurfaceTexture needed for unification with SF 
- implement connect/disconnect
- implement missing query
- handle texture_2d in addition to texture_external_oes

Change-Id: I971a70821f00f22b01f5337de4a7d451177fec4d
 2011-04-11 21:19:55 -07:00
Benoit Goby
2ab632a67e am 0b9b8711: am 43be7a61: EthernetDataTracker: implement setDependencyMet 
* commit '0b9b8711a1a2107dc913cc751b7d981fce4f3082':
  EthernetDataTracker: implement setDependencyMet
 2011-04-11 20:26:41 -07:00
Benoit Goby
0b9b8711a1 am 43be7a61: EthernetDataTracker: implement setDependencyMet 
* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
  EthernetDataTracker: implement setDependencyMet
 2011-04-11 20:23:42 -07:00
Benoit Goby
43be7a6120 EthernetDataTracker: implement setDependencyMet 
Change-Id: I4be804e3c9dccacfacb5cb813a4ad6f513224f06
 2011-04-11 20:13:10 -07:00
Benoit Goby
dd0cd5e27e resolved conflicts for merge of 31659471 to master 
Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9
 2011-04-11 19:07:11 -07:00
Benoit Goby
316594715d am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters
 2011-04-11 18:53:57 -07:00
Benoit Goby
2869d1715d resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
 2011-04-11 18:41:23 -07:00
Brad Fitzpatrick
a944e591fc am 07c25b65: am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler" 
* commit '07c25b651216daac884bd503c02b788418165b50':
  audioflinger: Enable ARMv5TE optimized resampler
 2011-04-11 17:32:37 -07:00
Xavier Ducrohet
da64f6cf3c am 1f2a307b: resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp 
* commit '1f2a307b59a6f1d61390425b52c3f0aafc21c54b':
  LayoutLib: don't render when shader's local matrix is set to 0 scale.
 2011-04-11 17:28:59 -07:00
Elliott Hughes
4a1ba21044 Merge "You don't need to poke around inside FileDescriptor manually." 2011-04-11 17:27:53 -07:00
Brad Fitzpatrick
07c25b6512 am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler" 
* commit '4430670f48f75661293371dab8db55865f5f56e0':
  audioflinger: Enable ARMv5TE optimized resampler
 2011-04-11 17:27:12 -07:00
Xavier Ducrohet
1f2a307b59 resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp 
Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342
 2011-04-11 17:11:41 -07:00
Elliott Hughes
a3804cf77f You don't need to poke around inside FileDescriptor manually. 
We can help you with that.

Note also that getParcelFileDescriptorFD did no such thing. All its callers
were passing in a regular java.io.FileDescriptor and expecting the int. No
ParcelFileDescriptors involved.

Change-Id: Idc233626f20c092e719f152562601f406cc1b64a
 2011-04-11 17:04:01 -07:00
Benoit Goby
08c39c6a11 Add support for USB Ethernet adapters 
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
 2011-04-11 16:33:43 -07:00
Xavier Ducrohet
01ce57f92f am fc1bf925: resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp 
* commit 'fc1bf9256372018188468b8ba5163ac5dcc74f56':
  Merge c5aeac7f from honeycomb.
 2011-04-11 16:33:12 -07:00
Gilles Debunne
e9f05b0079 Merge "Fix in BreakIterator." 2011-04-11 16:21:38 -07:00
Xavier Ducrohet
fc1bf92563 resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp 
Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701
 2011-04-11 16:15:54 -07:00
Kenny Root
87b3c0dcc4 am 08d9d9a4: Merge "Runtime resource overlay, iteration 1." 
* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
  Runtime resource overlay, iteration 1.
 2011-04-11 15:33:19 -07:00
Elliott Hughes
24ce5fb2cc Kill the global references in the OpenGL wrappers. 
Just use jniThrowException instead. Note that it would be trivial to throw
seemingly more appropriate exceptions (NullPointerException and
OutOfMemoryException in particular), but I'm only attempting to preserve
existing behavior here.

I also found shadowing bugs in some of the special-case functions, which
would previously always have leaked memory.

This also moves an accidental change to a generated file (ActivityThread ->
AppGlobals) into the generator, so it won't be overwritten in future.

Change-Id: Iab570310b568cb406c60dd0e2b8211f8a36ae590
 2011-04-11 15:31:20 -07:00
Eric Fischer
f60cee57f5 Merge "Import revised translations." 2011-04-11 14:36:47 -07:00
Mike Lockwood
d08b2ad9bc am 9e13c7e5: am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak 
* commit '9e13c7e5d787252b2a88aace1115b51a95e16b5d':
  UsbManager: minor Javadoc tweak
 2011-04-11 14:28:34 -07:00
Jason parks
3ef8b7463c am f953d3e2: am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread 
* commit 'f953d3e2eac2af121e4b83f6bf613e0800fd7952':
  Implement teardown script.
 2011-04-11 14:28:30 -07:00
Jeff Hamilton
40c266ef48 am a83bc160: am 7bb236c3: am 84d34078: Make the NFC UID forward compatible. 
* commit 'a83bc160892078c20489897190ee163d5c4d3783':
  Make the NFC UID forward compatible.
 2011-04-11 14:28:27 -07:00