Commit Graph

468 Commits

Author SHA1 Message Date
Kenny Root
2ec4af5920 am 138757db: Merge "Make OBB results a one-way call" into gingerbread
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
2011-01-26 09:25:43 -08:00
Kenny Root
b7db2726e9 Make OBB results a one-way call
OBB result back to an application needs to be a one-way binder call.

Bug: 3353699
Change-Id: I0e625914d18a001c2fa9d764ea6463f34cf96743
2011-01-25 17:29:59 -08:00
Brad Fitzpatrick
6af61b8435 am a206efcf: Merge "android.os.Message: respect sPoolSize"
* commit 'a206efcf8d2e56cbd0d1de125b29b45fc6cc8431':
  android.os.Message: respect sPoolSize
2011-01-25 15:44:33 -08:00
Brad Fitzpatrick
2405c278ef android.os.Message: respect sPoolSize
Also rename some static members from mFoo to sFoo.

Bug: http://code.google.com/p/android/issues/detail?id=13866
Change-Id: I5c5075eb6f529d1534c7aa72b6881873cd08676a
2011-01-25 14:54:31 -08:00
Dianne Hackborn
19fdccfdf8 am 11576102: Fix issue #3373438: Update GBMR versions
* commit '11576102a9794ef964a08bc372dc09803f58997a':
  Fix issue #3373438: Update GBMR versions
2011-01-20 18:18:32 -08:00
Dianne Hackborn
11576102a9 Fix issue #3373438: Update GBMR versions
Change-Id: Ic4b4f1b0534fd2fbd6322eae01a4cb9d5a67cc6f
2011-01-20 12:16:43 -08:00
Brad Fitzpatrick
2d5b11aba0 am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
* commit '0927c9026537166cec36b2f9bb8a764ef8a7c606':
  Fix StrictMode javadoc copy/paste error.
2010-12-13 15:27:25 -08:00
Brad Fitzpatrick
0927c90265 Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 2010-12-13 15:25:09 -08:00
Dianne Hackborn
78e9f4cbae am e4a59519: Fix issue #3154576: battery stats checkin should include UID -> packages+ map
* commit 'e4a5951925f16f18dae91ed65567e96528f17fee':
  Fix issue #3154576: battery stats checkin should include UID -> packages+ map
2010-12-13 14:37:09 -08:00
Dianne Hackborn
e4a5951925 Fix issue #3154576: battery stats checkin should include UID -> packages+ map
Includes some other small fixes to battery collection and a few
other things.

Output of package info looks like this:

5,0,i,uid,1000,com.android.settings
5,0,i,uid,1000,com.android.providers.subscribedfeeds
5,0,i,uid,1000,com.android.providers.settings
5,0,i,uid,1000,com.android.server.vpn
5,0,i,uid,1000,android
5,0,i,uid,1000,com.android.systemui
5,0,i,uid,1000,com.google.android.backup
5,0,i,uid,1001,com.android.phone
5,0,i,uid,1001,com.android.providers.telephony
5,0,i,uid,1022,com.android.nfc
5,0,i,uid,10021,com.google.android.location
5,0,i,uid,10021,com.google.android.syncadapters.calendar
5,0,i,uid,10021,com.google.android.gsf
5,0,i,uid,10021,com.google.android.syncadapters.contacts
5,0,i,uid,10026,com.android.providers.downloads.ui
5,0,i,uid,10026,com.android.providers.media
5,0,i,uid,10026,com.android.providers.drm
5,0,i,uid,10026,com.android.providers.downloads
5,0,i,uid,10032,com.android.launcher
5,0,i,uid,10039,com.google.android.gm
5,0,i,uid,10041,com.google.android.gallery3d
5,0,i,uid,10049,com.android.providers.calendar

Change-Id: I9e38f254eef146339113ad270f5c6e8b60fb7a1d
2010-12-13 14:31:40 -08:00
Brad Fitzpatrick
320274c5f1 Fix StrictMode javadoc copy/paste error.
Change-Id: Idd49111f0a1af6f331cffa0972191b2d4e25a385
2010-12-13 14:07:39 -08:00
Jean-Baptiste Queru
e78a000955 resolved conflicts for merge of 4b94c451 to stage-korg-master
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
2010-12-13 13:06:13 -08:00
Hakan Still
b247536aa3 Added dropbox broadcast notification
To monitor the dropbox an application have to either poll the dropbox
and keep track of all entries or observ the /data/system/dropbox
directory. The later requires that the application runs as system-user.
This commit adds that a broadcast intent is sent when something is written
to the dropbox and an application can just listen on this intent and
then reads the entry with help of the DropboxManager class.
The application have to hold the permission android.permission.READ_LOGS
to get the intent.

