26627 Commits

Author SHA1 Message Date
The Android Open Source Project
a2d423a40f am d7da5164: merge from open-source master
Merge commit 'd7da5164ba7744992fbc893c1c812614b0d57d8c'

* commit 'd7da5164ba7744992fbc893c1c812614b0d57d8c':
  Telephony: Process MT SMS with MTI set to 3
2010-07-14 12:23:12 -07:00
The Android Open Source Project
d7da5164ba merge from open-source master
Change-Id: I0bbbd7f9b6f84e1682793e239997838c24d17244
2010-07-14 12:18:01 -07:00
Dianne Hackborn
72c9265ac5 Merge "Fix fragment index expunging." 2010-07-14 12:17:24 -07:00
Dianne Hackborn
9e14e9f33a Fix fragment index expunging.
Change-Id: If37e58dfa998575530305584d3aa756bb5a61d7b
2010-07-14 12:14:24 -07:00
Steve Howard
756088482f am 57de95a5: am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '57de95a51ff5d98fcad0a7735c496be5f647d66f'

* commit '57de95a51ff5d98fcad0a7735c496be5f647d66f':
  Download manager support for file URIs + last modified time
2010-07-14 11:25:32 -07:00
Steve Howard
57de95a51f am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c' into gingerbread-plus-aosp

* commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c':
  Download manager support for file URIs + last modified time
2010-07-14 11:22:20 -07:00
Steve Howard
05940b2c04 Merge "Download manager support for file URIs + last modified time" into gingerbread 2010-07-14 11:19:38 -07:00
Jean-Michel Trivi
0224a00421 am 5473434f: am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.
Merge commit '5473434f060d8c036a30a1992b036a2f70da265d'

* commit '5473434f060d8c036a30a1992b036a2f70da265d':
  Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
2010-07-14 11:15:31 -07:00
Jean-Michel Trivi
5473434f06 am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.
Merge commit '97eb728aef51646b86925557a36732598e3fbaa1' into gingerbread-plus-aosp

* commit '97eb728aef51646b86925557a36732598e3fbaa1':
  Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
2010-07-14 11:12:14 -07:00
Romain Guy
d0d5c072aa Merge "Prevent crash in ListView when changing cache hint." 2010-07-14 11:08:38 -07:00
Romain Guy
266e05179c Prevent crash in ListView when changing cache hint. 2010-07-14 11:08:02 -07:00
Jean-Michel Trivi
97eb728aef Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
effect UUID instead of defining it locally.

Change-Id: Id6018fef20d286899cf7503fec3521dcd56db7e0
2010-07-14 10:09:31 -07:00
Robert Greenwalt
26dd7b3bb3 Merge "Pass network properties to ConnectivityService." 2010-07-14 09:09:31 -07:00
Andy McFadden
3aa513c0ee Merge "Implement native dump for "am dumpheap -n"." 2010-07-14 07:45:09 -07:00
Mathias Agopian
0eb1d98bc4 am e69204a0: am 36ff93aa: Merge "NDK sensor API" into gingerbread
Merge commit 'e69204a02a9d2babd5352180fb541e7295db911a'

* commit 'e69204a02a9d2babd5352180fb541e7295db911a':
  NDK sensor API
2010-07-13 21:23:52 -07:00
Mathias Agopian
e69204a02a am 36ff93aa: Merge "NDK sensor API" into gingerbread
Merge commit '36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a' into gingerbread-plus-aosp

* commit '36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a':
  NDK sensor API
2010-07-13 21:19:58 -07:00
Mathias Agopian
36ff93aa1f Merge "NDK sensor API" into gingerbread 2010-07-13 21:18:30 -07:00
Dianne Hackborn
c269a13e89 am b2473fd6: am 021e906a: Merge "Fix docs build." into gingerbread
Merge commit 'b2473fd65c9030bb81012b07480d9243af7b1a4a'

* commit 'b2473fd65c9030bb81012b07480d9243af7b1a4a':
  Fix docs build.
2010-07-13 21:18:05 -07:00
Mathias Agopian
e558010a62 NDK sensor API
Change-Id: Ie07afc349ca3331e065725ba9d7ebe9722959653
2010-07-13 21:17:40 -07:00
Dianne Hackborn
b2473fd65c am 021e906a: Merge "Fix docs build." into gingerbread
Merge commit '021e906a46f044025ce0a4632309abecd069240d' into gingerbread-plus-aosp

* commit '021e906a46f044025ce0a4632309abecd069240d':
  Fix docs build.
2010-07-13 21:14:47 -07:00
Dianne Hackborn
021e906a46 Merge "Fix docs build." into gingerbread 2010-07-13 21:12:22 -07:00
Jack Palevich
1f76f88c38 am 43429036: am 91216a7e: Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread
Merge commit '43429036f5885063e522603e51c5f59f8b9e697a'

* commit '43429036f5885063e522603e51c5f59f8b9e697a':
  Fix deadlock when switching between two GLSurfaceViews
