1287 Commits

Author SHA1 Message Date
Elliott Hughes
13f3683d93 Merge "More native code cleanup." 2011-04-13 11:09:57 -07:00
Elliott Hughes
f17b971a75 More native code cleanup.
Use ScopedUtfChars (fixes a leak in TrafficStats, and fixes a crash in Wifi in
a case where GetStringChars could have been called with a pending exception).

Change-Id: I3465ff392b4038dfdafa6af80ec1314cc6d6a11c
2011-04-13 10:34:23 -07:00
Elliott Hughes
f9dc3db273 Merge "Use an @hide libcore API to get the FileDescriptor from a Socket." 2011-04-13 10:18:03 -07:00
Elliott Hughes
e9cf71dfd0 Merge "Don't allocate a raw object then call its constructor manually..." 2011-04-13 10:17:46 -07:00
Elliott Hughes
cf6f7a0f00 Don't allocate a raw object then call its constructor manually...
We can do this in one step.

Change-Id: Id6b70c83002038caf62fe89cc769eca54ae0c055
2011-04-12 17:50:45 -07:00
Elliott Hughes
4cb1753ec6 Remove useless forward declarations.
Change-Id: I8f191367acb18ea9a3f807e791099e0485b1b249
2011-04-12 16:10:26 -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
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
Elliott Hughes
ae447967b5 Merge "Kill the global references in the OpenGL wrappers." 2011-04-12 10:19:11 -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
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
Elliott Hughes
dcd2ef9acc Merge "More JNI exception-throwing cleanup." 2011-04-08 16:15:26 -07:00
Elliott Hughes
69a017bc1d More JNI exception-throwing cleanup.
There are a few (unimportant) bug fixes here. There were several attempts to
throw exceptions in situations where there's already a pending exception.

There were also cases where the code was wrong; it was checking for a NULL
return from Get*ArrayElements and throwing NPE, but passing NULL is an error
that causes a crash and a NULL return means an exception has already been
thrown. I didn't want to get into the Scoped* classes just yet, but that
was by far the easiest way to fix this.

Change-Id: I0b31160ee51b96e82539f6514b8412b149dba7c3
2011-04-08 15:01:19 -07:00
Fabrice Di Meglio
0343a7eb6d Merge "TextLayoutCache - add glyphs caching" 2011-04-08 14:51:08 -07:00
Fabrice Di Meglio
fcf2be1846 TextLayoutCache - add glyphs caching
- cache glyphs after Harfbuzz shaping
- use "m" prefix for member variables
- add temporary API for drawing text with glyphs
- update BiDiTest app

Change-Id: I619b3f313b15f010018daad21b3e5e486619b4e4
2011-04-08 14:37:18 -07:00
Brian Carlstrom
ceb889711f Merge "Tolerate missing AccountManager resource, not just missing resource name" 2011-04-08 10:28:34 -07:00
Elliott Hughes
fbb0788463 Merge "Use jniThrowException for exception throwing from native code." 2011-04-08 10:08:19 -07:00
Elliott Hughes
8451b25a44 Use jniThrowException for exception throwing from native code.
I'll do media and the generated gl stuff separately. Otherwise, this
cleans up all direct calls of ThrowNew/Throw except the one in the
binder that needs to remain.

Change-Id: I8f95a5f020f53b25926ad31ac0c9477ddf85d04b
2011-04-07 19:17:57 -07:00
Dianne Hackborn
e17aeb3103 Improve activity manager debug dumps.
Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem.  Also lots of general cleanup of the am
dump output.

Change-Id: Id0dbccffb217315aeb85c964e379833e6aa3f5af
2011-04-07 18:26:15 -07:00
Brian Carlstrom
46703b0995 Tolerate missing AccountManager resource, not just missing resource name
In addition to the primary change in the subject, also some minor cleanup of javadoc, typos, CloseGuard warning, etc found while working on a new AbstractAccountAuthenticator.