Change-Id: I1f77f206a243df69f4ed5306078c47f7bf6181ec
2010-12-08 13:19:33 +01:00
Jean-Baptiste Queru
74923d3ae4 am d34c1495: Merge "Prevent system crash when OOM in Binder thread."
* commit 'd34c1495020e5d72dd18959fb906375dc0874c04':
  Prevent system crash when OOM in Binder thread.
2010-11-17 17:56:05 -08:00
Jean-Baptiste Queru
d34c149502 Merge "Prevent system crash when OOM in Binder thread." 2010-11-17 17:49:19 -08:00
Brad Fitzpatrick
8443dd16c2 am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"
* commit '383e95e245ceb87a2a6ad6422404ce641f0e08eb':
  DropBox: Read until the end of stream has been reached
2010-11-16 09:37:56 -08:00
Christian Lindeberg
e9f1881521 DropBox: Read until the end of stream has been reached
Read the requested length or until the end of the input stream
has actually been reached.

Change-Id: I01bc0b81eca0225209bdd288dde6a778a19d1e2c
2010-11-16 09:57:54 +01:00
Mattias Petersson
19f22745aa Prevent system crash when OOM in Binder thread.
When handling large images during an update of a widget,
we can run out of memory in the Binder thread. This will
cause an OutOfMemoryError to be thrown. When an Error is
thrown in the Binder thread, the entire system will crash.
This was fixed by catching this OutOfMemoryError and instead
throw a RuntimeException to keep the system alive.

Change-Id: If27199676c6f8aef23fb249be1197ca5dfe0fe99
2010-11-05 08:27:14 +01:00
Dianne Hackborn
9c7489f8bd am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread 2010-10-22 14:03:08 -07:00
Dianne Hackborn
5383f502e4 Fix issue #3122240: Expose xlarge in GB.
Plus some other small API cleanup.

Change-Id: I1a3c60f510f99224cccac9cc3f838f04141064f8
2010-10-22 12:59:20 -07:00
Jeff Hamilton
de8635e4c4 am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.
Merge commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a' into gingerbread-plus-aosp

* commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a':
  Backport ParcelFileDescriptor.createPipe() from master.
2010-10-21 21:08:20 -07:00
Jeff Hamilton
389a440ad1 Backport ParcelFileDescriptor.createPipe() from master.
This allows content providers to expose arbitraty data
through the ContentResolver open* APIs.

Change-Id: I408a0b7cee9cdba5654a962098386c012d6b3549
2010-10-21 22:39:41 -05:00
Brad Fitzpatrick
5a67749a35 am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp

* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
  Fix Vibrator permission CTS test broken earlier.
2010-10-19 12:25:46 -07:00
Brad Fitzpatrick
26e9cf38b2 Fix Vibrator permission CTS test broken earlier.
Bug: 3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
2010-10-19 11:02:20 -07:00
Dianne Hackborn
69a19fdbff am 3d2818d3: Remove public resource padding.
Merge commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp

* commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8':
  Remove public resource padding.
2010-10-18 18:41:12 -07:00
Dianne Hackborn
3d2818d34f Remove public resource padding.
Change-Id: I8a530a23284a1f2515b1340a1c5e5ed3a0b90780
2010-10-18 18:20:02 -07:00
Brad Fitzpatrick
c9cff071af am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread
Merge commit 'b4157a432cf791906d5b2f6d187f1767357a51bb' into gingerbread-plus-aosp

* commit 'b4157a432cf791906d5b2f6d187f1767357a51bb':
  StrictMode: fix docs to actually compile and add a utility method.
2010-10-18 17:04:55 -07:00
Brad Fitzpatrick
62a1eb58bf StrictMode: fix docs to actually compile and add a utility method.
Yes, this is a last minute public API change, but I'm already getting
a lot of inquiries about how to use StrictMode on a GB device but
targetting Eclair or Froyo.  I'd like a simple answer involving
reflection, but the current API is too painful to use via reflection.

I imagine this will be a common request, and it's much easier for us
to write a little blog post about trying it out if there's an easy way
to use it with reflection.

