OSDN Git Service
Romain Guy [Sat, 8 Jan 2011 18:04:32 +0000 (10:04 -0800)]
Merge "Typo in Javadoc"
Christian Mehlmauer [Sat, 8 Jan 2011 17:22:20 +0000 (18:22 +0100)]
Typo in Javadoc
Change-Id: I911ce02cab178f64aab222e4abcd25d113d75ec5
Gloria Wang [Fri, 7 Jan 2011 19:10:49 +0000 (11:10 -0800)]
Merge "DRM Framework bug fixes."
Dianne Hackborn [Fri, 7 Jan 2011 08:43:15 +0000 (00:43 -0800)]
Merge "Avoiding cyclic references when unbinding from a service"
Mattias Petersson [Wed, 27 Oct 2010 07:32:51 +0000 (09:32 +0200)]
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
Dianne Hackborn [Thu, 6 Jan 2011 03:10:15 +0000 (19:10 -0800)]
Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
Johannes Carlsson [Wed, 27 Oct 2010 08:08:10 +0000 (10:08 +0200)]
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
Jean-Baptiste Queru [Tue, 28 Dec 2010 23:33:10 +0000 (15:33 -0800)]
Merge "according to rfc2617, nc-value = 8LHEX"
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:25:50 +0000 (11:25 -0800)]
Merge "Fix for writing empty strings to Parcel::writeString8()"
Jean-Baptiste Queru [Tue, 28 Dec 2010 18:34:02 +0000 (10:34 -0800)]
Merge "The phone is crashing when unknown mime content is transferred."
Bin Jin [Sat, 25 Dec 2010 09:53:30 +0000 (17:53 +0800)]
according to rfc2617, nc-value = 8LHEX
Change-Id: I8646fd8d68cfa4786ee6fc24a757b2af93955c4b
Dianne Hackborn [Thu, 23 Dec 2010 22:17:54 +0000 (14:17 -0800)]
Merge "frameworks/base: Fix to release references to previous live wallpaper"
Dianne Hackborn [Thu, 23 Dec 2010 22:14:38 +0000 (14:14 -0800)]
Merge "frameworks/base: Fix to release references in ActivityManagerService"
Vairavan Srinivasan [Thu, 23 Dec 2010 22:05:44 +0000 (14:05 -0800)]
frameworks/base: Fix to release references to previous live wallpaper
The service connection to the previous live wallpaper is unbound when
a new wallpaper is effective. Although the service connection is
unbound it is not disconnected and its reference to wallpaper's
service and engine is still effective. This adds up to the total
JNI references and causes dalvik (hosting system_server) to abort.
Fix is to release the references in clearWallpaperComponentLocked.
Change-Id: Idd2bab83a56d2e6c6dd7ab9be08d5e14887aa384
Vairavan Srinivasan [Thu, 23 Dec 2010 21:51:48 +0000 (13:51 -0800)]
frameworks/base: Fix to release references in ActivityManagerService
ServiceRecord's bindings is a hashmap to keep track of all active
bindings to the service. This is not cleared when the service is
brought down by activity manager. This adds up the references to
IntentBindRecords and its references to ServiceRecord. Fix is to
clear the bindings.
ServiceRecord's restarter is a reference to the service and is not
cleared when the service is brought down by activity manager. This
adds up the references to ServiceRecord. Fix is to set the reference
to null when the service is brought down by activity manager.
Change-Id: Ica448cd5f60192c8adb23209b5d0e2cf0c04e446
Dianne Hackborn [Wed, 22 Dec 2010 19:21:21 +0000 (11:21 -0800)]
Merge "Improve performance of WindowState.toString()"
Pravat Dalbehera [Wed, 15 Dec 2010 07:40:00 +0000 (08:40 +0100)]
Fix for writing empty strings to Parcel::writeString8()
If writeString8 is called with the following sequence:
writeString8(String8(""));
writeString8(String8("TempString"));
Then in the readString8, the 2nd String i.e. "TempString" is not read,
instead an empty string is read.
The bug comes because of the write call for String8("") where there are
no String bytes present. In the write Statement, an extra ‘\0’ is
written. During the Marshalling, Following bytes are written:
1 2 3 4 5 ...
0x0 0x0 0xB ‘T’ ‘e’ ...
The readString8 function has a check that, if String length is 0, don’t
read anything. So the first byte is read as the length for the first
string. The second byte i.e. ‘\0’ is read as the length for the second
string and hence the second string becomes empty too.
Change-Id: Id7acc0c80ae16e77be4331f1ddf69ea87e758420
Jean-Baptiste Queru [Tue, 21 Dec 2010 18:27:14 +0000 (10:27 -0800)]
Merge "Support for KSC5601 on SIM."
Erik Zivkovic [Wed, 16 Jun 2010 09:00:29 +0000 (11:00 +0200)]
Support for KSC5601 on SIM.
Korean phones write to the ADN record of the SIM in a non-standard way.
When UCS2 is not used, the alphaTag will be written in the KSC5601
encoding. This contribution adds support for reading that format when
a Korean SIM card is used.
Also adds support for KSC5601 in SMS.
Change-Id: I81a4a6949359b4d23a937ac2d813bafed2b85ff6
Mattias Petersson [Tue, 21 Dec 2010 09:15:11 +0000 (10:15 +0100)]
Improve performance of WindowState.toString()
This fix improves the performance by caching the string that should
be returned, and reuse it next time if possible.
This will make it faster to switch between activities, approximately
half the time to create the new view when changing from landscape to
portrait. Also, the time for starting a new application is be reduced
as WindowState.toString is being called thousands of times in this
case.
Change-Id: I2b8b9bc1e251d1af43b6c85f049c01452f2573a2
Ola Olsson [Mon, 20 Dec 2010 15:45:35 +0000 (16:45 +0100)]
The phone is crashing when unknown mime content is transferred.
The content resolver does not take care of the IllegalStateException
that is thrown in getType and that needs to be fixed.
Change-Id: I3e66f1aa259ab91fb9233e1ba07faa1ab6c3f2dd
Jean-Baptiste Queru [Mon, 13 Dec 2010 21:06:13 +0000 (13:06 -0800)]
resolved conflicts for merge of
4b94c451 to stage-korg-master
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
Jean-Baptiste Queru [Mon, 13 Dec 2010 20:34:48 +0000 (12:34 -0800)]
Merge "Added dropbox broadcast notification"
Wink Saville [Thu, 9 Dec 2010 21:58:26 +0000 (13:58 -0800)]
am
19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '
19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
Fix for phone app crash in Icc Card.
Wink Saville [Thu, 9 Dec 2010 21:50:28 +0000 (13:50 -0800)]
Merge "Fix for phone app crash in Icc Card."
Jean-Baptiste Queru [Thu, 9 Dec 2010 17:11:06 +0000 (09:11 -0800)]
merge from gingerbread
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
Dianne Hackborn [Tue, 7 Dec 2010 19:14:53 +0000 (11:14 -0800)]
Add more checks for bad values to protect from corrupt files.
Change-Id: I5e282099e7c6fcc8756146fc7282eec31937af1f
Kenny Root [Wed, 1 Dec 2010 19:37:36 +0000 (11:37 -0800)]
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Be compatible with the old DownloadProvider behavior of being able to
operate on content URIs returned from .insert()
Bug:
3242328
Change-Id: Ibd2ed553c87ea694d4b09a8265c7131fae588719
Wink Saville [Thu, 9 Dec 2010 05:53:24 +0000 (21:53 -0800)]
am
7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '
7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
frameworks/base/telephony: Release wakelock on RIL request send error
Wink Saville [Thu, 9 Dec 2010 05:37:38 +0000 (21:37 -0800)]
Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
Uma Maheswari Ramalingam [Fri, 22 Oct 2010 17:07:41 +0000 (10:07 -0700)]
Fix for phone app crash in Icc Card.
- Check for active phone in ICC handler before processing messages.
- Boundary check for gsm/cdma subscription app index
while retrieving the ICC Card App.
Change-Id: I3d54447e8d48e3482763e78eeb2a737a34cec321
Anshul Jain [Mon, 22 Nov 2010 19:28:36 +0000 (11:28 -0800)]
frameworks/base/telephony: Release wakelock on RIL request send error
Android telephony does not release the partial wakelock right away if
there is an error in sending the RIL request. The wake lock is released
only after EVENT_WAKE_LOCK_TIMEOUT occurs that prevents the phone to go
in power collpase. The change is to release the wake lock as soon as the
error in send is detected.
Also, change RIL#send not not send a request if there is no connection to
vendor RIL, as the request will always fail.
Change-Id: Ia39a4b9ac12f4064e301a65abfd26409d49babe1
Hakan Still [Tue, 7 Dec 2010 13:05:55 +0000 (14:05 +0100)]
Added dropbox broadcast notification
To monitor the dropbox an application have to either poll the dropbox
and keep track of all entries or observ the /data/system/dropbox
directory. The later requires that the application runs as system-user.
This commit adds that a broadcast intent is sent when something is written
to the dropbox and an application can just listen on this intent and
then reads the entry with help of the DropboxManager class.
The application have to hold the permission android.permission.READ_LOGS
to get the intent.
Change-Id: I1f77f206a243df69f4ed5306078c47f7bf6181ec
Wink Saville [Wed, 8 Dec 2010 06:18:14 +0000 (22:18 -0800)]
am
2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
* commit '
2b858caecb3c293c47b48eed12a55a49e3039874':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
Wink Saville [Wed, 8 Dec 2010 05:57:53 +0000 (21:57 -0800)]
Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
Jean-Baptiste Queru [Tue, 7 Dec 2010 20:47:12 +0000 (12:47 -0800)]
resolved conflicts for merge of
78742e01 to stage-korg-master
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
Jean-Baptiste Queru [Tue, 7 Dec 2010 20:01:25 +0000 (12:01 -0800)]
Merge "Strings for NI position request are moved to resources"
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:43:36 +0000 (13:43 -0800)]
am
1d67fa5b: Merge "Changing connect and response timeout."
* commit '
1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
Changing connect and response timeout.
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:39:19 +0000 (13:39 -0800)]
Merge "Changing connect and response timeout."
Jean-Baptiste Queru [Mon, 6 Dec 2010 19:03:11 +0000 (11:03 -0800)]
am
864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '
864b1e007dc741ec10c23cabc0271f97a5b8c598':
NumberPicker: Set formatter local value to US.
Jean-Baptiste Queru [Mon, 6 Dec 2010 18:57:04 +0000 (10:57 -0800)]
Merge "NumberPicker: Set formatter local value to US."
Chen Libao [Mon, 6 Dec 2010 09:32:53 +0000 (10:32 +0100)]
NumberPicker: Set formatter local value to US.
As the Arabic language formatter would make number "1,2,3" to Arabic
language word means one,two,three, NumberPicker won't like to show
any thing other than numbers, add local settings to US, make the
number 1,2,3
Change-Id: If2d161ac4133f6c9c6e1ec284d6d2fbf01855fa0
Henrik Baard [Thu, 18 Nov 2010 13:08:36 +0000 (14:08 +0100)]
Changing connect and response timeout.
In bad network conditions and where switches often occur between 2G and
3G the timeout of 20s is too short.
Setting this timeout to 60 seconds will improve functionality in bad conditions
while it will not affect functionality in good networks. This change also aligns
the timeouts with the timeouts used by the Browser (Connection.java).
Change-Id: I0fbe3cbfe734f8d55a41bfa5d8ab6b332a19f912
Hakan Gustavsson [Mon, 22 Nov 2010 15:08:35 +0000 (16:08 +0100)]
Strings for NI position request are moved to resources
The strings used by the framework for network initiated position
requests are now string resources that can be properly localized.
Change-Id: If1cba89adb1bfcb9c8fdb59b9c5aa1107b11279e
Jean-Baptiste Queru [Thu, 2 Dec 2010 23:16:53 +0000 (15:16 -0800)]
resolved conflicts for merge of
bf1439c5 to stage-korg-master
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
Jean-Baptiste Queru [Thu, 2 Dec 2010 22:56:13 +0000 (14:56 -0800)]
Merge "Preserve flags field of event passed to injectKeyEvent()"
Mike Playle [Mon, 29 Nov 2010 16:01:03 +0000 (16:01 +0000)]
Preserve flags field of event passed to injectKeyEvent()
This patch allows users of WindowManagerService.injectKeyEvent() to
set flags on the key event being injected.
In particular this allows long presses (FLAG_LONG_PRESS) to be
injected into the window manager.
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:55:02 +0000 (07:55 -0800)]
Merge from open-source master
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:54:49 +0000 (07:54 -0800)]
Merge from open-source master
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
Jean-Baptiste Queru [Wed, 1 Dec 2010 17:47:14 +0000 (09:47 -0800)]
Merge "Fix crash by "adb shell pm list permissions -f|-s""
Jean-Baptiste Queru [Wed, 1 Dec 2010 16:25:12 +0000 (08:25 -0800)]
Merge "Fix HTTP redirect missing statuscode 303 and 307"
Ali Utku Selen [Tue, 30 Nov 2010 09:37:10 +0000 (10:37 +0100)]
Fix crash by "adb shell pm list permissions -f|-s"
pm command makes the assumption that every permission should
contain android:description and android:label attributes while
they are not mandatory. If a permission does not contain these
two attributes, we get "android.content.res.
Resources$NotFoundException: String resource ID #0x0"
followed by a NPE when using -f or -s options.
With the following change, users will get "null" in output for
respective fields.
Change-Id: I4e7f407592fa071abdab1d979775f46ec27dc9d2
Takeshi Aimi [Tue, 30 Nov 2010 07:27:42 +0000 (16:27 +0900)]
DRM Framework bug fixes.
- Make sure to clean-up obsolete listeners.
- Close cursor after using it.
- Add virtual destructor to the base class of OnInfoListener.
Changes are made by SEMC and Sony.
Change-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139
Per Osbäck [Mon, 29 Nov 2010 14:59:12 +0000 (15:59 +0100)]
Fix HTTP redirect missing statuscode 303 and 307
Change-Id: I1c5f3a9f348a05d0558b31f912e10a59382eb24c
Trevor Johns [Thu, 25 Nov 2010 00:23:47 +0000 (16:23 -0800)]
am
210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
* commit '
210e9c4a8b1fdbe9c409f9ce426907587430858a':
Revert "Disabling AccessibilityService sample from build system."
Trevor Johns [Thu, 25 Nov 2010 00:21:16 +0000 (16:21 -0800)]
Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
Trevor Johns [Thu, 25 Nov 2010 00:03:21 +0000 (16:03 -0800)]
Revert "Disabling AccessibilityService sample from build system."
This re-enables the AccessibilityService sample.
This reverts commit
ca9d51b15074163521b140dce431cc3a10cb56fe.
Xia Wang [Wed, 24 Nov 2010 21:29:56 +0000 (13:29 -0800)]
am
c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
* commit '
c1c04ad047d7ca2f13aa5c9883da7219df5bee57':
Add Wi-Fi tests for static IP. DO NOT MERGE
Xia Wang [Wed, 24 Nov 2010 21:27:53 +0000 (13:27 -0800)]
Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
Scott Main [Wed, 24 Nov 2010 20:43:08 +0000 (12:43 -0800)]
am
93116f8f: am
3577f51d: docs: clarify <include> layout properties bug:
3227820
* commit '
93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
docs: clarify <include> layout properties bug:
3227820
Scott Main [Wed, 24 Nov 2010 20:39:42 +0000 (12:39 -0800)]
am
3577f51d: docs: clarify <include> layout properties bug:
3227820
* commit '
3577f51d4bc236a11e283855337752a7b6897f8b':
docs: clarify <include> layout properties bug:
3227820
Scott Main [Wed, 24 Nov 2010 19:24:33 +0000 (11:24 -0800)]
docs: clarify <include> layout properties
bug:
3227820
Change-Id: Id5130cd805ee2ea545a795019fb375ffd841727f
Jean-Baptiste Queru [Tue, 23 Nov 2010 19:14:57 +0000 (11:14 -0800)]
am
f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"
* commit '
f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
frameworks/base: Destroy the overlay even if there is an error
Jean-Baptiste Queru [Tue, 23 Nov 2010 19:02:09 +0000 (11:02 -0800)]
Merge "frameworks/base: Destroy the overlay even if there is an error"
Gloria Wang [Tue, 23 Nov 2010 05:26:13 +0000 (21:26 -0800)]
am
4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
* commit '
4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
Gloria Wang [Tue, 23 Nov 2010 05:25:56 +0000 (21:25 -0800)]
am
d9334934: Merge "Update of DRM Framework."
* commit '
d93349342a89a25c7a884e8543c6adc048c5f86d':
Update of DRM Framework.
Gloria Wang [Tue, 23 Nov 2010 05:15:07 +0000 (21:15 -0800)]
Merge "Notify the playback status to DRM agents before the playback starts"
Gloria Wang [Tue, 23 Nov 2010 05:14:09 +0000 (21:14 -0800)]
Merge "Update of DRM Framework."
Xia Wang [Tue, 23 Nov 2010 02:48:17 +0000 (18:48 -0800)]
Add Wi-Fi tests for static IP. DO NOT MERGE
- Add support in parser to parse static IP settings
- Add test for static IP configuration
Change-Id: I37e11ceb0f34c87113d8281b4de09893506c29e7
Jean-Baptiste Queru [Tue, 23 Nov 2010 00:32:34 +0000 (16:32 -0800)]
resolved conflicts for merge of
e4ae7fc3 to gingerbread-plus-aosp
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
Jean-Baptiste Queru [Mon, 22 Nov 2010 23:59:04 +0000 (15:59 -0800)]
Merge "Enabling cell broadcast (SMS-CB) support in the platform."
Xia Wang [Mon, 22 Nov 2010 22:46:33 +0000 (14:46 -0800)]
am
5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
* commit '
5df8c155872833647ac56951ab90bd26a9af9480':
Add Wifi Tethering stress test
Xia Wang [Mon, 22 Nov 2010 22:44:49 +0000 (14:44 -0800)]
Merge "Add Wifi Tethering stress test" into gingerbread
Naomi Luis [Thu, 18 Nov 2010 20:48:25 +0000 (12:48 -0800)]
frameworks/base: Destroy the overlay even if there is an error
Allow the overlay object to be destroyed whenever the destroy is
invoked. Currently the destroy call returns if there is an error
encountered, which results in open data and control channels.
Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
Scott Main [Mon, 22 Nov 2010 21:55:55 +0000 (13:55 -0800)]
am
8fac7c2e: change sdk version variable to 2.3 (for docs)
* commit '
8fac7c2edc433b6c7d153caac238fef595133663':
change sdk version variable to 2.3 (for docs)
Jean-Baptiste Queru [Mon, 22 Nov 2010 21:44:56 +0000 (13:44 -0800)]
am
b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
* commit '
b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
Jean-Baptiste Queru [Mon, 22 Nov 2010 21:40:29 +0000 (13:40 -0800)]
Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
Scott Main [Mon, 22 Nov 2010 21:36:39 +0000 (13:36 -0800)]
change sdk version variable to 2.3 (for docs)
Change-Id: I76f5c69fab08913543c4f3d1ab000f7c4b6c9574
Xia Wang [Tue, 16 Nov 2010 19:35:47 +0000 (11:35 -0800)]
Add Wifi Tethering stress test
Stress Wifi driver loading and unloading by enable/disable access point
mode.
Change-Id: Ie31266d2b9665cb304473f1c14c83bc57e9920f2
Gloria Wang [Fri, 5 Nov 2010 00:38:39 +0000 (17:38 -0700)]
Notify the playback status to DRM agents before the playback starts
Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a
Deepika Sai Amuri [Mon, 22 Nov 2010 09:26:55 +0000 (01:26 -0800)]
SearchDialog: Fix for NullpointerException while using Suggestions in
Browser
Change-Id: Ic208ae51e4f7678363ea6d7de9db97707713bf6d
Dirk Dougherty [Sat, 20 Nov 2010 03:04:56 +0000 (19:04 -0800)]
am
805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
* commit '
805bddc123c1fc56be333d6ff365f168d4bc2b08':
doc change: Docs for SDK Tools r8, ADT 8
Dirk Dougherty [Sat, 20 Nov 2010 03:03:03 +0000 (19:03 -0800)]
Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
Wu-cheng Li [Sat, 20 Nov 2010 02:17:24 +0000 (18:17 -0800)]
am
589e8381: Merge "Improve camera documentation." into gingerbread
* commit '
589e838116b0dffa696fa39336d0588124877f98':
Improve camera documentation.
Wu-cheng Li [Sat, 20 Nov 2010 02:14:43 +0000 (18:14 -0800)]
Merge "Improve camera documentation." into gingerbread
Mathias Agopian [Sat, 20 Nov 2010 01:20:14 +0000 (17:20 -0800)]
am
927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
* commit '
927e7410000dd1917387c01fc4229836ddd5eb97':
Fix SensorManager.getOrientation() documentation.
Mathias Agopian [Sat, 20 Nov 2010 01:18:21 +0000 (17:18 -0800)]
Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
Scott Main [Sat, 20 Nov 2010 00:51:57 +0000 (16:51 -0800)]
am
828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462" into gingerbread
* commit '
828b68166679ebfc0002e2ea516ca91e6fb13597':
docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462
Scott Main [Sat, 20 Nov 2010 00:48:50 +0000 (16:48 -0800)]
Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462" into gingerbread
Mathias Agopian [Sat, 20 Nov 2010 00:25:11 +0000 (16:25 -0800)]
Fix SensorManager.getOrientation() documentation.
This function doesn't use the same reference coordinate system used
for the rotation matrix, unlike what the documentation previously
stated.
Change-Id: I38abeb74540d33b67f72993b54d7a00a73588dde
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:21:31 +0000 (16:21 -0800)]
resolved conflicts for merge of
e2ec61b2 to gingerbread-plus-aosp
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:50:29 +0000 (15:50 -0800)]
Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files."
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:43:28 +0000 (15:43 -0800)]
am
e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
* commit '
e3bef7c48d7ec13cb8c7c81dba8d775377e69bed':
Added noop unregisterReceiver to complement existing noop registerReceiver.
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:31:30 +0000 (15:31 -0800)]
Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
Dirk Dougherty [Fri, 19 Nov 2010 18:53:20 +0000 (10:53 -0800)]
am
0e29064d: Merge "Doc change: update media formats table." into gingerbread
* commit '
0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
Doc change: update media formats table.
Dirk Dougherty [Fri, 19 Nov 2010 18:47:10 +0000 (10:47 -0800)]
Merge "Doc change: update media formats table." into gingerbread
Brad Fitzpatrick [Fri, 19 Nov 2010 18:25:09 +0000 (10:25 -0800)]
am
251384a7: Merge "Improve performance when getting styled string."
* commit '
251384a7595022ddbc53f4ab0fa386f9c040f1f5':
Improve performance when getting styled string.
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:24:51 +0000 (10:24 -0800)]
am
14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
* commit '
14ac9546367d4df37eead55f6762b944b49f33b2':
build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
Brad Fitzpatrick [Fri, 19 Nov 2010 15:41:39 +0000 (07:41 -0800)]
Merge "Improve performance when getting styled string."
Henrik Hall [Fri, 19 Nov 2010 14:00:00 +0000 (15:00 +0100)]
Enabling cell broadcast (SMS-CB) support in the platform.
Adding a simple API enabling applications to control SMS-CB reception.
Implementing parsing, assembly and dispatching of SMS-CB messages over GSM.
Change-Id: Iee841605a45a3af60c7602af175056afb03a38da