Commit Graph

900 Commits

Author SHA1 Message Date
Glenn Kasten
a7f6562065 Merge "Add android.os.Process.setThreadScheduler" 2012-01-17 07:20:47 -08:00
Jeff Sharkey
7f97e65add Clear reply before writing exception.
Changes Binder.execTransact() to clear any partial reply before
writing the exception.  Specifically, this fixes case where an
onTransact() could leave a writeNoException() floating in the reply.

Bug: 5686023
Change-Id: Ibc944464a010f5ec2fd8ef3cc84ac23d8260a491
2011-12-14 18:07:54 -08:00
Joe Malin
84a0060ea1 am bea42859: am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit 'bea4285934b4cd5bab21f7c69ac82d871b6ee05f':
  DOC CHANGE: Add text for android.os.storage
2011-12-07 17:17:09 -08:00
Joe Malin
aa2719df72 am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '3937e055708a8618f184feab204fed4bb41f3f6e':
  DOC CHANGE: Add text for android.os.storage
2011-12-07 17:11:59 -08:00
Joe Malin
13235db8f7 DOC CHANGE: Add text for android.os.storage
Change-Id: Ia5785cff3860907af4c53cbe769126496ee338c3
2011-12-07 15:50:34 -08:00
Dianne Hackborn
138d870fb7 am 1f1fa7ed: am fb90df8c: Merge "Truthiness is good." into ics-mr1
* commit '1f1fa7edd608137863b863da44ee26efb5a93e23':
  Truthiness is good.
2011-12-07 10:49:56 -08:00
Dianne Hackborn
478237db07 Truthiness is good.
Change-Id: Iedd4d4027576001fc5e829bb0a1023dd2aefce99
2011-12-05 18:15:17 -08:00
Romain Guy
fe0d3523a5 Merge "Make sure onPostExecute() is never called after cancel() Bug #5651553" 2011-12-05 14:50:54 -08:00
Romain Guy
657f51371c Make sure onPostExecute() is never called after cancel()
Bug #5651553

As dfined by the documentation.

Change-Id: I627a49ee000d6990b61fd64dde9b06f72cd5cbae
2011-12-05 14:49:33 -08:00
Dianne Hackborn
a2a56f82a8 am 48e07296: am bfb3dec2: Merge "More social integration." into ics-mr1
* commit '48e07296800c49f8bc9b34cc57372593021f79a1':
  More social integration.
2011-12-01 18:52:27 -08:00
Dianne Hackborn
a3d487cb13 More social integration.
Change-Id: I9be09e08bda5db6c05f5beabc380708a11ead43b
2011-12-01 18:42:24 -08:00
Nick Pelly
082ccca5ff am 4fb747f3: am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit '4fb747f329523d6b3a7efc59a4360a249cdaa5ad':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
2011-11-21 21:08:29 -08:00
Nick Pelly
a5cb9f4217 Replace vendor specific NfcGoogle.apk with generic Nfc.apk
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I09a81a896ff3cceb5a8de331d3399921b870932a
2011-11-21 14:55:29 -08:00
Jeff Brown
fe2d4abdd9 am 698d3de6: am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1
* commit '698d3de681bf85047675baa61f9b28961f3d6862':
  Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
2011-11-10 16:14:43 +00:00
Jeff Brown
0bde66a837 Throw TransactionTooLargeException when Binder transaction fails.
Bug: 5578022

Previously, Binder transactions failed silently, which caused
problems because apps would carry on assuming that the operation
had succeeded.  Often, the apps would crash soon due to a violated
invariant, but sometimes they managed to do some damage first...

Change-Id: Ia9cc98b3b761a8160e7c4e87507860b5912c0451
2011-11-08 20:42:11 -08:00
Robert Greenwalt
08d153fb8e am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit 'fd900f05fb67046b97701f20626f7fd408fd8990':
  Start using IP tool for advanced routing.
2011-11-05 19:33:46 +00:00
Robert Greenwalt
fd900f05fb am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
  Start using IP tool for advanced routing.
2011-11-04 22:55:30 +00:00
Doug Zongker
e2d58e95a0 close input streams obtained from otacerts zip file
Quells a StrictMode warning from OTA verification.

Change-Id: Ie3e4c345551d1925fcc37c3ae9ce5c45713be93a
2011-11-04 14:11:12 -07:00
Robert Greenwalt
3b28e9a3da Start using IP tool for advanced routing.
bug:5495862
bug:5396842
Change-Id: I5e31b352b14a4dc746cacce4d61cf8d9ad7382a0
2011-11-04 09:52:04 -07:00
Christopher Tate
bc6f0ce8be Add persistent property to disable strict mode
Setting persist.sys.strictmode.disable to 'true' will disable strict
mode on eng/userdebug builds where it is turned on by default.
Explicitly enabling it in the Settings UI will override this, so
it's still possible to toggle it there even when this property
has been set on the device.