Change-Id: I1f21aaac7e61e5e90d1e4facc0c787d8daf089b1
2010-10-18 16:36:39 -07:00
Dianne Hackborn
13e46665ff am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread
Merge commit '736f5ec476526f3431d81dec5fb695bdee27e21a' into gingerbread-plus-aosp

* commit '736f5ec476526f3431d81dec5fb695bdee27e21a':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
2010-10-15 18:24:49 -07:00
Jean-Baptiste Queru
36e7790b6b Merge a851d8d0 from gingerbread
Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a
2010-10-15 17:02:57 -07:00
Dianne Hackborn
8bdf5935c0 Work on issue #3101415: Crespo apps seem to have their UID changed over time.
fsync!

Change-Id: Ie6c5397202579935ac69bf61d3e7b3081ecf269c
2010-10-15 14:46:33 -07:00
Nick Pelly
a851d8d0cf Merge "NFC: Move NFC service implementation out of system_server." into gingerbread 2010-10-15 10:55:11 -07:00
Brad Fitzpatrick
33476b2db8 am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread
Merge commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6' into gingerbread-plus-aosp

* commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6':
  Don't crash on null Vibrator during reboot.
2010-10-15 08:51:01 -07:00
Nick Pelly
bc21fdefdf NFC: Move NFC service implementation out of system_server.
NFC service is now an application service in packages/apps/Nfc.

NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().

**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().

Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.

Bug: 3041259
Bug: 3097445
Change-Id: If8f00ce8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:12:32 -07:00
Brad Fitzpatrick
e331644cb5 Don't crash on null Vibrator during reboot.
Bug: 3099305
Change-Id: I9af126f7a719f36ae544f517a2fccd0d33339389
2010-10-14 20:53:06 -07:00
Kenny Root
2f98a585cd am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread
Merge commit '49ec3dff4350209e109fc11dafe4294acea36146' into gingerbread-plus-aosp

* commit '49ec3dff4350209e109fc11dafe4294acea36146':
  OBB: Change documentation to reflect reality
2010-10-13 14:53:18 -07:00
Kenny Root
19dcd2aeba OBB: Change documentation to reflect reality
We can't reliably detect when the key for an OBB is incorrect, so just
remove the mention in the documentation. It still returns an error, but
just not the most specific error.

Bug: 3091064
Change-Id: I70e506822f2178a0ac5e4617fe545b23ce0026f4
2010-10-13 12:37:18 -07:00
Brad Fitzpatrick
4711d21a55 am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
Merge commit '9facd2d0847691ae46108713d6a7dc9f51a62135' into gingerbread-plus-aosp

* commit '9facd2d0847691ae46108713d6a7dc9f51a62135':
  StrictMode: link to designing for responsiveness ANR docs
2010-10-12 08:23:40 -07:00
Brad Fitzpatrick
9facd2d084 Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread 2010-10-12 08:09:55 -07:00
Kenny Root
8bb7a1dfbb am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbread
Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp

* commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45':
  OBB: rearrange to be entirely asynchronous
2010-10-11 17:31:06 -07:00
Kenny Root
af9d667ccf OBB: rearrange to be entirely asynchronous
Rearrange structure of MountService handling of OBBs to be entirely
asynchronous so we don't rely on locking as much. We still need the
locking to support dumpsys which has been improved to output all the
data structures for OBBs.

Added more tests to cover more of the error return codes.

Oh and fix a logic inversion bug.

Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
2010-10-11 17:22:03 -07:00
Brad Fitzpatrick
9fc2fc5757 StrictMode: link to designing for responsiveness ANR docs
Change-Id: If65849aaa8317e7e40b2837b640a5cdb95fe7b0e
2010-10-11 13:17:48 -07:00
Brad Fitzpatrick
3a4b7dfdda am 5804b4fd: Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
Merge commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0' into gingerbread-plus-aosp

* commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0':
  StrictMode: check max-offenses-per-loop earlier, before allocations
2010-10-11 12:05:14 -07:00
Brad Fitzpatrick
191cdf023c StrictMode: check max-offenses-per-loop earlier, before allocations
Previously a tight loop of StrictMode violations would still allocate
Exception objects and populate their stack frames, just to orphan them
later when checking the max-10-violations-per-loop constraint.

With this patch, we do that check _before_ allocating any memory.

Change-Id: Iae96aba33f8fcc6a8ec5838a231aecc08e95122d
2010-10-11 11:31:15 -07:00
Jean-Baptiste Queru
89fbcd72fb resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
2010-10-10 17:45:45 -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
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