Commit Graph

513 Commits

Author SHA1 Message Date
Dianne Hackborn
50d3fa72d8 am d5423321: am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread
Merge commit 'd5423321b920be10c00fbcbc5a702f15e00693a5'

* commit 'd5423321b920be10c00fbcbc5a702f15e00693a5':
  Fix issue #3074745: Crash in system process
2010-10-10 17:47:01 -07:00
Brad Fitzpatrick
8775eae941 am b323559b: am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread
Merge commit 'b323559b13d8c8ced586f919c5ce083c1f5b74bc'

* commit 'b323559b13d8c8ced586f919c5ce083c1f5b74bc':
  DropBoxManager.Entry implements Closeable
2010-10-10 17:46:10 -07:00
Jeff Brown
d5da367024 am 22cb4ef8: am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread
Merge commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5'

* commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5':
  Switch Looper back to using poll() instead of epoll().
2010-10-10 12:52:40 -07:00
Brad Fitzpatrick
71ce18b0b7 am b8d40d26: am 30f5c8fe: More DropBoxManager javadoc love.
Merge commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321'

* commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321':
  More DropBoxManager javadoc love.
2010-10-10 11:15:12 -07:00
Brad Fitzpatrick
ceda3a972c am 992a9e50: am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
Merge commit '992a9e507fb1f8da7358b4d805c034d934eb1810'

* commit '992a9e507fb1f8da7358b4d805c034d934eb1810':
  DropBox.Entry javadoc syntax fix
2010-10-10 11:14:56 -07:00
Dianne Hackborn
d5423321b9 am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread
Merge commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead' into gingerbread-plus-aosp

* commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead':
  Fix issue #3074745: Crash in system process
2010-10-08 14:12:20 -07:00
Dianne Hackborn
9934fa77ef Merge "Fix issue #3074745: Crash in system process" into gingerbread 2010-10-08 14:05:01 -07:00
Brad Fitzpatrick
b323559b13 am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread
Merge commit 'a2a1ca42bc07af77a8a10b714517d006cb66c36a' into gingerbread-plus-aosp

* commit 'a2a1ca42bc07af77a8a10b714517d006cb66c36a':
  DropBoxManager.Entry implements Closeable
2010-10-08 13:01:29 -07:00
Dianne Hackborn
f47d8f272c Fix issue #3074745: Crash in system process
Also some tweaks to battery history collection to hopefully
improve the data we have.

Change-Id: I178a54a8c2d15cf38dcceaeef939406f50059aa4
2010-10-08 13:00:15 -07:00
Brad Fitzpatrick
cc792c4149 DropBoxManager.Entry implements Closeable
Change-Id: I61716c06b92fa1b9b5b271b5805550bdb2d51b46
2010-10-08 10:17:03 -07:00
Jeff Brown
22cb4ef8ce am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread
Merge commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db' into gingerbread-plus-aosp

* commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db':
  Switch Looper back to using poll() instead of epoll().
2010-10-07 15:46:57 -07:00
Brad Fitzpatrick
b8d40d263b am 30f5c8fe: More DropBoxManager javadoc love.
Merge commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc' into gingerbread-plus-aosp

* commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc':
  More DropBoxManager javadoc love.
2010-10-07 14:01:40 -07:00
Brad Fitzpatrick
992a9e507f am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
Merge commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2' into gingerbread-plus-aosp

* commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2':
  DropBox.Entry javadoc syntax fix
2010-10-07 14:01:30 -07:00
Jeff Brown
d577cfd73a Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread 2010-10-07 13:29:56 -07:00
Jeff Brown
415d8c3819 Switch Looper back to using poll() instead of epoll().
Added a couple of micro-optimizations to avoid calling wake() unnecessarily
and reduce JNI overhead slightly.

Fixed a minor issue where we were not clearing the "next" field of Messages
returned by the MessageQueue so the Message would hold on to its successor
and potentially prevent the GC from collecting it if the message were leaked
somehow.

Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
2010-10-07 13:26:39 -07:00
Joe Onorato
7d56e3d3cb Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached." 2010-10-07 10:52:30 -07:00
Brad Fitzpatrick
30f5c8fede More DropBoxManager javadoc love.
Change-Id: I9b14f6905533e0af66bd64fc76352ed8fc365058
2010-10-07 10:48:20 -07:00
Brad Fitzpatrick
95173b14d6 DropBox.Entry javadoc syntax fix
Change-Id: I32d055b39ca89ec9f6a7bf189263844424533b60
2010-10-07 10:07:34 -07:00
Brian Carlstrom
c21550a8d1 Adding android.os.Debug.countInstancesOfClass
- Debug.countInstancesOfClass is just a wrapper on
  dalvik.system.VMDebug.countInstancesOfClass to avoid code from
  depending on the dalvik classes directly

- Existing usages of VMDebug.countInstancesOfClass in ActivityThread
  and ViewDebug are converted to the new Debug.countInstancesOfClass

