29389 Commits

Author SHA1 Message Date
Dianne Hackborn
a30063d80c am 25eb0464: Merge "Normalize output from aapt d"
* commit '25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
  Normalize output from aapt d
2011-01-29 23:01:20 -08:00
Dianne Hackborn
25eb04642c Merge "Normalize output from aapt d" 2011-01-29 22:53:20 -08:00
Dianne Hackborn
2107757dde am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit 'bbb5a5ce1922a168335811b177cd7341350c15cc':
  Make AaptGroupEntry::getMncName accept mnc00
2011-01-29 14:59:02 -08:00
Dianne Hackborn
bbb5a5ce19 Merge "Make AaptGroupEntry::getMncName accept mnc00" 2011-01-29 14:38:48 -08:00
Jean-Baptiste Queru
87d197597c Delete browerplugin tests - do not merge
Those don't build in all environments.

Change-Id: Ie564d464d2745df0114236f2c28aa1254d0f65b5
2011-01-29 07:41:39 -08:00
Jean-Baptiste Queru
d4c8cec094 am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '9720323a5138acafbe30da38d61eeac469b675a4':
  Delete browerplugin tests - do not merge
2011-01-29 07:39:47 -08:00
Jean-Baptiste Queru
9720323a51 Merge "Delete browerplugin tests - do not merge" 2011-01-28 15:26:59 -08:00
Jean-Baptiste Queru
fca2f8bb6a Delete browerplugin tests - do not merge
Those don't build in all environments.

Change-Id: Ibeb8ac653f2961131d106864cc417c5ec58f2b36
2011-01-27 13:36:33 -08:00
Jeff Brown
7b448b8a6c Merge "Move keymaps from sdk/emulator/keymaps." 2011-01-26 14:25:08 -08:00
Jeff Brown
2786b312d3 Move keymaps from sdk/emulator/keymaps.
Change-Id: Ia10992a5988641b338cb4a50f57deadd5188a5e2
2011-01-25 19:08:04 -08:00
Brad Fitzpatrick
a206efcf8d Merge "android.os.Message: respect sPoolSize" 2011-01-25 15:12:18 -08:00
Brad Fitzpatrick
2405c278ef android.os.Message: respect sPoolSize
Also rename some static members from mFoo to sFoo.

Bug: http://code.google.com/p/android/issues/detail?id=13866
Change-Id: I5c5075eb6f529d1534c7aa72b6881873cd08676a
2011-01-25 14:54:31 -08:00
Brad Fitzpatrick
996de2dd41 Merge "Avoid using String.format in MediaRecorder" 2011-01-24 13:36:15 -08:00
Henrik Backlund
2450830c0c Avoid using String.format in MediaRecorder
String.format was used instead of a simple string concatenation.
This is a problem when language is set to Arabic since simple
integers will be converted into Arabic numbers.