Change-Id: I73f3408773a43a0021a15f8d051fd3dbbdf898a5
2011-04-07 11:58:37 -07:00
Glenn Kasten
85b65f2008 Merge "Miscellaneous code cleanup in audio framework" 2011-04-06 13:03:11 -07:00
Dianne Hackborn
3fc982f41f Add new resource configurations for screen width/height in "dp".
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I22f8afa136b4f274423978c570fa7c9855040496
2011-04-06 11:00:37 -07:00
Glenn Kasten
ed0079dddd Miscellaneous code cleanup in audio framework
Changes:
 - Move declaration of kClassPathName to top of file so it can be used
   in more than one place, instead of "android/media/AudioSystem".
 - Make private methods static.
 - Add comment to stream_type, audio_mode, force_use types that they must match
   values in AudioSystem.java.
 - Add comment about unused types mp3_sub_format and vorbis_sub_format.
 - Fix typos.
 - Use @ in javadoc comments.
 - Delete dead APIs setMode, getMode, setRouting, getRouting in AudioSystem.java
   (they are all hidden, deprecated, and unused by rest of framework)
 - Delete unused private log method.
 - Fix pathname for android_media_AudioSystem.cpp.
 - Improve code formatting for space after == and !=.
 - Add logging of delta for changing audio policy manager ref count.

Change-Id: I18037c7beb8ab76d1fda08c11e589f6e591d36e1
2011-04-06 10:24:18 -07:00
Brian Carlstrom
fb84ce0df6 Merge "Don't use local ref for cached jclass reference in JNI code" 2011-04-06 10:06:00 -07:00
Brian Carlstrom
46e18c11d4 Don't use local ref for cached jclass reference in JNI code
Change-Id: Id45b2acb358a819f2fd332e99f3a095f6fc7299b
related-to-bug: 4241138
2011-04-06 10:04:20 -07:00
Irfan Sheriff
9552766567 Merge "Add support for supplicant SCAN_INTERVAL" 2011-04-06 09:16:26 -07:00
Irfan Sheriff
2b7f63887e Add support for supplicant SCAN_INTERVAL
Also, allow scan interval for framework and supplicant
to be configured at build time or run time

Bug: 4144882
Change-Id: I877f4bcc872597b44d3f4da85cf2bc0f16e09444
2011-04-06 09:11:15 -07:00
Jaikumar Ganesh
14faa3bd8b Update for change in Bluez version.
1. Implement address copy
2. Update device properties parsing.

Change-Id: I112371c848cdfaa2f02e0c447154070c0a38737f
2011-04-05 15:53:59 -07:00
Jaikumar Ganesh
72b18064a2 Disable Out of Band pairing for Bluez upgrade.
This is a temporary change, till OOB pairing is redone.

Change-Id: I3e25fc7923eb4c70b4139880da884acf43098386
2011-04-05 15:53:59 -07:00
Fabrice Di Meglio
23e0df5854 Merge "TextLayoutCache - more code refactoring" 2011-04-05 15:38:06 -07:00
Fabrice Di Meglio
48796a81be TextLayoutCache - more code refactoring
- move code from .h file to .cpp file

Change-Id: Ib8201a20e2767ef5d92707a6f4d8d79a3673e04d
2011-04-05 15:35:59 -07:00
Brian Carlstrom
3a6076ec28 Merge "Fix usages of PopLocalFrame to include returned local reference" 2011-04-05 15:26:04 -07:00
Brian Carlstrom
b32b1ddf72 Fix usages of PopLocalFrame to include returned local reference
Change-Id: Ibd7a37b4035862718cb625110cfbba741537c17a
2011-04-05 15:20:52 -07:00
Fabrice Di Meglio
1de9e7a9df Code refactoring for TextLayoutCache
- rename TextLayoutCache entry name
- update references to old name
- better variable names in TextLayoutCache::getRunAdvances()

Change-Id: I5173fbc8af79437ce4786084580426f130120ce8
2011-04-05 14:13:22 -07:00
Brad Fitzpatrick
9a9adb5d25 am 5851b866: am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
* commit '5851b8662dc95372d68df293cb13c59da0cf8582':
  Fix data corruption when writing to Bluetooth socket
2011-04-04 15:28:54 -07:00
Brad Fitzpatrick
5851b8662d am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
* commit '27e00544ea08d25e8e9b1b94264205f9d53030fb':
  Fix data corruption when writing to Bluetooth socket
2011-04-04 15:25:39 -07:00
Brad Fitzpatrick
27e00544ea am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
* commit '9907d161584415c81de1099678f160da172fd1a6':
  Fix data corruption when writing to Bluetooth socket
2011-04-04 11:03:03 -07:00
Mike Playle
36aa8839d5 Fix data corruption when writing to Bluetooth socket
Writes to Bluetooth sockets are handled by writeNative() in
android_bluetooth_BluetoothSocket.cpp. This calls asocket_write()
which is implemented in abort_socket.c.

