OSDN Git Service

android-x86/frameworks-base.git
13 years agoDocument per-implementation behaviors of native get* methods
Daniel Trebbien [Sun, 31 Oct 2010 19:21:05 +0000 (12:21 -0700)]
Document per-implementation behaviors of native get* methods

Change-Id: I5d20d7796b85ce62750dd50dd79e47d76716b24c

13 years agoClarify documentation of Cursor get* methods.
Daniel Trebbien [Sun, 31 Oct 2010 19:19:07 +0000 (12:19 -0700)]
Clarify documentation of Cursor get* methods.

Make clear in the Javadoc comments of the `Cursor` get* methods that
implementations thereof can have implementation-defined behavior. In some cases,
these changes actually correct the documentation. For example, in the case of
`getShort` and the `SQLiteCursor` implementation thereof, non-numeric data is
*not* converted to a `short` via Short#valueOf or even in a functionally-
equivalent manner.

Change-Id: Ib2f81811a603680b52fc482eb9c0f3195447566f

13 years agoMerge "- Move the business rule management down to DRM agents. - Do not register...
Gloria Wang [Tue, 2 Nov 2010 03:38:51 +0000 (20:38 -0700)]
Merge "- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled."

13 years ago- Move the business rule management down to DRM agents.
Gloria Wang [Fri, 29 Oct 2010 17:09:47 +0000 (10:09 -0700)]
- Move the business rule management down to DRM agents.
- Do not register DRM sniffer because drmserver is not enabled.

Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f

13 years agoMerge "TabWidget orientation"
Jean-Baptiste Queru [Mon, 1 Nov 2010 20:19:02 +0000 (13:19 -0700)]
Merge "TabWidget orientation"

13 years agoMerge "Bluetooth OBEX timeout problem."
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:46:36 +0000 (10:46 -0700)]
Merge "Bluetooth OBEX timeout problem."

13 years agoMerge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android...
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:29:22 +0000 (10:29 -0700)]
Merge "Fixes Issue 7907 in the public bugs database (code.google.com/p/android/issues/detail?id=7907)."

13 years agoMerge "fix typo"
Romain Guy [Sun, 31 Oct 2010 18:12:51 +0000 (11:12 -0700)]
Merge "fix typo"

13 years agoFixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues...
Daniel Trebbien [Sun, 31 Oct 2010 14:42:35 +0000 (07:42 -0700)]
Fixes Issue 7907 in the public bugs database (code.google.com/p/android/issues/detail?id=7907).

The Javadoc comment for class `android.content.UriMatcher` had four issues:
1. The example calls to `addURI` should not be using a leading forward slash in
   the path parameter (reported by Ester Ytterbrink).
2. The sample code to construct a `UriMatcher` was incorrect because the
   `UriMatcher` constructor takes a parameter (reported by Ross Light).
3. The code example for using `match` was incorrect because it showed two
   parameters being passed, when `match` only takes one (reported by
   Ross Light).
4. The sample `getType` implementations were incorrect because `getType` takes
   a `Uri` object, not an array of `String`s.

Change-Id: I560bff6f021c13cabf736f40ff0f47a205074291

13 years agofix typo
Uwe Voelker [Sun, 31 Oct 2010 09:08:04 +0000 (10:08 +0100)]
fix typo

Change-Id: Ib36aabc68128d1b2b8c41b965a10be2ab2f4cd93

13 years agoBluetooth OBEX timeout problem.
Anders Petersson [Wed, 27 Oct 2010 06:38:30 +0000 (08:38 +0200)]
Bluetooth OBEX timeout problem.

Long time to show notification of file transfer failed after
canceling transfer via remote part.

Device A is in contact with our device, B. When device A Cancel
a transfer operation, it sends OBEX_OPCODE_DISCONNECT HeaderID
and the length of package to B. B use the length of package to
read remainder bytes from A. If the bytes B read do not meet the
received length it will block and wait for remainder bytes from A.
But when B compute the remainder bytes it forgets to subtract
the three bytes it has already read through HeaderID and the length
of the package. So the operation was blocked until the operation
timeout.

Change-Id: I0f8bf62d3119e081b5c01af9fc05fe586fd4fabc

13 years agoTabWidget orientation
Roger Olsson [Tue, 26 Oct 2010 12:41:01 +0000 (14:41 +0200)]
TabWidget orientation