- Existing use of OpenSSLSocketImpl.instanceCount, which is being
  removed, is converted to Debug.countInstancesOfClass(OpenSSLSocketImpl.class)

Bug: 3015791
Change-Id: Iefa781292d5b82a63bad7254c913a09deb3b7888
2010-10-05 21:38:57 -07:00
Dianne Hackborn
58520b24d4 resolved conflicts for merge of 10d5b096 to master
Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
2010-10-04 14:54:59 -07:00
Dianne Hackborn
10d5b0966d am 407f625a: Add new API to find out whether external storage is removable.
Merge commit '407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp

* commit '407f625a9b8e356e765a5ec587c443af1f3aadb5':
  Add new API to find out whether external storage is removable.
2010-10-04 14:03:06 -07:00
Dianne Hackborn
407f625a9b Add new API to find out whether external storage is removable.
This is implemented based on whether we are using the "nosdcard"
product.  Needed to tweak aapt to allow use of the product attribute
with other resource definition tags besides strings.

Change-Id: I49922d23b52a34183a8e2f4d2515adaf1fc9149a
2010-10-04 13:58:56 -07:00
Wink Saville
30d4d57e8e Add SystemService.restart.
This allows easy access to the new SystemProperties ctl.restart
control command.

Change-Id: I3e82710873adff54ef8a0cb53ca13d4dcab2408d
2010-10-03 13:53:26 -07:00
Brad Fitzpatrick
e0ad63bf1e resolved conflicts for merge of 6718b365 to master
Change-Id: I32762a4a3b00856f6765d50667b667264a385fc6
2010-10-01 13:57:04 -07:00
Brad Fitzpatrick
6718b365bc am 32e60c79: Update StrictMode\'s public API.
Merge commit '32e60c7942eeba920ec5c27b372ec0899fd75a20' into gingerbread-plus-aosp

* commit '32e60c7942eeba920ec5c27b372ec0899fd75a20':
  Update StrictMode's public API.
2010-10-01 13:05:02 -07:00
Brad Fitzpatrick
32e60c7942 Update StrictMode's public API.
This makes it more future-proof and maintainable, not exposing the
internal bitpacking state.

The implementation is unchanged (the policy is still just an int we pass
around).

Also starts to introduce VmPolicy, for things which are process-wide,
not per-thread.  As an initial user, make SQLite's Cursor finalization
leak warnings use StrictMode.

Change-Id: Idedfba4e965716f5089a52036421460b1f383725
2010-10-01 12:54:10 -07:00
Kenny Root
9e95468bbb am 6ce5f60c: am 38cf8867: Remove OBBs from state list when volume unmounted
Merge commit '6ce5f60c791401ed0faf5d36baf4fc6612358676'

* commit '6ce5f60c791401ed0faf5d36baf4fc6612358676':
  Remove OBBs from state list when volume unmounted
2010-09-30 19:46:46 -07:00
Kenny Root
6ce5f60c79 am 38cf8867: Remove OBBs from state list when volume unmounted
Merge commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94' into gingerbread-plus-aosp

* commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94':
  Remove OBBs from state list when volume unmounted
2010-09-30 17:30:22 -07:00
Kenny Root
38cf8867a8 Remove OBBs from state list when volume unmounted
Don't keep tracking OBBs when the volume they're located on goes away.
Remove them from our state tracking maps and then send a notification to
any listener that is still around.

Add a dump handler to MountService so the state of the mount lists
can be inspected.

Change the API to just make a callback directly to the change listener
when mount is called when it's already mounted or unmount called when
it's already unmounted.

Change-Id: Idb4afbb943ca5ca775825f908bff334e3ce1cfcc
2010-09-30 17:24:34 -07:00
Doug Zongker
ca2e0293f2 am ab9f5082: am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread
Merge commit 'ab9f508292f9a1eb54bf97bdd1566bdf8dd43fb3'

* commit 'ab9f508292f9a1eb54bf97bdd1566bdf8dd43fb3':
  don't delete /cache/recovery/last_log on boot
2010-09-30 11:25:26 -07:00
Doug Zongker
ab9f508292 am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread
Merge commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4' into gingerbread-plus-aosp

* commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4':
  don't delete /cache/recovery/last_log on boot
2010-09-29 13:43:28 -07:00
Doug Zongker
981dec695f Merge "don't delete /cache/recovery/last_log on boot" into gingerbread 2010-09-29 13:41:00 -07:00
Doug Zongker
d059055fb3 don't delete /cache/recovery/last_log on boot
Change-Id: I7739d7a61f4f0d0c2bc6324580404f61d435d716
2010-09-29 13:22:49 -07:00
Kenny Root
bff405f910 resolved conflicts for merge of d8e8186c to master
Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5
2010-09-28 18:16:50 -07:00
Kenny Root
d8e8186c88 am 05105f7a: Update OBB API to include callbacks
Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp

* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
  Update OBB API to include callbacks
2010-09-28 17:33:47 -07:00
Kenny Root
05105f7abe Update OBB API to include callbacks
Add a callback for users of the StorageManager API to be able to receive
notifications when the requested operation completes for mountObb and
unmountObb.

