Dianne Hackborn
315f19be8e
am daa71254: am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit 'daa71254f3e3261ecc0e143955c89ced70bbf008':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:07:17 -07:00
Dianne Hackborn
daa71254f3
am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit 'efb56934efdc0aae38ce7264f2576326293846b6':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:05:08 -07:00
Joe Onorato
d630f105e8
AsyncTask now uses the poll executor for apps up through HC MR1 and the serialized one after that.
...
Change-Id: I47d135ace5f8e78e4fa44ac9d1bf7abeeb9d3ba0
2011-03-17 18:42:26 -07:00
Dianne Hackborn
edf1fc6ce6
Whoops, forgot the HONEYCOMB_MR1 constant. :(
...
It shouldn't be a problem to put this in -- it is a static final
so it doesn't actually need to be in the on-device system image.
This is important for the SDK.
Change-Id: Iaa086247d0d65fe708c40fbab506aa60cd3e1396
2011-03-17 18:34:48 -07:00
Kenny Root
63fce8c56d
Merge "Update WakeLock-related docs to mention permissions"
2011-03-16 10:05:23 -07:00
Kenny Root
d710fb500c
Update WakeLock-related docs to mention permissions
...
android.permission.WAKE_LOCK permission is required to use WakeLock or
WifiLock, but nowhere is it mentioned that you must declare that
permission to use it.
Change-Id: Ib5f5294d37e39169fe5678743f380d95c4e5a842
2011-03-16 09:38:11 -07:00
Dianne Hackborn
9b7c1274dd
am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612 " into gingerbread
...
* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
Improve error reporting for issue #3183612
2011-03-15 15:44:18 -07:00
Dianne Hackborn
e2e8da7c73
am 7c2e76f0: Merge "Improve error reporting for issue #3183612 " into gingerbread
...
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
Improve error reporting for issue #3183612
2011-03-15 14:49:45 -07:00
Dianne Hackborn
1ab43775d8
Improve error reporting for issue #3183612
...
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.
Change-Id: I465972ab91b007e04b2ac62550f78583956a4048
2011-03-15 14:38:02 -07:00
Andy Stadler
50c294f21b
Clarify rules about encryption of emulated storage.
...
Bug: 3351426
Change-Id: I3a8fcd369862f3eab1781699108e29fe7ab474a0
2011-03-07 19:13:42 -08:00
Dianne Hackborn
e3a7f628c6
Fix Fragment.onInflate() to actually work correctly.
...
Like, um, it needs to be given the Activity since this is called before
the activity is attached.
And it was called after the entire fragment and its *view* was created
when being restored from saved state.
And the documentation was whacked.
Also fix the IME selector to dismiss when you tap outside of it.
Change-Id: Icbcafe7558965a570bdef9cda3441b1f0f7a317c
2011-03-03 22:17:16 -08:00
Simon Wilson
d984ba1320
am df58a1bb: am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612 " into gingerbread
...
* commit 'df58a1bbf8d7f6608848eae4d5d48dcff137dc8c':
Attempt to reduce problems from issue #3183612
2011-03-02 22:11:19 -08:00
Simon Wilson
df58a1bbf8
am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612 " into gingerbread
...
* commit '3d79f1ce84ee60dbb26468b9e5f75f4ccb5ed8aa':
Attempt to reduce problems from issue #3183612
2011-03-02 18:13:49 -08:00
Simon Wilson
3d79f1ce84
am edc68a00: Merge "Attempt to reduce problems from issue #3183612 " into gingerbread
...
* commit 'edc68a001cd94d2011029004cb27231432a18575':
Attempt to reduce problems from issue #3183612
2011-03-02 18:10:33 -08:00
Simon Wilson
edc68a001c
Merge "Attempt to reduce problems from issue #3183612 " into gingerbread
2011-03-02 18:03:52 -08:00
Christopher Tate
bd8b6f25bb
Fix binder proxy death notice tracking
...
There was an issue with stale recipient tracking when BinderProxy weak
references had been purged and a new proxy object allocated for a
still-live underlying IBinder. The death recipient bookkeeping has
now been reworked so that it's fundmentally tied to the BinderProxy
instances, not maintained as global state, to prevent this sort of
confusion entirely.
Bug 3499939
Change-Id: I75c5216b6d53b90868ac969e32c9725201e51be3
2011-03-01 18:25:52 -08:00
Dianne Hackborn
c9119f5034
Add ParcelFileDescriptor APIs to get raw fd.
...
Change-Id: I66ba72ffffd27237e60c9411453eef950ae62705
2011-02-28 18:03:26 -08:00
Elliott Hughes
a28b83ee04
Fix Parcel.writeNative to not ignore 'offset'.
...
Also switch to using libcore's array bounds checking. (This variant had no
detail message and was missing the length check.)
Bug: http://code.google.com/p/android/issues/detail?id=15075
Change-Id: Icfc045bd59403b59f02d95c8514abf881d3996e5
2011-02-28 14:55:29 -08:00
Jason Chen
22577b8d3a
am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
...
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
2011-02-23 18:03:34 -08:00
Dianne Hackborn
9248e95a2f
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
...
Original change description follows:
-----------------------------------
Implement issue #3326435 : Battery stats improvements
Keep track of discharge while screen is on vs. off.
Checkin looks like:
5,0,u,dc,1,1,1,0
The last four numbers are, from left:
- Maximum battery drain over time period.
- Minimum battery drain over time period.
- Battery drain while screen was on.
- Battery drain while screen was off.
Change-Id: Ie3cfe52df29b3f28ba8dc3350abe6cc967c76324
2011-02-23 17:21:09 -08:00
Wink Saville
5284090631
Changes for ril.h version 6.
...
Change-Id: Iacd9d362c4836546ac277cf3571227d426a721aa
2011-02-18 12:40:47 -08:00
Dianne Hackborn
e5dea7537c
Attempt to reduce problems from issue #3183612
...
java.lang.SecurityException: Neither user 1209 nor current...
...process has android.permission.WAKE_LOCK.
It looks like, somehow, the calling uid/pid of the SyncHandler
thread is getting corrupted. This change has Looper check for
these values changing from their original defaults and, if there
is a problem, resetting them and logging a WTF. Hopefully this
will avoid crashing the process, while also giving us more
helpful error reports about what is going on.
Change-Id: Iff06d575951fb8c06e2a3c31141f2907a715eb81
2011-02-09 14:19:23 -08:00
Jean-Baptiste Queru
d2ed82fb94
am 66700397: Merge 3100207b from gingerbread-plus-aosp
...
* commit '66700397496fc6f6d26f9f0b56ead8ef610b9654':
Tweak to make merges easier
2011-01-29 14:54:43 -08:00
Jean-Baptiste Queru
6670039749
Merge 3100207b from gingerbread-plus-aosp
...
Change-Id: Ib2eaede8b9e400e1d273f981c08a6ef82f3dd588
2011-01-29 14:51:17 -08:00
Jean-Baptiste Queru
3100207be5
am 1358b6a4: Tweak to make merges easier
...
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
2011-01-29 14:43:33 -08:00
Jean-Baptiste Queru
1358b6a4fb
Tweak to make merges easier
...
Bug: 3364311
Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
2011-01-29 12:54:09 -08:00
Jason parks
450536b6a6
am d4796c82: am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb
...
* commit 'd4796c823b92866d5895acf610e5571e9b5724d9':
Update the encryption password when the device password is changed.
2011-01-29 12:06:39 -08:00
Jason parks
d4796c823b
am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb
...
* commit 'a2e765ef1ad2cb907a4ae0a93bb15e4764ebb59a':
Update the encryption password when the device password is changed.
2011-01-29 12:04:11 -08:00
Jason parks
f7b3cd4efd
Update the encryption password when the device password is changed.
...
* Added changeEncryptionPassword() to the MountService.
* Update LockPatternUtils to call changeEncryptionPassword()
when the password is changed.
Note we only require the new password to change the
encryption password.
Bug: 3382129
Change-Id: I26a7e919e325e75e22fa4290da0a8b1b57b55a80
2011-01-28 13:52:37 -06:00
Kenny Root
bd549fe0bb
am 7dbf0696: resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp
...
* commit '7dbf0696ef37097f2bcec058f876f7f4ba63d357':
Make ObbActionListener a on-way call
2011-01-26 11:43:31 -08:00
Kenny Root
7dbf0696ef
resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp
...
Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c
2011-01-26 11:10:36 -08:00
Kenny Root
2c1d0967ba
Merge "Make ObbActionListener a on-way call" into honeycomb
2011-01-26 11:01:14 -08:00
Kenny Root
29a208e12c
am ff271a22: am 2ec4af59: am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit 'ff271a2288f375fc7a5854ac0d1f7c969d91996d':
Make OBB results a one-way call
2011-01-26 10:13:54 -08:00
Kenny Root
ff271a2288
am 2ec4af59: am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '2ec4af59209ab3a7088a001bbbcb10ef0b846564':
Make OBB results a one-way call
2011-01-26 10:11:21 -08:00
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
Dianne Hackborn
0793749661
am b8fc8c26: am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb
...
* commit 'b8fc8c26cba829225469a65bf8e35b06de54588e':
Change AsyncTask.execute() back to using a thread pool...
2011-01-25 22:09:50 -08:00
Dianne Hackborn
b8fc8c26cb
am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb
...
* commit '4fbca2b6138c52405fd7fb241bbf3c21fddd04bb':
Change AsyncTask.execute() back to using a thread pool...
2011-01-25 22:08:16 -08:00
Dianne Hackborn
96438cd658
Change AsyncTask.execute() back to using a thread pool...
...
...for now.
Change-Id: I1fe64f3e3a575f85add11dfe4d405f0c3a4a49de
2011-01-25 21:42:37 -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
821a4aca2b
am 47864180: am 6af61b84: am a206efcf: Merge "android.os.Message: respect sPoolSize"
...
* commit '47864180918702768d26f48ec3213c935cea0c4b':
android.os.Message: respect sPoolSize
2011-01-25 16:25:25 -08:00
Brad Fitzpatrick
4786418091
am 6af61b84: am a206efcf: Merge "android.os.Message: respect sPoolSize"
...
* commit '6af61b843511bc5b669d30b980c4a9e2682da47c':
android.os.Message: respect sPoolSize
2011-01-25 16:21:29 -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
Jesse Wilson
a16e38f156
Merge "Prefer the overload of getDigestAlgorithm spelled correctly."
2011-01-25 09:44:24 -08:00
Jesse Wilson
66e40c36b3
Prefer the overload of getDigestAlgorithm spelled correctly.
...
Change-Id: Iaf1c031b982890c2ef21607bdf80acd652646e19
2011-01-25 09:40:57 -08:00
Dianne Hackborn
9d97b63d0e
Honeycomb is now officially API 11.
...
Change-Id: I5b11801468bf6ee2482f1ef201ece70ed9303bd8
2011-01-23 14:56:39 -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
Brad Fitzpatrick
c0bb0bb5e3
StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
...
Change-Id: I1b2531b66d09c850519af17918aed8be9853ef3b
2011-01-20 16:29:52 -08:00
Brad Fitzpatrick
5f8b5c191c
Fixes for StrictMode instance count checking.
...
Misc stuff found after looking at the first day of data, Jesse's
review, and comments from Dianne about tracking Activity counts
better.
Change-Id: Ifee1ef8f59f41061d4aac8c02765627dbf3cd8e4
2011-01-20 15:12:08 -08:00
Dianne Hackborn
11576102a9
Fix issue #3373438 : Update GBMR versions
...
Change-Id: Ic4b4f1b0534fd2fbd6322eae01a4cb9d5a67cc6f
2011-01-20 12:16:43 -08:00