TabWidget orientation specified in tab_content.xml instead of TabWidget.java.
Generally, the orientation of the TabWidget should be set in xml-files
and not in TabWidget.java. A sub class of TabActivity may call setContentView()
using a custom layout where the TabWidget orientation is vertical.
This is the case in the UI Enablers Bottom Tab feature, for landscape
display orientation.

Change-Id: Ia677441a0af96a8d2ab47ef3298eb440c34924f6

13 years agoMerge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"
Jean-Baptiste Queru [Mon, 25 Oct 2010 22:32:12 +0000 (15:32 -0700)]
Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"

13 years agoMerge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMEx...
Gloria Wang [Mon, 25 Oct 2010 19:23:35 +0000 (12:23 -0700)]
Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for   DRM audio/video playback"

13 years agoDRM framework support:
Gloria Wang [Tue, 22 Jun 2010 20:55:38 +0000 (13:55 -0700)]
DRM framework support:
- add a sniffer for DRM files
- add DRMSource and DRMExtractor for es_based DRM
- add pread in FileSource.cpp for container_based DRM
- add native DRM framework API calls in the player for
  DRM audio/video playback

Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f

13 years agoMerge "Make layoutlib use the prebuilt of layoutlib_api"
Xavier Ducrohet [Fri, 22 Oct 2010 20:28:39 +0000 (13:28 -0700)]
Merge "Make layoutlib use the prebuilt of layoutlib_api"

13 years agoMake layoutlib use the prebuilt of layoutlib_api
Xavier Ducrohet [Fri, 22 Oct 2010 01:32:37 +0000 (18:32 -0700)]
Make layoutlib use the prebuilt of layoutlib_api

Change-Id: Ie04a9e847acacf7b2aeb179589517fc75688c75b

13 years agoMerge "Make the base direction of the Arabic error pages RTL"
Brad Fitzpatrick [Thu, 21 Oct 2010 14:18:18 +0000 (07:18 -0700)]
Merge "Make the base direction of the Arabic error pages RTL"

13 years agoMerge "Set the base direction of the Hebrew error pages to RTL"
Brad Fitzpatrick [Thu, 21 Oct 2010 14:18:02 +0000 (07:18 -0700)]
Merge "Set the base direction of the Hebrew error pages to RTL"

13 years agoMerge "Make disabled TextViews uneditable"
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:46:52 +0000 (16:46 -0700)]
Merge "Make disabled TextViews uneditable"

13 years agoMerge "BatteryService: Set bool to true if sysfs entry is not 0"
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:35:17 +0000 (16:35 -0700)]
Merge "BatteryService: Set bool to true if sysfs entry is not 0"

13 years agoMerge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)--...
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:29:15 +0000 (16:29 -0700)]
Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"

13 years agoMake the base direction of the Arabic error pages RTL
Shachar Shemesh [Tue, 19 Oct 2010 13:05:40 +0000 (15:05 +0200)]
Make the base direction of the Arabic error pages RTL

Change-Id: I10df9cb92d18850e8893298b2edfd9e57ca5cfef

13 years agoSet the base direction of the Hebrew error pages to RTL
Shachar Shemesh [Tue, 19 Oct 2010 13:04:02 +0000 (15:04 +0200)]
Set the base direction of the Hebrew error pages to RTL

Change-Id: I435e724f9638e294b7e03527e7c6244a307f010e

13 years agoMerge "jni: Remove duplicated jniThrowException()"
Jean-Baptiste Queru [Tue, 19 Oct 2010 21:42:52 +0000 (14:42 -0700)]
Merge "jni: Remove duplicated jniThrowException()"

13 years agoFix FastScroller overlay position bug
NoraBora [Tue, 12 Oct 2010 13:59:55 +0000 (06:59 -0700)]
Fix FastScroller overlay position bug
after setFastScrollEnabled(false)-->setFastScrollEnabled(true)
the overlay shows up at the top-left instead of center

Change-Id: Idd5d4640398def8391f99962bd1838a3bde98157

13 years agoMake disabled TextViews uneditable
Janos Levai [Thu, 14 Oct 2010 23:53:58 +0000 (02:53 +0300)]
Make disabled TextViews uneditable

Fixes Issue 2771
From now on:
 disabling a TextView closes the associated on-screen keyboard
 selecting a disabled TextView does not open the on-screen keyboard
 can't edit contents if the disabled TextView focus is gained by the directional keys

