11823 Commits

Author SHA1 Message Date
Andy McFadden
824c510752 Allow "am" to initiate heap dumps.
This was mostly cloned from the "am profile" implementation.  It's
intended to replace the old "kill -10" approach used by "runhat".

We could really use a native heap dump, so I pass a "managed"
flag through that indicates whether we want to dump the native or
managed heap.  We don't currently have a native heap dump-to-file
function, so it currently just logs a warning.

(android.ddm.DdmHandleNativeHeap.getLeakInfo is a good start -- it
copies /proc/maps and then calls get_malloc_leak_info to get some
goodies.  Needs some formatting to make it human-readable.  I didn't
want to cram all that into this change.)

It would be useful if "am" didn't exit until the heap dump operation
completed, but I'm not sure how to do that.

Bug 2759474.

Change-Id: I46bc98067738d8c72ac0fc10002ca67bb4929271
2010-07-12 13:35:14 -07:00
David Brown
523959f50e am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread
Merge commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540' into gingerbread-plus-aosp

* commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540':
  Deprecate some status bar icons that now come from the phone app (and
2010-07-12 13:32:54 -07:00
David Brown
d1af902c21 Merge "Deprecate some status bar icons that now come from the phone app (and shouldn't have been public in the first place.)" into gingerbread 2010-07-12 13:30:58 -07:00
Patrick Dubroy
5958091dd9 Merge "Convert the minWidth and minHeight to device units when calling getInstalledProviders" 2010-07-12 11:40:58 -07:00
Joe Onorato
808182dc87 checkpoint tablet status bar
Change-Id: Ia9089cce370ead4e685dffbca722fa8404a8f443
2010-07-12 14:29:15 -04:00
Mike Lockwood
d815f79766 Integrate host to device file transfer with the media provider.
MTP file transfers happen in two stages.  The SendObjectInfo command sends
some information about the file and reserves an ObjectHandle for the new file.
The file transfer is then performed using the SendObject command.

To support this in the media provider, MtpDatabase.beginSendObject receives
the information from SendObjectInfo and creates an row for it in the MTP objects
table for the new file.  After the file transfer has completed, then
MtpDatabase.endSendObject is called.  In endSendObject, we run the media scanner
on the new file, which will add a row to the images, audio, video
or audio playlist table.

To avoid the media scanner creating a second row for the file in the MTP objects
table, we pass the ObjectHandle created in beginSendObject to the media scanner,
which then passes it to the media provider via the content values when it
performs its insert.

Change-Id: I1ebcc63d6bd4404b0d3a93c703a9d3c097381d3a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-12 14:01:22 -04:00
Jean-Baptiste Queru
f0565ce75a Merge "Reduced Warnings by adding Type Arguments and removing unused imports" 2010-07-12 10:54:11 -07:00
Jean-Baptiste Queru
ac95a25409 Merge "Documentation Bug (Issue 9557)" 2010-07-12 10:43:17 -07:00
Patrick Dubroy
5d1409191e Convert the minWidth and minHeight to device units when calling getInstalledProviders 2010-07-12 10:29:30 -07:00
Mike Lockwood
12e807fb67 Merge "MediaProvider: Add constants for media_table and media_id columns in MTP objects table" 2010-07-12 09:54:32 -07:00
Elliott Slaughter
b48fdbe792 Browser save page as web archive.
Change-Id: Id34a93b2e9bb6c185338989d1eeb6929d0bd06c5
2010-07-12 09:06:10 -07:00
Mike Lockwood
fed161799b MediaProvider: Add constants for media_table and media_id columns in MTP objects table
Change-Id: I47396c637e483ea9c71bbb22898d69cb3d00b256
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-10 08:25:57 -04:00
Dianne Hackborn
2707d60262 Implement instance passing in LoaderManager.
Activity now propagates loaders across instances when retaining
state.  Adjusted APIs to make it better for apps to deal with this.

Change-Id: I8a6448cff1132e66207f9223eb29ccfc0decf2ca
2010-07-09 18:43:34 -07:00
Dianne Hackborn
8445ca6c3b am b14f325a: am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits.
Merge commit 'b14f325a0118ffce286155caaabaae149653462c'

* commit 'b14f325a0118ffce286155caaabaae149653462c':
  Add ANativeWindow API for directly drawing to the surface bits.
2010-07-09 17:05:23 -07:00
Dianne Hackborn
b14f325a01 am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits.
Merge commit '289b9b62372ef52a06113b83dfb870e2c2fb325a' into gingerbread-plus-aosp

* commit '289b9b62372ef52a06113b83dfb870e2c2fb325a':
  Add ANativeWindow API for directly drawing to the surface bits.
2010-07-09 17:03:14 -07:00
Dianne Hackborn
289b9b6237 Add ANativeWindow API for directly drawing to the surface bits.
Also other cleanup and fixes:

- We now properly set the default window format to 565.
- New APIs to set the window format and flags from native code.
- Tweaked glue for simpler handling of the "destroy" message.
- Um, other stuff.

Change-Id: Id7790a21a2fa9a19b91854d225324a7c1e7c6ade
2010-07-09 16:58:19 -07:00
Gilles Debunne
3a70b20ee5 Merge "New cursor controller in TextViews." 2010-07-09 16:22:30 -07:00
Gilles Debunne
cc3ec6cdb2 New cursor controller in TextViews.
Editable TextView now display a cursor controller under the insertion
point so that it can be precisely moved.

Change-Id: Ia2e6ddc57d249647ff6683e10e4226db3df27223
2010-07-09 16:20:21 -07:00
David Brown
26c679751d Deprecate some status bar icons that now come from the phone app (and
shouldn't have been public in the first place.)

(And since the changed deprecation state is a public API change, I needed
to do "make update-api" as well.)

Change-Id: I803d5a81ad2363561137be5af4f2b8258df758cd
2010-07-09 16:01:25 -07:00
The Android Open Source Project
b92cd4fc63 am 0260887c: merge from open-source master
Merge commit '0260887ca78330b8dd7009d91859925df94a69d6'

* commit '0260887ca78330b8dd7009d91859925df94a69d6':
  Improved logging when there's an error creating the directories in getFilesDir()
2010-07-09 16:01:00 -07:00
The Android Open Source Project
0260887ca7 merge from open-source master
Change-Id: Ia0dff818a574c8bc79aa79d65fd21bab9f9f6c30
2010-07-09 15:59:17 -07:00
David Brown
a6935ab009 am d321e8d6: am 2aaa9e9f: Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread
Merge commit 'd321e8d6882485203b159b224d49247707bdd5aa'

* commit 'd321e8d6882485203b159b224d49247707bdd5aa':
  Remove some (unused, non-public) phone-related status bar notification icons
2010-07-09 14:13:00 -07:00
Jean-Baptiste Queru
eb678fb63d Merge "Improved logging when there's an error creating the directories in getFilesDir()" 2010-07-09 14:06:38 -07:00
Vasu Nori
187c7216d6 Merge "reduce locking when using SQLiteStatement" 2010-07-09 13:37:45 -07:00
Romain Guy
179de8a37c Avoid unnecessary tests when drawing ListView dividers.
Change-Id: I5f2797ee92f5e3ed01eab0cf7f2acfe436b0c595
2010-07-09 13:27:00 -07:00
David Brown
d321e8d688 am 2aaa9e9f: Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread
Merge commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a' into gingerbread-plus-aosp

* commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a':
  Remove some (unused, non-public) phone-related status bar notification icons
2010-07-09 13:00:00 -07:00
David Brown
2aaa9e9fc5 Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread 2010-07-09 12:57:39 -07:00
Vasu Nori
e25539fdfd reduce locking when using SQLiteStatement
Do compiling of sql, binding of args and execution of the SQL
statement within one single database lock period.
This reduces the number of times the database lock
needs to be acquired during the course of compilation, binding
and execution of a SQLiteStatement.

Change-Id: I22b090ec9e10fc0aa2532a93bafe610af2546b58
2010-07-09 12:31:12 -07:00
Romain Guy
20030a6303 Merge "Remove support for density compatibility in the hardware renderer." 2010-07-09 10:39:32 -07:00
Romain Guy
dbd77cd444 Remove support for density compatibility in the hardware renderer.
Change-Id: I535e919986e5ccfb344ede8516ccd84c02642823
2010-07-09 10:36:05 -07:00
Grace Kloba
0fb624259e Merge "Combine base PictureSet with composite layers into one SkLayer tree to get ready for GL rendering." 2010-07-09 10:05:34 -07:00
Daniel Sandler
dce7cf9831 am 339716e0: am f99e27da: Merge "Make android:immersive public." into gingerbread
Merge commit '339716e03c293c1ab29492e38936643f08d797fa'

* commit '339716e03c293c1ab29492e38936643f08d797fa':
  Make android:immersive public.
2010-07-09 09:20:27 -07:00
Steve Block
2b2fa12cd0 Merge "Update Browser useragent string to reflect WebKit merge at r62496" 2010-07-09 07:35:38 -07:00
Daniel Sandler
339716e03c am f99e27da: Merge "Make android:immersive public." into gingerbread
Merge commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc' into gingerbread-plus-aosp

* commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc':
  Make android:immersive public.
2010-07-09 06:10:26 -07:00
Daniel Sandler
f99e27da0b Merge "Make android:immersive public." into gingerbread 2010-07-09 06:07:51 -07:00
Steve Block
59c76b87fd Update Browser useragent string to reflect WebKit merge at r62496
Change-Id: I502ae0d565ef9bd4bd3746685b2452da12ec61d6
2010-07-09 11:42:42 +01:00
Dianne Hackborn
d8a6271bb1 am 49159f07: am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread
Merge commit '49159f0748c704e53a7bd754f26113d9ab844a97'

* commit '49159f0748c704e53a7bd754f26113d9ab844a97':
  Add new glue code for writing native apps.
2010-07-08 19:10:17 -07:00
Kenny Root
511d9ec363 am 0a21801f: am a5402dab: Merge "OBB API for PackageManager" into gingerbread
Merge commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b'

* commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b':
  OBB API for PackageManager
2010-07-08 19:09:06 -07:00
Jeff Brown
1a33274d28 resolved conflicts for merge of 167449e5 to master
Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67
2010-07-08 19:01:13 -07:00
Adam Powell
6f10db885f Merge "Fix some issues with smooth scrolling ListViews" 2010-07-08 18:39:42 -07:00
Dianne Hackborn
53c67c8dfd Fix build.
Change-Id: I60185df6150d13d704a28933bc919527da173307
2010-07-08 18:27:42 -07:00
Adam Powell
371133174b Fix some issues with smooth scrolling ListViews
Change-Id: I8b0f3d318eb0508ed12b92584c368e6f0edeb0be
2010-07-08 18:21:48 -07:00
David Brown
54934964e7 Remove some (unused, non-public) phone-related status bar notification icons
Status bar icons really belong to specific apps (not the framework), so the
various stat_sys_phone_call* and stat_sys_vp_phone_call* icons should have
never been part of the framework in the first place.

As of change https://android-git.corp.google.com/g/56881 the phone app now has
its own copies of all these icons, so it's now safe to remove the non-public
ones(*) from frameworks/base.

(*) Unfortunately a few of these icons were accidentally added to public.xml
    at some point, so we'll never be able to get rid of those ones.
    This change only removes the private resources.

Change-Id: If9ecf7b7568b5086c6ed1e5d4b69518fb41f1516
2010-07-08 18:15:42 -07:00
Fabrice Di Meglio
1f78ea28ad Fix bug #2793828 (Sync/visible setting on the phone should not affect what's visible on the web.)
- introduce "sync4" column into Calendars table to store "selected" from Web calendar

Change-Id: I2dfebb6e4a2ec85e758626a4e2b9c8b1315f095f
2010-07-08 15:43:56 -07:00
Dianne Hackborn
c801768e4d Integrate Loader support in to Activity/Fragment.
Introduces a new LoaderManager class that takes care of
most of what LoaderManagingFragment does.  Every Fragment
and Activity can have one instance of this class.  In the
future, the instance will be retained across config changes.

Also various other cleanups and improvement.

Change-Id: I3dfb406dca46bda7f5acb3c722efcbfb8d0aa9ba
2010-07-08 15:17:22 -07:00
Grace Kloba
8abd50b748 Combine base PictureSet with composite layers into
one SkLayer tree to get ready for GL rendering.

Now UI holds its copy of SkLayer tree. The top node
is BaseLayerAndroid which has the PictureSet as its
content.

There is a matching change in external/webkit.
2010-07-08 15:02:14 -07:00
Mike Lockwood
2951c6d057 Merge "MTP: Use media provider database to implement MTP device support." 2010-07-08 14:29:59 -07:00
Vasu Nori
07e1b1dd16 Merge "reduce java locking on SQLiteDatabase if sql is already compiled" 2010-07-08 14:10:16 -07:00
Mike Lockwood
d21eac9c70 MTP: Use media provider database to implement MTP device support.
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.

The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.

Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-08 16:21:09 -04:00
Romain Guy
26be805f42 Merge "Do not draw the fade areas when it's not necessary." 2010-07-08 12:54:25 -07:00