Add NDK API to get to ObbInfo like the Java API has.

Also update the docs for the API and remove the "STOPSHIP" comments.

Change-Id: I23a4409c7f8b74d3169614beba920b4d667990a4
2010-09-28 17:23:26 -07:00
Mike Lockwood
58fd98accb Add constant for SDCARD_RW group ID.
Change-Id: I3b009cd06d3c1bc308ba82694db7383134709f75
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-24 11:02:47 -04:00
Dianne Hackborn
846df9f517 resolved conflicts for merge of 8952a448 to master
Change-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b
2010-09-23 20:33:19 -07:00
Dianne Hackborn
8952a4488e am 287952c3: Fix issue #3022508: Crash during media scan
Merge commit '287952c35e148811c106bc0f5036eabf20f71562' into gingerbread-plus-aosp

* commit '287952c35e148811c106bc0f5036eabf20f71562':
  Fix issue #3022508: Crash during media scan
2010-09-23 16:04:23 -07:00
Dianne Hackborn
287952c35e Fix issue #3022508: Crash during media scan
Don't kill processes for excessive wake lock use, even if they
are in the background, as long as they have running services.

Also fix some problems with this, such as not noting the kill
in battery stats.

And add killing of processes for cpu usage as well, along with
some optimizations to computing CPU usage.

And fix BatteryWaster to be better behaving for testing these
cases.

Add new "monitor" command to am to watch as the activity manager
does stuff (so we can catch things at the point of ANR).

Finally some miscellaneous debug output for the stuff here, as
well as in progress debugging of an ANR.

Change-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1
2010-09-23 15:59:28 -07:00
Joe Onorato
5eb22e2ce1 am 19c4b29d: am 8310b42f: Add javadoc saying that wake locks are ref counted by default.
Merge commit '19c4b29d46aece70dbe532ba9078c904fbc62502'

* commit '19c4b29d46aece70dbe532ba9078c904fbc62502':
  Add javadoc saying that wake locks are ref counted by default.
2010-09-22 17:33:54 -07:00
Joe Onorato
19c4b29d46 am 8310b42f: Add javadoc saying that wake locks are ref counted by default.
Merge commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e' into gingerbread-plus-aosp

* commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e':
  Add javadoc saying that wake locks are ref counted by default.
2010-09-22 17:29:49 -07:00
Joe Onorato
8310b42fbc Add javadoc saying that wake locks are ref counted by default.
Bug: 3012561
Change-Id: I441a42fdb12ba6d87d6f5a49463d6ddcc300acb7
2010-09-22 16:54:36 -07:00
Brad Fitzpatrick
7c860bca06 am 9317801a: am c87a8adc: Merge "Flesh out StrictMode docs." into gingerbread
Merge commit '9317801a3c9be6d1a1dbde558ca7d2106982e96f'

* commit '9317801a3c9be6d1a1dbde558ca7d2106982e96f':
  Flesh out StrictMode docs.
2010-09-22 15:36:11 -07:00
Brad Fitzpatrick
9317801a3c am c87a8adc: Merge "Flesh out StrictMode docs." into gingerbread
Merge commit 'c87a8adc0e143e0c7efc62a1094ee6ac666e46d9' into gingerbread-plus-aosp

* commit 'c87a8adc0e143e0c7efc62a1094ee6ac666e46d9':
  Flesh out StrictMode docs.
2010-09-22 15:30:05 -07:00
Brad Fitzpatrick
15ba406111 Flesh out StrictMode docs.
Bug: 3001474
Change-Id: If64209a312d45f7d96d8317d1e63e6c773a01441
2010-09-22 15:01:32 -07:00
Jeff Brown
85c3fe443f resolved conflicts for merge of aa522ac8 to master
Change-Id: Ib17ff201e770abc6b9edb58e01f3bb483dc8fa56
2010-09-21 16:45:16 -07:00
Jeff Brown
aa522ac8ba am ed739327: Simplify and optimize MessageQueue loop.
Merge commit 'ed7393274af2f268fcdede5f1a3d72c9af842b8e' into gingerbread-plus-aosp

* commit 'ed7393274af2f268fcdede5f1a3d72c9af842b8e':
  Simplify and optimize MessageQueue loop.
2010-09-21 15:59:14 -07:00
Jeff Brown
ed7393274a Simplify and optimize MessageQueue loop.
Avoids allocating new idle handler arrays on each iteration since
we only need one to copy into.
Coalesced the synchronized blocks.
Hoisted the call to Binder.flushPendingCommands() outside of the
synchronized block.

Change-Id: Iabb6b633627954564bdd5d09e696663223407f47
2010-09-21 15:41:33 -07:00
Doug Zongker
c2f8a45876 recovery just takes a filename as an argument now
(Cherrypicked from gingerbread.)

Change-Id: I0deb8494465e1036280ac92730e537fd3f38a9fb
2010-09-21 12:33:25 -07:00