Change-Id: I44e3c0aff2a0ce1e6426818bfe16c1d19c7c18ac

13 years agojni: Remove duplicated jniThrowException()
Jim Huang [Sun, 17 Oct 2010 13:08:53 +0000 (21:08 +0800)]
jni: Remove duplicated jniThrowException()

Change-Id: I73a910e4efbf84393b3ce5d7f6e58e61ca88d484

13 years agoBatteryService: Set bool to true if sysfs entry is not 0
Axel Haslam [Tue, 12 Oct 2010 22:01:23 +0000 (17:01 -0500)]
BatteryService: Set bool to true if sysfs entry is not 0

For the musb to recognized as online, the musbOnline value
has to be set. The battery driver sets the online property
of the sysfs as "3" when the charger type is USB.

The way the current code is, if the value is not 1,
musbOnline would be false and the menu to mount the
sdcard on the pc would not pop-up.

Since the linux driver returns 0 if the cable is not
connected, and 3 if the cable is connected, we should
set the boolean variable to 0 only if the sysfs value
is 0, otherwise we set it to true.

Change-Id: I538d8de446e7ea4f620ffcce156a57cf56b5a4e5
Signed-off-by: Axel Haslam <axelhaslam@ti.com>
13 years agoMerge "Fix sometimes mExpandedView will appear while screen transforming."
Joe Onorato [Mon, 11 Oct 2010 22:44:14 +0000 (15:44 -0700)]
Merge "Fix sometimes mExpandedView will appear while screen transforming."

13 years agoMerge "Fix compile errors in telephony tests"
Jean-Baptiste Queru [Mon, 11 Oct 2010 22:11:59 +0000 (15:11 -0700)]
Merge "Fix compile errors in telephony tests"

13 years agoframeworks/base: Handle null from topRunningNonDelayedActivityLocked
Vairavan Srinivasan [Thu, 7 Oct 2010 22:12:53 +0000 (15:12 -0700)]
frameworks/base: Handle null from topRunningNonDelayedActivityLocked

startActivityUncheckedLocked tries to move the target task to front
when it is not at front. topRunningNonDelayedActivityLocked is used
to find the current task, however null value isn't handled. This
null causes an unhandled exception leading to the android framework
reboot.

Change-Id: I2a43cda50483e28a4456846d8b3ccb30d7cf110e

13 years agoMerge "Dismissing AlertDialog before destroying WebView."
Jean-Baptiste Queru [Mon, 11 Oct 2010 16:15:50 +0000 (09:15 -0700)]
Merge "Dismissing AlertDialog before destroying WebView."

13 years agoMerge "Corrected visibility reporting error in WindowManager"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:44:00 +0000 (18:44 -0700)]
Merge "Corrected visibility reporting error in WindowManager"

13 years agoMerge "Hold partial wakelock during shutdown to avoid entering sleep"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:41:58 +0000 (18:41 -0700)]
Merge "Hold partial wakelock during shutdown to avoid entering sleep"

13 years agoMerge "Telephony: Fix radio state printing"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:32:39 +0000 (18:32 -0700)]
Merge "Telephony: Fix radio state printing"

13 years agoMerge "Fix time zone info in kernel is nothing after reboot"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:20:55 +0000 (18:20 -0700)]
Merge "Fix time zone info in kernel is nothing after reboot"

13 years agoMerge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:15:17 +0000 (18:15 -0700)]
Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"

13 years agoMerge "Support showing "Cold" battery health."
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:22:11 +0000 (17:22 -0700)]
Merge "Support showing "Cold" battery health."

13 years agoSupport showing "Cold" battery health.
Imre Sunyi [Mon, 20 Sep 2010 16:02:50 +0000 (18:02 +0200)]
Support showing "Cold" battery health.

The Linux kernel supports reporting "cold" battery health to sysfs.
Android framework has not implemented this and it defaults to "unknown"
This adds handling the cold battery health.

Change-Id: Idcc156aae6aabce73391081143f79d052edf332e

13 years agoMerge "Include debugger connection status in error entry"
Jean-Baptiste Queru [Sun, 10 Oct 2010 23:49:54 +0000 (16:49 -0700)]
Merge "Include debugger connection status in error entry"

13 years agoMerge "Don't perform DNS lookup in android.net.Proxy.isLocalHost"
Brad Fitzpatrick [Sun, 10 Oct 2010 18:15:27 +0000 (11:15 -0700)]
Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost"