Change-Id: I2cbd4c5cd2d09117202e6ae191845fd5fc9154ec
2011-01-24 17:55:46 +01:00
Dianne Hackborn
bcf2adeb10 Merge "aapt: Allow raw "%" in unformatted string-arrays" 2011-01-23 12:44:13 -08:00
Jeff Brown
265cf2e76b Merge "Fix getSwitchState." 2011-01-22 21:23:19 -08:00
Josh Stone
bf50322a24 aapt: Allow raw "%" in unformatted string-arrays
Commit 15fe2cb added format checking for translatable strings, enforcing
the use of positional args.  This check can be disabled on <string>
values with translatable="false" or formatted="false".  But they didn't
check for those attributes on <string-array>, so some of CM's strings
fail when they're not really format strings, just because they contain
percent signs.  (e.g. brightness widget's "Auto/Dim/40%/100%")

So now the formatted/translatable attributes are checked in string-array
too, and we can restore our proper percent signs.

Change-Id: I3478ab7e0b939e61fe0cec20201ac55096264080
2011-01-22 21:13:12 -08:00
Dianne Hackborn
35f4d32dc2 Merge "frameworks/base: Track owner in appropriate owners list of Uri" 2011-01-22 11:26:05 -08:00
Vairavan Srinivasan
91c12c27ef frameworks/base: Track owner in appropriate owners list of Uri
The owner isn't kept track it URI's writeOwners when
grantUriPermissionUncheckedLocked is invoked to provide both
read and write access to the URI. Fix is to check for both
read and write permissions and add owner to appropriate lists.

Change-Id: Id23688b96aefeb0a4911ee52ad47124bc5904fa0
2011-01-21 18:26:06 -08:00
Dianne Hackborn
a8069f34f6 Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 2011-01-21 09:23:29 -08:00
Keiji Ariyama
a84e088211 Fixes Keyboard availability in "Providing Resources" documentation page.
Added keyshidden value.

Change-Id: I9fb1a06971488f446ccafdfa3b0db17786b33f97
2011-01-22 01:58:25 +09:00
Jeff Brown
3d822cda1e Fix getSwitchState.
InputReader::getSwitchState always returns AKEY_STATE_UNKNOWN
because SwitchInputMapper::getSources() returns 0 which cannot
match any source mask including AINPUT_SOURCE_ANY.  As a result
initial lid switch detection is broken.

This change adds a new source constant AINPUT_SOURCE_SWITCH
that indicates that the source has switches.

Change-Id: I5321ecf0ce84f1c2b4535f6c163d3f4dcf9b7a9b
2011-01-19 20:35:47 -08:00
Brad Fitzpatrick
069e810c6a Merge "Fixing memory leak in PreferenceScreen." 2011-01-18 13:23:13 -08:00
Brad Fitzpatrick
ded2b00643 Merge "frameworks/base: remove redundant code in WindowManager" 2011-01-18 12:59:19 -08:00
Vairavan Srinivasan
3f6875f143 frameworks/base: remove redundant code in WindowManager
Change-Id: I8a356ca36129645977d33129e0d56c1b89f97fb0
2011-01-18 12:20:16 -08:00
Mathias Jeppsson
190acd4dd0 Fixing memory leak in PreferenceScreen.
Every time the PreferenceScreen is displayed a new ListView is
created and bound to the adapter. As the same adapter is used during
the lifetime of PreferenceScreen and the listviews never gets
unbound, the adapter will contain a list of unused views. The old view
should be unbound from adapter when we create a new view.

Change-Id: I13e2d0dc79c8ff79b58efa650653e3f84c6e53c5
2011-01-18 14:34:52 +01:00
Dianne Hackborn
7d234fabe6 Merge "Don't drop the drawable cache completely on configuration change" 2011-01-14 15:37:56 -08:00
Dianne Hackborn
c3d0d860b6 Merge "Make the Phone options dialog use current language" 2011-01-14 15:36:58 -08:00
Dianne Hackborn
0950a3ef36 Merge "Added check to make orientation calculations more robust" 2011-01-14 15:36:52 -08:00
Anders Hammar1
b6e34769ae Make the Phone options dialog use current language
The title of the Phone options dialog is displayed using wrong
translation if the user changes the current language setting. Moving
the setTitle call to prepareDialog to ensure that the title gets
updated before the dialog is shown.

Change-Id: I03ff59c7f4ff711a06b05de7cca94fa928cf67ef
2011-01-14 10:00:39 +01:00
Niclas Kellgren
494565ad1b Added check to make orientation calculations more robust
Added check avoid a division by zero resulting in NaN which in turn
makes checkFullyTilted to ignore high tilt angles from then on.
If (x, y, z) == (0, 0, 0) then there is no tilt or rotation and
this vector must be ignored. This check is extended to ignore all
small acceleration values where noise can be of big influence.

Low or zero readings can happen when space travelling free falling,
but more commonly when shaking or getting bad readings from the sensor.
The accelerometer is turned off when not used and polling it too soon
after it is turned on may result in (0, 0, 0).

Change-Id: I19aec653abb8ab6f7126778035c8c96449f1326f
2011-01-14 09:11:35 +01:00
Christopher Lais
8d71769b9b Don't drop the drawable cache completely on configuration change
There was a lot of fancy code just above the clear to ensure
that drawables that aren't affected by the change are kept,
then the entire array was cleared.  This patch removes the
clear, so that the drawables that haven't changed are really
kept, matching the logs, comments and larger part of the code.

This patch also fixes the various constant states to return
correct ChangingConfigurations.

Change-Id: Ic11f6179537318d3de16dc58286989eb62a07f15
Old-Change-Id: I22495e6ed232dfe056207ce5155405af1fa82428
2011-01-14 00:43:16 -06:00
Gloria Wang
a220a29799 Merge "Initial OMA DRM forward lock contribution" 2011-01-13 10:51:13 -08:00
Brad Fitzpatrick
bdb7aee0a4 Merge "Fix for crash when setting live wallpaper." 2011-01-12 15:45:05 -08:00
Mattias Petersson
d9463f50c8 Fix for crash when setting live wallpaper.
This fix prevents a crash that sometimes happens when setting a
live wallpaper. It happened when pressing "Set wallpaper" button
in the live wallpaper preview activity, before the preview was
fully loaded.

The crash happened in native code while updating the wallpaper
surface when calling mInputChannel.registerInputChannel(),
because the previous call to
mSession.add(mWindow, mLayout, View.VISIBLE, mContentInsets,
             mInputChannel)
had failed. The fix aborts the surface update when it is not
possible to add the window.

Change-Id: I0e79a851e5c7f7b15eb07043c63d1f4d78f14616
2011-01-12 15:41:55 +01:00
Brad Fitzpatrick
cb8427538d Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore" 2011-01-10 08:02:03 -08:00
Johannes Carlsson
872a52c6b6 Closing cursor in finalizer to avoid GREF and fd leak in acore
The finalize() call did not clean up completely, this eventually
caused the android.process.acore to crash since it ran out of fds
and GREF to increased above 2000 if an application forgot to close
its cursor objects. A warning was also added when this happens so
that application developers can correct their mistake. The
included test case tries to verify that the finalizer works as
expected by creating a bunch of Cursor objects without closing
them (without this fix the acore process crashes after about 400
iterations and the test case ends with "Process crashed").

Change-Id: I11e485cef1ac02e718b2742108aa88793666c31d
2011-01-10 12:46:21 +01:00
Romain Guy
fcf3d12d70 Merge "Typo in Javadoc" 2011-01-08 10:04:32 -08:00
Christian Mehlmauer
bd6fda11d2 Typo in Javadoc
Change-Id: I911ce02cab178f64aab222e4abcd25d113d75ec5
2011-01-08 18:22:20 +01:00
Gloria Wang
0544d05990 Merge "DRM Framework bug fixes." 2011-01-07 11:10:49 -08:00
Dianne Hackborn
3c902a62ed Merge "Avoiding cyclic references when unbinding from a service" 2011-01-07 00:43:15 -08:00
Mattias Petersson
5f619b7d95 Avoiding cyclic references when unbinding from a service
Cyclic references can occur between a Service object held by an
application and a ServiceRecord object held by the system server.
A part of the problem is that binders are leaked and since many binders
are implemented by inner classes of services these services are also leaked.
This causes low memory problems. The solution is: When a Service is beeing
destroyed, go through the ServiceRecord's all IntentBindRecord and set its
binder references to null. This allows the binder and the service object to
be garbage collected.

Change-Id: I5a257521964851f34c08ffb3908feaad96b1bafe
2011-01-07 07:56:46 +01:00
Dianne Hackborn
3769240b79 Merge "Clear reference to the IIntentReceiver in order to avoid memory leak" 2011-01-05 19:10:15 -08:00
Pravat Dalbehera
a3e96bfa89 Initial OMA DRM forward lock contribution
OMA DRM forward lock agent is plugged into the
Open DRM framework. Forward lock agent implementation contains:
- Forward lock engine to communicate with framework
- Converter to encrypt the original file into a special format
- Decoder to feed the decrypted data for rendering
- Lightweight unique key-encryption mechanism
- Documentation

Change-Id: Id828ebc30b8147b58b14960a73571648bc01ae94
2011-01-05 09:02:51 +01:00
Shachar Shemesh
9872bf4a2d Normalize output from aapt d
Make the output from aapt dump --values resources and aapt dump xmltree normalized, so that it is unambigously displayed
regardless of the content of the strings.

Change-Id: Ia3bff36c4ee1e9a44f474534e154830948beabdf
2011-01-04 20:52:08 +02:00
Johannes Carlsson
5897591537 Clear reference to the IIntentReceiver in order to avoid memory leak
When using sendOrderedBroadcast(..) with a BroadcastReceiver the
BroadcastReceiver instance was not released. The reason for this was that
the resultTo field in the BroadcastRecord kept a reference until it was pushed
out of the mBroadcastHistory. This reference in turn kept a reference to the
process side IIntentReceiver (implemented in ReceiverDispatcher$InnerReceiver).
This in turn had a strong reference (through mStrongRef) to the Context.

In order to keep the debug output the resultTo is also kept as a String in the
new resultToString variable.

Change-Id: I4382a22a541c27b3694fb2b78a04ee820b235f8f
2011-01-04 09:15:09 +01:00
Johan Redestig
5ef0b9d724 Make AaptGroupEntry::getMncName accept mnc00
MNC 00 is a valid network code and is used by
some operators, see http://en.wikipedia.org/wiki/Mobile_Network_Code.

Remove the test that checks if atoi returns zero.
The string is validated to contain only numbers
already.

Also discussed here:
https://code.google.com/p/android/issues/detail?id=3657

Change-Id: I3220d7980abe4067c9e7aa4cbc10b5fd0b8c9ea7
2011-01-04 07:30:32 +01:00
Jean-Baptiste Queru
69ebb984f2 Merge "according to rfc2617, nc-value = 8LHEX" 2010-12-28 15:33:10 -08:00
Jean-Baptiste Queru
bfb5f5966b Merge "Fix for writing empty strings to Parcel::writeString8()" 2010-12-28 11:25:50 -08:00
Jean-Baptiste Queru
752942ec47 Merge "The phone is crashing when unknown mime content is transferred." 2010-12-28 10:34:02 -08:00