This latter function sleeps until poll() indicates that the socket is
writeable, then calls write() once, returning the number of bytes
written. However writeNative() just returns this byte count to the
caller; it's eventually ignored in BluetoothOutputStream.java. This
doesn't match the semantics of a Java OutputStream, which is required
to block until all bytes have been written.

This fix adds a loop to writeNative() that repeatedly calls the lower
level write function until all the data has been written (or an error
occurred in which case we should exit the loop early). With this
change it is possible to write large amounts of data to a Bluetooth
socket without experiencing data loss.

Change-Id: I0b464382817e15adec32ba0e3cb37e7d1cccc730
2011-04-04 08:56:22 +01:00
Brian Carlstrom
aedc2a8fcc Merge "Tracking merge of dalvik-dev to master" 2011-04-02 20:39:32 -07:00
Brian Carlstrom
08065b9f09 Tracking merge of dalvik-dev to master
git cherry-pick --no-commit  a80febd83c8bf0b6717da2a7136179bdc906a5b7

git cherry-pick --no-commit  5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd

git cherry-pick --no-commit  4886db14c9eee4b6fee69bd54c57c5af04709c4c

git cherry-pick --no-commit  560c685e448769904047507b9484ce8111967d7e

git cherry-pick --no-commit  63dde7a2fcfa53dc531558635b64cea613d3cdb4

git cherry-pick --no-commit  74e5cb91060a379d98dd3a333b5f231bfb4f502e

git cherry-pick --no-commit  1cc8c9708b555e2e338b7798d38887a2fefcfea6

git cherry-pick --no-commit  09625a21f5abe0c0db15757f58585d552d62c3d7

git cherry-pick --no-commit  fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458

git cherry-pick --no-commit  a68cb7fa3ab42854768b8145ff85231663770292

git cherry-pick --no-commit  716beb1c131dd2c6b805d4f681debaa20075010c

git cherry-pick --no-commit  8c29b1097a7afe3a77e27546a56e396f3620a4ec

git cherry-pick --no-commit  9c6a1a55d1c8086c1cc57464eea43725694ff70c

git cherry-pick --no-commit  b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8

Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
2011-04-01 16:00:23 -07:00
Chet Haase
905787a7c9 Fix the build: break due to no OPENGL in some builds
Change-Id: Ibceb501d2361df9b74dc1964ff6b92ec8452f219
2011-04-01 15:18:25 -07:00
Chet Haase
0865d33d97 Fix the build - change a reference to a namespace specification
Change-Id: I79c8b571e6555451611b825669963f042d901f1a
2011-04-01 14:33:02 -07:00
Chet Haase
09bc5f5b57 Merge "Add logging of graphics acceleration info to bugreports" 2011-04-01 13:28:10 -07:00
Chet Haase
9c1e23baf5 Add logging of graphics acceleration info to bugreports
Change-Id: I9fa4cda6ccf92df9d1c644ccdc0e7274a30106e0
2011-04-01 13:24:53 -07:00
Jeff Brown
bc2278b95f Merge "Add a little input event consistency verifier." 2011-04-01 12:56:35 -07:00
Jeff Brown
21bc5c917d Add a little input event consistency verifier.
The idea is to assist with debugging by identifying cases in which
the input event stream is corrupted.

Change-Id: I0a00e52bbe2716be1b3dfc7c02a754492d8e7f1f
2011-03-31 19:57:00 -07:00
Fabrice Di Meglio
0fb1ac0038 Merge "Code cleaning - suppress non useful code" 2011-03-30 18:39:38 -07:00
Fabrice Di Meglio
99e95b0e12 Code cleaning - suppress non useful code
Change-Id: I3f3bffdd1f5d64a6b601d56bee3b5fc8147086bd
2011-03-30 17:59:19 -07:00
Fabrice Di Meglio
aabe537f1e Update TextLayoutCache key for supporting more SkPaint properties
Change-Id: I35bb991e536e662c1a0724ab7e311fba3d52487a
2011-03-30 16:06:02 -07:00
Fabrice Di Meglio
eee49c699c Fix text redering issue where the text was sometimes truncated
- mostly was visible in Settings apps / Wi-Fi networks summary info for each network
- correctly setup the local SkPaint for advances computation
- improve test app for adding live resizing

Change-Id: Ia031fe1b115b521ba55c7e68f2a26300f02e48ca
2011-03-29 19:44:33 -07:00