13 years agoMerge "NullPointerException at handleMessage(GSMPhone.java)"
Jean-Baptiste Queru [Fri, 8 Oct 2010 20:16:18 +0000 (13:16 -0700)]
Merge "NullPointerException at handleMessage(GSMPhone.java)"

13 years agoNullPointerException at handleMessage(GSMPhone.java)
Babis Triantafyllou [Fri, 8 Oct 2010 14:02:11 +0000 (16:02 +0200)]
NullPointerException at handleMessage(GSMPhone.java)

NullPointerException at
com.android.internal.telephony.gsm.GSMPhone.handleMessage(GSMPhone.java)
Failing to retrieved the IMSI number from SIM card could lead to
an exception. A null pointer check will prevent this.

Change-Id: I26760543484504c8d35215bfb1e8f1ae664aeade

13 years agoMerge "Update of DRM framework."
Gloria Wang [Thu, 7 Oct 2010 21:40:17 +0000 (14:40 -0700)]
Merge "Update of DRM framework."

13 years agoFix sometimes mExpandedView will appear while screen transforming.
Tony Wu [Thu, 7 Oct 2010 09:53:43 +0000 (17:53 +0800)]
Fix sometimes mExpandedView will appear while screen transforming.

While watching YouTube and receiving a call, after hang up the call,
mExpandedView may flash when screen transform from Phone to YouTube.

Change-Id: Ib25a0cd1086c278b91a2b34e21744a3c432a8f35

13 years agoDon't perform DNS lookup in android.net.Proxy.isLocalHost
Andreas Sandblad [Thu, 30 Sep 2010 10:04:00 +0000 (12:04 +0200)]
Don't perform DNS lookup in android.net.Proxy.isLocalHost

This fixes degrade introduced by:
Switch to using public APIs instead of private ones.
536ff5a6d700a80dbd75adb737ec4b560fbed2dc

Change-Id: I63cbea82d85d55d933bcfc9e7a311d1aa2324955

13 years agoUpdate of DRM framework.
Takeshi Aimi [Mon, 20 Sep 2010 14:40:41 +0000 (23:40 +0900)]
Update of DRM framework.

  - Change "void" type of return value to "int" for returning status.
  - Add some of overloaded Java APIs which accept database Uri as input.
  - Add asynchronous APIs
  - Add OnEventListener and OnErrorListener for asynchronous APIs
  - Disable debug log
  - Change decrypt() API to accept an optional buffer needed by some of DRM schemes

Changes are incorporated by Sony Corporation.

Change-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c

13 years agoDismissing AlertDialog before destroying WebView.
Mattias Falk [Thu, 16 Sep 2010 14:24:46 +0000 (16:24 +0200)]
Dismissing AlertDialog before destroying WebView.

Added dismiss method for the Alertdialog in destroy to avoid
a leaked window.

Change-Id: Ia6a6e733b8bdd583dae15b854e4d69ef4f5cbff1

13 years agoMerge "Add subaddress to SMS fingerprint calculation."
Jake Hamby [Sat, 2 Oct 2010 01:04:22 +0000 (18:04 -0700)]
Merge "Add subaddress to SMS fingerprint calculation."

13 years agoMerge "Do not explicity disconnect Data during power down for 1x."
Jake Hamby [Fri, 1 Oct 2010 22:02:32 +0000 (15:02 -0700)]
Merge "Do not explicity disconnect Data during power down for 1x."

13 years agoCorrected visibility reporting error in WindowManager
Ulf Rosdahl [Wed, 29 Sep 2010 10:34:38 +0000 (12:34 +0200)]
Corrected visibility reporting error in WindowManager

Correction for the error:
When a window is done animating and about to be destroyed,
it is still checked for visibility in the method
updateReportedVisibilityLocked in the WindowManager.
In the case where other windows are ready to be reported as
visible, this, not yet destroyed window which has the state
not visible, will prevent the visibility report message from
being sent.

Change-Id: I9e307a678a204f0883ccd78c2645c373d3f81066

13 years agoTelephony: Remove unused mRuimFileHandler reference from CDMAPhone
Alex Yakavenka [Wed, 29 Sep 2010 00:26:49 +0000 (17:26 -0700)]
Telephony: Remove unused mRuimFileHandler reference from CDMAPhone