2010-07-13 21:11:48 -07:00
Dianne Hackborn
1d28f9c0aa Fix docs build.
Change-Id: Ibb8e1e4b18ec1e92e28d354cdcce37676056b348
2010-07-13 20:38:06 -07:00
Dianne Hackborn
2388ad9eef am f8d9379b: am d76b67c3: IME events are now dispatched to native applications.
Merge commit 'f8d9379bd834573feca085284970cf686993c330'

* commit 'f8d9379bd834573feca085284970cf686993c330':
  IME events are now dispatched to native applications.
2010-07-13 19:50:36 -07:00
Romain Guy
fc6d300f40 Merge "Add a default xlarge wallpaper." 2010-07-13 19:40:27 -07:00
Romain Guy
9137b50da1 Add a default xlarge wallpaper.
Change-Id: I44c53f027199ff537fdde8303e3029a7d4180474
2010-07-13 19:40:26 -07:00
Jack Palevich
43429036f5 am 91216a7e: Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread
Merge commit '91216a7e7406ef02d833e461d0db93ece7b2140d' into gingerbread-plus-aosp

* commit '91216a7e7406ef02d833e461d0db93ece7b2140d':
  Fix deadlock when switching between two GLSurfaceViews
2010-07-13 19:12:32 -07:00
Jack Palevich
91216a7e74 Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread 2010-07-13 19:10:22 -07:00
Jack Palevich
1b4ecc63c4 Fix deadlock when switching between two GLSurfaceViews
Some devices only support a single active EGL context.

On those devices, when a second activity that uses a GLSurfaceView
is started in the same process, the second activity can potentially
hang in GLSurfaceView.onWindowResize waiting for its GLSurfaceView
render thread to draw a frame. The second activity's render thread
is waiting to acquire an EGL context, but the first activity's render
thread doesn't know it should release the EGL context.

The fix is to detect the potential hang, and ask the first activity's
render thread to release the EGL context.

Change-Id: Ibb342c68772297744c973bcf5010581cd132db67
2010-07-13 19:09:37 -07:00
Dianne Hackborn
f8d9379bd8 am d76b67c3: IME events are now dispatched to native applications.
Merge commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320' into gingerbread-plus-aosp

* commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320':
  IME events are now dispatched to native applications.
2010-07-13 18:55:52 -07:00
Dianne Hackborn
60e299d33d Merge "Fix bug where LoaderManager instances were not being removed." 2010-07-13 18:40:42 -07:00
Dianne Hackborn
ef69fb82db Fix bug where LoaderManager instances were not being removed.
Change-Id: Ic8385ff60623ecd3e9fe8ff4360aef2c3b11f24f
2010-07-13 18:38:46 -07:00
Dianne Hackborn
d76b67c340 IME events are now dispatched to native applications.
And also:

- APIs to show and hide the IME, and control its interaction with the app.
- APIs to tell the app when its window resizes and needs to be redrawn.
- API to tell the app the content rectangle of its window (to layout
  around the IME or status bar).

There is still a problem with IME interaction -- we need a way for the
app to deliver events to the IME before it handles them, so that for
example the back key will close the IME instead of finishing the app.

Change-Id: I37b75fc2ec533750ef36ca3aedd2f0cc0b5813cd
2010-07-13 18:36:46 -07:00
Steve Howard
adcb697826 Download manager support for file URIs + last modified time
First, in the download manager public API, I'm changing
COLUMN_REQUESTED_TIMESTAMP to COLUMN_LAST_MODIFIED_TIMESTAMP, a field
that already exists in the download manager.  Upon inspection of
existing users of this field, it looks like there are some good use
cases -- for instance, looking at when a download completed.  And if
I'm exposing that timestamp, there's no need to also expose the
requested timestamp.

Second, this change includes support for file URI destinations:

* add DESTINATION_FILE_URI for use by the DownloadManager wrapper
* make DownloadManager use it appropriately

The backend support is in a separate change (since it's in a separate
project).

Also fixing a bug with file URI construction when DownloadManager
fills in COLUMN_LOCAL_URI.

Change-Id: I5bb93a222cd23215c2a03ed9f68d7f140454f7f2
2010-07-13 18:31:41 -07:00
Adam Powell
4267534d1c Action Bar now supports submenus as popups.
Change-Id: I1691c16081b3474ed6d6e406f91f5f74a2dc8fcb
2010-07-13 18:14:11 -07:00
Robert Greenwalt
47f69fe299 Pass network properties to ConnectivityService.
Used as a bag to hold ipaddr, gateway, dns, proxy info.
addr's are InetAddresses for v4/v6 use.  Cleaning up some old v4-only code

bug:2655015
Change-Id: I7ac886fe5c519e8bab42f49cd82a5189d9c9ab59
2010-07-13 18:07:41 -07:00
Jeff Brown
6ac7674e14 am 89ee578b: am fd035829: Add initial gamepad support.
Merge commit '89ee578b7053d27a50922f82feb94bf6054b330c'

* commit '89ee578b7053d27a50922f82feb94bf6054b330c':
  Add initial gamepad support.