Change-Id: Ifd971f948fb2f803d509c2a06112c4bb932a5b1f
2011-11-03 13:16:27 -07:00
Dianne Hackborn
f35fe23669 Add new OOM adjustment for the "previous" process.
This is the process that you had previously been interacting with
in the UI before the current one.  Treating it specially should
allow us to improve the scenario of switching back and forth
between two apps.

Also add API constent for ICS MR1.

Change-Id: Ib3fe4df36b270be11dfd6b7e8d107c9994058a4d
2011-11-01 19:25:20 -07:00
Jeff Brown
bce4561708 resolved conflicts for merge of 2d280f75 to ics-mr1
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
2011-10-30 14:24:02 -07:00
Jeff Brown
89101cd9d9 Improve the slow query instrumentation.
On user-debug and eng builds, you can set the
"db.log.slow_query_threshold" system property to queries that
take longer than the specified number of milliseconds.
Set it to 0 to log all queries.

This property has been around for a while but it was implemented
poorly.  In particular, it *changed* the behavior of the query
by calling getCount() while holding the Db connection.
In normal operation, the query will not actually run until later.

By putting the timing logic into fillWindow() instead, we ensure
that we only measure queries that actually ran.  We also capture
cases where the cursor window gets filled multiple times.

Bug: 5520301
Change-Id: I174f5e1ea15831a1d22a36e9a804d7755f230b38
2011-10-28 14:58:39 -07:00
Michael Chan
cf0ca99a22 Fix typos
Change-Id: I6406b33f52bd8fb126a9b346d1bfe30ca2c2144b
http://code.google.com/p/android/issues/detail?id=14614
http://code.google.com/p/android/issues/detail?id=3563
http://code.google.com/p/android/issues/detail?id=5960
2011-10-20 15:32:37 -07:00
Dianne Hackborn
3585a3dfc6 am 47f8367a: Merge "Work on issue #5465917: Wakelock *overflow* held for very long times" into ics-mr0
* commit '47f8367ab79247501d5d204632a7797fa8a888e5':
  Work on issue #5465917: Wakelock *overflow* held for very long times
2011-10-19 11:10:18 -07:00
Dianne Hackborn
c24ab866b0 Work on issue #5465917: Wakelock *overflow* held for very long times
- Fix ordering problem in sync manager that would cause its wake
  locks to slightly appear in the system process when they should
  be fully accounted against the app.
- Allow the system process to have more wake lock names in its
  battery stats.
- In the bug report output, print totals of the wake locks for each
  process, to make it easier to parse what is being printed for things
  like the system process with a huge number of individual wake locks.

Change-Id: I3cf39330f22f3c51c11e65e4124150d73a7da2dd
2011-10-18 16:38:17 -07:00
Christopher Tate
b9c1acfb0b DO NOT MERGE - Require device encryption password for adb backup/restore
This supersedes any backup-password that the user might supply.  Per
design, the device encryption password is also always used to encrypt
the backup archive.

The CL introduces two new strings, used for prompting the user for
their device encryption password rather than their settings-defined
"backup password" when confirming a full backup or restore operation.

Bug 5382487

Change-Id: I278737927a4ecbb765bfb5ecfd28a4cb8dae52ef
2011-10-13 17:39:48 -07:00
Christopher Tate
32418be49e Require device encryption password to perform adb backup/restore
This supersedes any backup-password that the user might supply.  Per
design, the device encryption password is also always used to encrypt
the backup archive.

The CL introduces two new strings, used for prompting the user for
their device encryption password rather than their settings-defined
"backup password" when confirming a full backup or restore operation.

Bug 5382487

Change-Id: I0b03881b45437c944eaf636b6209278e1bba7a9f
2011-10-13 12:29:32 -07:00
Romain Guy
0bbd8d8273 Revert "Check whether an AsyncTask is created/executed on a looper thread."
This reverts commit 7498ccb6b9.
2011-10-11 18:13:37 -07:00
Romain Guy
5e7f2d0b22 Revert "Fix the build"
This reverts commit 4db2504ada.
2011-10-11 18:13:05 -07:00
Romain Guy
f751210b4b Merge "Fix the build" 2011-10-11 14:51:18 -07:00
Romain Guy
4db2504ada Fix the build
Change-Id: I3071feab62abee7393557ceb920786b476fb0b02
2011-10-11 14:48:56 -07:00
Romain Guy
df61887feb Merge "Check whether an AsyncTask is created/executed on a looper thread." 2011-10-11 14:10:10 -07:00
Romain Guy
7498ccb6b9 Check whether an AsyncTask is created/executed on a looper thread.
Change-Id: I181b253c50a6579f35e61cd4b0c500379462e035
2011-10-11 14:09:27 -07:00
Jeff Brown
be7c29c9f7 Don't log BlockGuard violations on ENG builds.
We want to see CloseGuard violations in the log in ENG builds
because they indicate serious problems, but BlockGuard is
too noisy and is best viewed in the aggregate from the
drop box based tools.