Change-Id: I73b7d87e8e18047f9e0bcd6c1969a32c808cd3c7

13 years agoTelephony: Fix radio state printing
Alex Yakavenka [Wed, 29 Sep 2010 00:21:58 +0000 (17:21 -0700)]
Telephony: Fix radio state printing

Decode new radio state before printing its value

Change-Id: Ib6d47fd412e85a7799fe56a49d29af7531de8674

13 years agoHold partial wakelock during shutdown to avoid entering sleep
Mattias Larsson [Tue, 28 Sep 2010 12:34:15 +0000 (14:34 +0200)]
Hold partial wakelock during shutdown to avoid entering sleep

The ShutdownThread can get suspended while in progress if the
device enters sleep by the user pressing the power-key, or if it is
started (in sleep) from the BatteryService upon a dead battery
notification. If the device is woken up before the battery is
drained, the ShutdownThread will resume and finally complete
the shutdown, but if not the phone will stay in sleep until the
battery level is so low that the power is ruthlessly cut.

Change-Id: If64429fd0c98a9136141942be6c337b5c79cf4f1

13 years agoInclude debugger connection status in error entry
Christian Lindeberg [Tue, 28 Sep 2010 12:52:20 +0000 (14:52 +0200)]
Include debugger connection status in error entry

Include the debugger connection status when adding error entry
to DropBox if debugger is connected, "Debugger: Connected".

This can be useful to sort out crashes comming from developers
vs from regular usage.

Change-Id: Ic309066c63778af1577f2b91a95ffca0bd40338c

13 years agoAdd subaddress to SMS fingerprint calculation.
Naveen Kalla [Sun, 26 Sep 2010 22:55:37 +0000 (15:55 -0700)]
Add subaddress to SMS fingerprint calculation.

As per SMS specification in 3GPP2 C.S0015-B, section 4.3.1.6, if the
Subaddress is included in a CDMA SMS message, it needs to be used for
duplicate detection. Subaddress, which is an optional field was omitted
while computing the SMS fingerprint. Hence it was never being used in
duplicate detection if it was included in the SMS. Add subaddress to the
SMS fingerprint.

Change-Id: Iad9e89887a17caba59033ab8f8d94b63b33cb4bb

13 years agoMerge "Prevent unhandled exception in NinePatchDrawable"
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:22:15 +0000 (08:22 -0700)]
Merge "Prevent unhandled exception in NinePatchDrawable"

13 years agoMerge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:16:26 +0000 (08:16 -0700)]
Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."

13 years agoLayoutlib_create: Unittest for ClassHasNativeVisitor.
Raphael [Fri, 24 Sep 2010 20:54:37 +0000 (13:54 -0700)]
Layoutlib_create: Unittest for ClassHasNativeVisitor.

Change-Id: Id101bb3fc2644e450847e73c933cb6f616982f24

13 years agoRefresh the layoutlib_create doc.
Raphael Moll [Wed, 22 Sep 2010 00:10:35 +0000 (17:10 -0700)]
Refresh the layoutlib_create doc.

Change-Id: I43e92c33d824ace9edd77d90a1b36a5f69d85e7f

13 years agoMerge "MOTOYA Japanese fonts"
Jean-Baptiste Queru [Tue, 21 Sep 2010 17:09:12 +0000 (10:09 -0700)]
Merge "MOTOYA Japanese fonts"

13 years agoDo not explicity disconnect Data during power down for 1x.
Naveen Kalla [Thu, 9 Sep 2010 20:38:22 +0000 (13:38 -0700)]
Do not explicity disconnect Data during power down for 1x.

In 1x, if the data call is torn down before radio power off, modem will
have to send a data call release and change to initialization state followed
by idle state and send out power down registration. If the power off request is sent
to the modem during Initialization state after call release, there is a chance that
modem does not perform power down registration.

Instead if we directly initiate a power down, modem just sets a power down registration
bit in the release order. This change also optimizes the power down procedure in 1x by
letting the modem handle data call release during power down.

Change-Id: I0f083cc3b005ec1e64105350abb43d10583b0881

13 years agoMOTOYA Japanese fonts
Shin-ichiro Fukuda [Mon, 13 Sep 2010 06:54:50 +0000 (15:54 +0900)]
MOTOYA Japanese fonts

These fonts were contributed by MOTOYA.

