22292 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
b1fa549a49 Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)." 2010-11-01 10:29:22 -07:00
Romain Guy
cee8d1d345 Merge "fix typo" 2010-10-31 11:12:51 -07:00
Daniel Trebbien
0a675fd8fe Fixes Issue 7907 in the public bugs database (http://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
2010-10-31 07:42:35 -07:00
Uwe Voelker
fc8daba45e fix typo
Change-Id: Ib36aabc68128d1b2b8c41b965a10be2ab2f4cd93
2010-10-31 10:08:04 +01:00
Anders Petersson
faf49b14a2 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
2010-10-27 08:38:30 +02:00
Johannes Carlsson
3ffccab786 Release reference when putting RILRequest back into the pool.
In order to reduce object creation the RILRequest objects are
stored in an array when it is unused (max 4). This avoids GC
of the object. The object in turn has references to other
objects which sometimes hold large memory chunks. This fix
releases these references since they are not used anyway.

This will make it possible to GC the Message (mResult) which
in some cases holds references to a Bitmap which sometimes
leads to OutOfMemoryException. The reference is cleared
anyway in RILRequest.obtain(...)

Change-Id: I3b895bc39b5e2f3ab7cc8297c3583ea78e0ebc77
2010-10-27 08:28:14 +02:00
Roger Olsson
a7e77546ca 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
2010-10-26 14:41:01 +02:00
Jean-Baptiste Queru
b4ae2f1ba4 Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked" 2010-10-25 15:32:12 -07:00
Gloria Wang
9084631dba 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" 2010-10-25 12:23:35 -07:00
Gloria Wang
d5770917a5 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
2010-10-25 12:16:56 -07:00
Peter Eliasson
f313b9e841 Adding pan behavior on preference dialog.
Changed the preference dialog with text input to pan if
the display area is limited. This helps the user to see
the input better.

Change-Id: I12341546f6f82601ac5a2746153255a9b2d49a1c
2010-10-25 14:33:06 +02:00
Xavier Ducrohet
c5371fadf2 Merge "Make layoutlib use the prebuilt of layoutlib_api" 2010-10-22 13:28:39 -07:00
Xavier Ducrohet
0db3844925 Make layoutlib use the prebuilt of layoutlib_api
Change-Id: Ie04a9e847acacf7b2aeb179589517fc75688c75b
2010-10-21 18:32:37 -07:00
Brad Fitzpatrick
15358e1456 Merge "Make the base direction of the Arabic error pages RTL" 2010-10-21 07:18:18 -07:00
Brad Fitzpatrick
6cf9c39452 Merge "Set the base direction of the Hebrew error pages to RTL" 2010-10-21 07:18:02 -07:00
Jean-Baptiste Queru
5d919b4387 Merge "Make disabled TextViews uneditable" 2010-10-20 16:46:52 -07:00
Jean-Baptiste Queru
5bfef1ba05 Merge "BatteryService: Set bool to true if sysfs entry is not 0" 2010-10-20 16:35:17 -07:00
Jean-Baptiste Queru
81925e665c Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 2010-10-20 16:29:15 -07:00
Shachar Shemesh
2fdf272855 Make the base direction of the Arabic error pages RTL
Change-Id: I10df9cb92d18850e8893298b2edfd9e57ca5cfef
2010-10-20 11:01:32 -07:00
Shachar Shemesh
56a7739755 Set the base direction of the Hebrew error pages to RTL
Change-Id: I435e724f9638e294b7e03527e7c6244a307f010e
2010-10-20 11:01:26 -07:00
Jean-Baptiste Queru
db723ea0f7 Merge "jni: Remove duplicated jniThrowException()" 2010-10-19 14:42:52 -07:00
NoraBora
9b38c6097e Fix FastScroller overlay position bug
after setFastScrollEnabled(false)-->setFastScrollEnabled(true)
the overlay shows up at the top-left instead of center

Change-Id: Idd5d4640398def8391f99962bd1838a3bde98157
2010-10-18 06:35:31 -07:00
Janos Levai
042856c1de 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
2010-10-18 00:53:18 +03:00
Jim Huang
1fc4d88090 jni: Remove duplicated jniThrowException()
Change-Id: I73a910e4efbf84393b3ce5d7f6e58e61ca88d484
2010-10-17 21:08:53 +08:00
Peter Collingbourne
b97c34948e NotificationManager: droiddoc documentation improvements
Specifically, corrects and improves the overview and the documentation
for the NotificationManager.notify(String, int, Notification) method
to reflect the fact that the pair (tag, id) is used for notification
matching.

Change-Id: Ic088a56f457285523d90d296853685393b8c3412
2010-10-14 02:22:42 +01:00
Axel Haslam
49016d6cd7 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>
2010-10-12 17:32:26 -05:00
Joe Onorato
fdb39feedd Merge "Fix sometimes mExpandedView will appear while screen transforming." 2010-10-11 15:44:14 -07:00
Jean-Baptiste Queru
15f7ff3c5a Merge "Fix compile errors in telephony tests" 2010-10-11 15:11:59 -07:00
Vairavan Srinivasan
d6499dc69f 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
2010-10-11 11:22:57 -07:00
Jean-Baptiste Queru
e3cfd35bf4 Merge "Dismissing AlertDialog before destroying WebView." 2010-10-11 09:15:50 -07:00
Jean-Baptiste Queru
65f23e71bd Merge "Corrected visibility reporting error in WindowManager" 2010-10-10 18:44:00 -07:00
Jean-Baptiste Queru
2aaa1ce176 Merge "Hold partial wakelock during shutdown to avoid entering sleep" 2010-10-10 18:41:58 -07:00
Jean-Baptiste Queru
0e430ccc2c Merge "Telephony: Fix radio state printing" 2010-10-10 18:32:39 -07:00
Jean-Baptiste Queru
fb1e552972 Merge "Fix time zone info in kernel is nothing after reboot" 2010-10-10 18:20:55 -07:00
Jean-Baptiste Queru
334a4d84df Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone" 2010-10-10 18:15:17 -07:00
Jean-Baptiste Queru
c289447439 Merge "Support showing "Cold" battery health." 2010-10-10 17:22:11 -07:00
Imre Sunyi
9239612870 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
2010-10-10 17:20:24 -07:00
Jean-Baptiste Queru
bd1454f500 Merge "Include debugger connection status in error entry" 2010-10-10 16:49:54 -07:00
Brad Fitzpatrick
3ed792d59c Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost" 2010-10-10 11:15:27 -07:00
Jean-Baptiste Queru
38f534882e Merge "NullPointerException at handleMessage(GSMPhone.java)" 2010-10-08 13:16:18 -07:00
Babis Triantafyllou
aeab76c5be 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
2010-10-08 16:02:11 +02:00
Gloria Wang
e6ad0e477b Merge "Update of DRM framework." 2010-10-07 14:40:17 -07:00
Tony Wu
43a87c5c87 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
2010-10-07 17:53:43 +08:00
Andreas Sandblad
e6b29898b1 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
2010-10-04 17:59:05 +02:00
Takeshi Aimi
dc549d60f9 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
2010-10-04 22:14:53 +09:00
Mattias Falk
0ae2ec88ec Dismissing AlertDialog before destroying WebView.
Added dismiss method for the Alertdialog in destroy to avoid
a leaked window.

Change-Id: Ia6a6e733b8bdd583dae15b854e4d69ef4f5cbff1
2010-10-04 13:13:25 +02:00
Jake Hamby
7888486d1c Merge "Add subaddress to SMS fingerprint calculation." 2010-10-01 18:04:22 -07:00
Jake Hamby
d531c9ebe1 Merge "Do not explicity disconnect Data during power down for 1x." 2010-10-01 15:02:32 -07:00
Jonas Schwertfeger
d672475753 Added noop unregisterReceiver to complement existing noop registerReceiver.
Without this addition, code that is being tested using an isolated context
can cause an exception if it unregisters a previously registered broadcast
receiver.  This is because the isolated context never actually registered
the receiver in the first place.  The fix is to make sure the isolated
context is consistent in ignoring both recevier registration and
unregistration calls.

Change-Id: Ie0ba6f4bb10f5248704327a0ffc8e37ee8b71ae2
2010-09-30 14:04:09 +02:00
Ulf Rosdahl
39357708b7 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
2010-09-29 12:34:38 +02:00