2010-07-13 17:48:56 -07:00
Jeff Brown
89ee578b70 am fd035829: Add initial gamepad support.
Merge commit 'fd03582995e0fce963dd0fa0669e3211b74c0dd7' into gingerbread-plus-aosp

* commit 'fd03582995e0fce963dd0fa0669e3211b74c0dd7':
  Add initial gamepad support.
2010-07-13 17:46:19 -07:00
Romain Guy
e5e285509f Merge "Enable 32-bits only assets." 2010-07-13 17:42:00 -07:00
Romain Guy
594f406514 Enable 32-bits only assets.
Go away dithering!

Change-Id: Iee5ee2e9430606e732d9b0abb3adc9f68275bd6d
2010-07-13 17:41:31 -07:00
Mike Lockwood
e2ce261674 Merge "MTP: Add support for sending events to the host when objects are added and removed" 2010-07-13 17:14:45 -07:00
Jeff Brown
fd03582995 Add initial gamepad support.
Change-Id: I0439648f6eb5405f200e4223c915eb3a418b32b9
2010-07-13 17:04:57 -07:00
Mike Lockwood
be125a50b4 MTP: Add support for sending events to the host when objects are added and removed
Change-Id: Ia1d5232b919c644c670ff9ca651eca92b3f9ad42
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-13 20:04:22 -04:00
Andy McFadden
06a6b558bd Implement native dump for "am dumpheap -n".
This adds the ability to generate a trivial heap dump on demand.  If
the appropriate system properties aren't set, the output file will
instead contain instructions for enabling them.

The data returned by get_malloc_leak_info() is processed and written
to the specified file.  The output looks something like:

 Android Native Heap Dump v1.0

 Total memory: 2981301
 Allocation records: 2152

 z 1  sz    65557  num    1  bt 8010dd78 afd12618 ...
 z 1  sz    52008  num    3  bt 8010dd78 afd12618 ...
 z 1  sz    24428  num    1  bt 8010dd78 8010de84 ...
 ...2149 more...
 END

(the "..." is actually the remaining entries in the stack backtrace;
I truncated it here)

"z" indicates whether the allocation was made pre- or post-zygote,
"sz" is the size allocated, and "num" is the number of allocations
made of that size with the specified backtrace.

Change-Id: I2d60f07444fce5f7178b3f51c928c8faa0b051bd
2010-07-13 16:51:24 -07:00
Jean-Baptiste Queru
cb609625fd Merge "Telephony: Process MT SMS with MTI set to 3" 2010-07-13 16:20:30 -07:00
Gilles Debunne
8bfc798dc2 Merge "Cosmetic changes around TextView." 2010-07-13 15:58:43 -07:00
Brad Fitzpatrick
f5574e0f8c am 706623dd: am c0a7e690: Add Parcel::readExceptionCode() and Parcel::writeNoException()
Merge commit '706623ddb8314850c0551f0b66e24b5f0bd28620'

* commit '706623ddb8314850c0551f0b66e24b5f0bd28620':
  Add Parcel::readExceptionCode() and Parcel::writeNoException()
2010-07-13 15:57:20 -07:00
Brad Fitzpatrick
706623ddb8 am c0a7e690: Add Parcel::readExceptionCode() and Parcel::writeNoException()
Merge commit 'c0a7e690bfd32dd897ceccd04dd0fa6bf6e9cee6' into gingerbread-plus-aosp

* commit 'c0a7e690bfd32dd897ceccd04dd0fa6bf6e9cee6':
  Add Parcel::readExceptionCode() and Parcel::writeNoException()
2010-07-13 15:55:05 -07:00
Brad Fitzpatrick
c0a7e690bf Add Parcel::readExceptionCode() and Parcel::writeNoException()
Add native Parcel methods analogous to the Java versions.

Currently, these don't do much, but upcoming StrictMode work changes
the RPC calling conventions in some cases, so it's important that
everybody uses these consistently, rather than having a lot of code
trying to parse RPC responses out of Parcels themselves.

As a summary, the current convention that Java Binder services use is
to prepend the reply Parcel with an int32 signaling the exception
status:

     0: no exception
     -1: Security exception
     -2: Bad Parcelable
     -3: ...
     -4: ...
     -5: ...

... followed by Parceled String if the exception code is non-zero.

With an upcoming change, it'll be the case that a response Parcel can,
non-exceptionally return rich data in the header, and also return data
to the caller.  The important thing to note in this new case is that
the first int32 in the reply parcel *will not be zero*, so anybody
manually checking for it with reply.readInt32() will get false
negative failures.

Short summary: If you're calling into a Java service and manually
checking the exception status with reply.readInt32(), change it to
reply.readExceptionCode().

Change-Id: I23f9a0e53a8cfbbd9759242cfde16723641afe04
2010-07-13 15:45:18 -07:00
Gilles Debunne
d11f6e6460 Double and one and a half tap removed from TextView.
Text selection is now triggered by a long press. This behavior should be shared
across applications and is already implemented in the browser.

New UI guidelines say that double tap should be used for zooming only.

Change-Id: I9fae692cf3f6e565350f666fa3d5a86884439349
2010-07-13 15:10:08 -07:00