Change-Id: I97879b4e163f6b547305da732c8604d1ac759df4

13 years agoThere is no @note javadoc tag.
Joe Onorato [Thu, 16 Sep 2010 20:59:37 +0000 (16:59 -0400)]
There is no @note javadoc tag.

Change-Id: I4bb4e0be518b01f2a81d870ff4ec9da81555afbd

13 years agoPrevent unhandled exception in NinePatchDrawable
Sonia Serafimova [Wed, 15 Sep 2010 11:18:44 +0000 (13:18 +0200)]
Prevent unhandled exception in NinePatchDrawable

Added null check in computeBitmapSize() to avoid unhandled
exception "java.lang.NullPointerException" at
android.graphics.Rect.<init>(Rect.java:72).

This problem was discovered in the wild.

Change-Id: I8a4729ceadcfc9744f11b8ceafdf24d6de88c645

13 years agoFix if ACTION_DOWN and lost focus time too close, it will become long press.
Tony Wu [Mon, 13 Sep 2010 11:54:00 +0000 (19:54 +0800)]
Fix if ACTION_DOWN and lost focus time too close, it will become long press.

It will become long press because CheckForTap is still posted in background.
So remove the callback when lose focus, or it will become long press event.

Change-Id: I4f98a6fc077d256edbe555464095b2b81e75dd41

13 years agoMerge "fix typo in comment @beamsOverlap"
Romain Guy [Sun, 12 Sep 2010 18:42:49 +0000 (11:42 -0700)]
Merge "fix typo in comment @beamsOverlap"

13 years agofix typo in comment @beamsOverlap
madan ankapura [Sun, 12 Sep 2010 16:09:05 +0000 (09:09 -0700)]
fix typo in comment @beamsOverlap

Change-Id: I7c7f8e94391ed71a54b65badea164286281df7e3

13 years agoMerge "Make DRM libraries optional"
Jean-Baptiste Queru [Sun, 12 Sep 2010 15:42:48 +0000 (08:42 -0700)]
Merge "Make DRM libraries optional"

13 years agoMerge "Fix the layouting of the checkbox."
Romain Guy [Sat, 11 Sep 2010 21:06:07 +0000 (14:06 -0700)]
Merge "Fix the layouting of the checkbox."

13 years agoMerge "Memory leak in TextKeyListener."
Romain Guy [Sat, 11 Sep 2010 21:03:11 +0000 (14:03 -0700)]
Merge "Memory leak in TextKeyListener."

13 years agoMerge "Fix number counter will keep going after window losed focus."
Jean-Baptiste Queru [Fri, 10 Sep 2010 23:13:13 +0000 (16:13 -0700)]
Merge "Fix number counter will keep going after window losed focus."

13 years agoMerge "Allow two SurfaceViews inbetween the app and the wallpaper."
Jean-Baptiste Queru [Fri, 10 Sep 2010 21:36:21 +0000 (14:36 -0700)]
Merge "Allow two SurfaceViews inbetween the app and the wallpaper."

13 years agoMerge "Make sure OutOfMemoryError is handled by WallpaperManager"
Jean-Baptiste Queru [Fri, 10 Sep 2010 21:25:14 +0000 (14:25 -0700)]
Merge "Make sure OutOfMemoryError is handled by WallpaperManager"

13 years agoMake DRM libraries optional
Jean-Baptiste Queru [Fri, 10 Sep 2010 19:46:57 +0000 (12:46 -0700)]
Make DRM libraries optional

Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15

13 years agoUpdate to new ddmlib-prebuilt api.
Brett Chabot [Fri, 10 Sep 2010 03:38:54 +0000 (20:38 -0700)]
Update to new ddmlib-prebuilt api.

Change-Id: Ib99f5eab2b4ecfde8461f93676f0dbd1f1b38241

13 years agoMerge "Avoid pre-processing images when they won't be used"
Xavier Ducrohet [Fri, 10 Sep 2010 01:30:59 +0000 (18:30 -0700)]
Merge "Avoid pre-processing images when they won't be used"

13 years agofix build
Jean-Baptiste Queru [Thu, 9 Sep 2010 23:16:14 +0000 (16:16 -0700)]
fix build

Change-Id: Iccb40c8c5df879288f35e0940c721d306fb75c12

13 years agofix build
Jean-Baptiste Queru [Thu, 9 Sep 2010 23:10:32 +0000 (16:10 -0700)]
fix build