Change-Id: I77d4d0a561a4299355c111d0ccb5a2147646245b
2011-10-11 11:35:23 -07:00
Jeff Brown
d5875d98f0 Always log StrictMode violations on ENG builds.
The drop-box is too quiet and it masking real problems from
developers.  On ENG builds, use both logging and the drop-box
to ensure that problems are noticed promptly.

Change-Id: Id8fb8d392a7e01b532b73cb1a026b0d1f17af742
2011-10-09 15:01:11 -07:00
Dianne Hackborn
01017cdf74 Merge "Some new ICS target SDK changes." 2011-10-05 11:25:02 -07:00
Joe Fernandez
cac15eb21c Merge "docs: add developer guide cross-references, Project ACRE" 2011-10-04 14:03:12 -07:00
Joe Fernandez
b54e7a3d9f docs: add developer guide cross-references, Project ACRE
Change-Id: I5df1c4e13af67ff4c4a5b22f3cb1247bf0103b09
2011-10-04 13:57:00 -07:00
Dianne Hackborn
c04db7e067 Fix handling of "allow fds" state.
Didn't take into account nesting of bundles.  Boo.

Change-Id: Ic8cf21ad8d6f4938a3e105128624c9d162310d01
2011-10-03 21:09:35 -07:00
Dianne Hackborn
9ecebbfbf7 Add mechanism for Parcel to not allow FDs to be written to it.
This is to help implement issue #5224703.

Change-Id: I026a5890495537d15b57fe61227a640aac806d46
2011-10-03 16:58:41 -07:00
repo sync
7960d9f888 Fix IPv6 on wifi
Bug: 5388757
Change-Id: I3c8c776c26dad1daa9801d0455fde749c0206401
2011-09-29 16:59:01 -07:00
Dianne Hackborn
9d0e37e27c Some new ICS target SDK changes.
Change-Id: I5a500a5faddadbcb98bf181ad413c6d9fd7e663e
2011-09-22 12:58:54 -07:00
Jeff Sharkey
cdd02c5d76 Collect and persist tethering stats.
Use new "gettetherstats" netd command to retrieve statistics for
active tethering connections.  Keep tethering poll events separate
from UID poll, even though they end up same historical structures.

Bug: 5244846
Change-Id: Ia0c5165f6712c12b51586f86c331a2aad4ad6afb
2011-09-16 16:05:51 -07:00
Dianne Hackborn
67eb4320d2 Merge "ICS is API 14." 2011-09-14 16:04:15 -07:00
Dianne Hackborn
0784cfb4b7 ICS is API 14.
Change-Id: I95f500f94ce206ae6ca6938d17537431d8799237
2011-09-14 13:51:59 -07:00
Irfan Sheriff
7329361cdc Add support to change IPv6 privacy extensions
Bug: 3360737
Change-Id: I9136992d05f7abf15bdfd92aad3a3e0c0fe3bee2
2011-09-14 12:31:56 -07:00
Ben Komalo
13c7197da8 Revert encryption mapping for device wipes.
External storage volumes that were emulated+encrypted needed to have
their encryption mapping removed so that it doesn't try to encrypt the
volume after formatting them.

This just wires through an argument through vold, and assumes that vold
will do the right thing even if there is no encryption mapping set.

Bug: 5017638
Change-Id: I858fae3d12cb415bc34637f520f71220ad9daaad
2011-09-09 14:44:40 -07:00
Ben Komalo
444eca2329 Expose getting encryptstate through IMountService
- this really just calls cryptfs cryptocomplete
- needed so that UI logic can present a factory reset option if
encryption screwed up

Bug: 3384231
Change-Id: I553de87f0d03a65851030c9c5266e85866d30fa6
2011-09-06 12:48:53 -07:00
Dianne Hackborn
62f20ecf49 Add new am option to profile the launching of an activity.
Change-Id: Ie71a8043eafe41f53a0b3dbb5170276d87acbc9b
2011-08-15 17:55:57 -07:00