Change-Id: Idccb3f2499bbaac61099d8232cadd633b93ad846

13 years agofix build
Jean-Baptiste Queru [Thu, 9 Sep 2010 23:02:22 +0000 (16:02 -0700)]
fix build

Change-Id: I4aba42eabb2f959b5301bfd16f65fa6141d86ddc

13 years agofix build
Jean-Baptiste Queru [Thu, 9 Sep 2010 22:34:27 +0000 (15:34 -0700)]
fix build

Change-Id: I603e317b774758add127d7fe386fd60dc16d3101

13 years agoMerge " Initial contribution from Sony Corporation."
Jean-Baptiste Queru [Thu, 9 Sep 2010 21:22:50 +0000 (14:22 -0700)]
Merge "  Initial contribution from Sony Corporation."

13 years agoFix to get A2DP to connect after unpairing
Henrik Backlund [Mon, 30 Aug 2010 09:59:42 +0000 (11:59 +0200)]
Fix to get A2DP to connect after unpairing

In this fix, A2DP profile will be connected when pairing with a
previously paired headset. The reason for this error was that the
connection of the A2DP profile was sent before the callback
onCreatePairedDeviceResult was receied in BluetoothEventLoop.java.
By not going to the state BOND_BONDED until after this callback has been
received, the problem is fixed. However the use case is different if the
pairing is initiated by the remote device. In these cases state
BOND_BONDED will be set when onDevicePropertyChanged instead.

Change-Id: I5dedca87d0a6872705ff3a933a99cce6eb37618a

13 years agoAvoid pre-processing images when they won't be used
Anthony Newnam [Wed, 1 Sep 2010 17:06:04 +0000 (12:06 -0500)]
Avoid pre-processing images when they won't be used

Change-Id: Iffa31228ca95a2e29ccc0aa81bda0fc66922d577

13 years agoAllow two SurfaceViews inbetween the app and the wallpaper.
Pal Szasz [Fri, 3 Sep 2010 09:46:26 +0000 (11:46 +0200)]
Allow two SurfaceViews inbetween the app and the wallpaper.

When two SurfaceViews are used by an application, which is
transparent and uses the wallpaper, only one of the SurfaceViews
will be visible.

The problem is that when trying to find the correct location
for the wallpaper, the window manager locates the activity
window and skips every window below it which is related.
For the first SurfaceView this will be ok, since the
SurfaceViews's attached window is the previous window.
However for the second SurfaceView this condition will fail
(the 2nd SurfaceViews attached window is not the previous
window (which is the 1st SurfaceView)).

The fix adds an extra check which detects this usecase
(the windows are related if the attached window is the same
as the attached window of the previous window).

Change-Id: I368e9dd53455dc310f48d6d8c0be68350ff2b79e

13 years agoMemory leak in TextKeyListener.
Mathias Jeppsson [Fri, 3 Sep 2010 09:35:00 +0000 (11:35 +0200)]
Memory leak in TextKeyListener.

If a call to getPrefs is made after weak reference to content resolver
is gone, a new observer will be created and registered at the
resolver. At registration, the resolver will allocate ObserverEntry
objects that will eventually fill the JNI global reference pool.
There is no need to create and register a new observer if one is already
registered.

Change-Id: If8442b3370299980b73d4ea83757c5eae6a85408

13 years agoMake sure OutOfMemoryError is handled by WallpaperManager
Johan Alfven [Thu, 2 Sep 2010 12:26:54 +0000 (14:26 +0200)]
Make sure OutOfMemoryError is handled by WallpaperManager

Make sure exception OutOfMemoryError is handled when calling
BitmapFactory.decodeFileDescriptor and BitmapFactory.decodeStream
to avoid crash in the system server.

Change-Id: I954a6388d1225dab86d2617ab0602154b2a7f493

13 years agoFix number counter will keep going after window losed focus.
Tony Wu [Fri, 3 Sep 2010 04:06:20 +0000 (12:06 +0800)]
Fix number counter will keep going after window losed focus.

Use Time pick in AlarmClock, long press on + or -, make an
incoming call or press power key to suspend the device,
after resumed, the counter will keep going without press.

Change-Id: I5e69d5e17d3be9aa78648e6f8e28665ec305b36f

13 years agoMerge "Add a --debug-mode option to aapt."
Xavier Ducrohet [Thu, 2 Sep 2010 18:08:03 +0000 (11:08 -0700)]
Merge "Add a --debug-mode option to aapt."

13 years ago Initial contribution from Sony Corporation.
aimitakeshi [Thu, 29 Jul 2010 01:12:27 +0000 (10:12 +0900)]
  Initial contribution from Sony Corporation.

  Add DRM Framework to support DRM content playback
  together with StageFright.

  - DRM Framework code is added
     - include/drm
     - drm
  - api/current.xml is updated to include DRM Framework Java APIs
  - cmds/servicemanager/service_manager.c is modified
    to add drmManager and drmIOService.

Change-Id: I6d7bc9c7067362b500e530988a9ce241761866fb

13 years agoAdd a --debug-mode option to aapt.
Xavier Ducrohet [Tue, 31 Aug 2010 17:45:31 +0000 (10:45 -0700)]
Add a --debug-mode option to aapt.

When passed (with no needed parameters) to the aapt command line,
aapt will insert debuggable=true in the application node of the manifest
automatically.

This is to be used by the SDK tools to make true "debug" builds
that require no code/file change.

Change-Id: I909759caef499a91d10cc9a0902c6448c87e75ef

13 years agoMerge "GPS: Initialize XTRA support when GPS is enabled"
Mike Lockwood [Tue, 31 Aug 2010 20:56:00 +0000 (13:56 -0700)]
Merge "GPS: Initialize XTRA support when GPS is enabled"

13 years agoMerge "GPS: Don't set XTRA download pending flag at boot time."
Mike Lockwood [Tue, 31 Aug 2010 20:55:39 +0000 (13:55 -0700)]
Merge "GPS: Don't set XTRA download pending flag at boot time."

13 years agoRevert "Shutdown when capacity is 0% and no charging or when battery is dead"
Jean-Baptiste Queru [Tue, 31 Aug 2010 19:29:16 +0000 (12:29 -0700)]
Revert "Shutdown when capacity is 0% and no charging or when battery is dead"

This reverts commit fd04143a47770256dabcfa4d8447127b3ec8b2bf.

This break most automated tests because with this change, if the
device is fully charged, it will simply turn off the screen, regardless
if USB is connected to hsot PC or not; so for our tests, most of them
are always connected to host PC, and fully charged 99% of the time,
as soon as the screen turns off, the front-end test Activity will be
suspended.

Change-Id: I1e6590611af43812f1bac223dd31570d1d90cfc5

13 years agoGPS: Initialize XTRA support when GPS is enabled
Mike Lockwood [Tue, 17 Aug 2010 11:42:54 +0000 (07:42 -0400)]
GPS: Initialize XTRA support when GPS is enabled

BUG: 2923148

Change-Id: If9a643e385c6c567b30f47d4caa35fa812a2ba43
Signed-off-by: Mike Lockwood <lockwood@android.com>
13 years agoGPS: Don't set XTRA download pending flag at boot time.
Mike Lockwood [Fri, 6 Aug 2010 14:06:26 +0000 (10:06 -0400)]
GPS: Don't set XTRA download pending flag at boot time.

XTRA data downloads are now strictly on demand from the GPS engine.
Also fix typo in handleDownloadXtraData()

Change-Id: Ied1a6e2e62134add4d965326aae909c86f834682
Signed-off-by: Mike Lockwood <lockwood@android.com>
13 years agoAvoid NullPointerException in BrowserFrame
Mattias Falk [Thu, 26 Aug 2010 07:15:59 +0000 (09:15 +0200)]
Avoid NullPointerException in BrowserFrame

Avoid NullPointerException in BrowserFrame in
method createWindow. getWebViewCore can return
null if WebView has been destroyed. Crash found
in live environment.

Change-Id: I49c3549a037d8f424a0abaee1f8933974b1ec9d7

13 years agoMerge "Fix a monkey crash when the new WebView is destroyed."
Jean-Baptiste Queru [Mon, 30 Aug 2010 22:03:06 +0000 (15:03 -0700)]
Merge "Fix a monkey crash when the new WebView is destroyed."

13 years agoMerge "Telephony: Control operator selection using EF_CSP data."
Jean-Baptiste Queru [Mon, 30 Aug 2010 20:00:48 +0000 (13:00 -0700)]
Merge "Telephony: Control operator selection using EF_CSP data."