OSDN Git Service

android-x86/system-extras.git
11 years agoFix build
Glenn Kasten [Thu, 15 Nov 2012 00:24:27 +0000 (16:24 -0800)]
Fix build

Change-Id: Ibb398f36a7569af3480e24145da4317bf5b86998

11 years agoadd asynchronous tracing
Erik Gilling [Wed, 14 Nov 2012 23:11:21 +0000 (15:11 -0800)]
add asynchronous tracing

Change-Id: I5b8660cd4d2af2ad7c6b2548c9572d3527882d6d

11 years agoam 1df980dd: am c3dc8929: Use updated stop supplicant API
Irfan Sheriff [Thu, 8 Nov 2012 14:22:06 +0000 (06:22 -0800)]
am 1df980dd: am c3dc8929: Use updated stop supplicant API

* commit '1df980dd3c6a7130540724e9f3f6121d677e4408':
  Use updated stop supplicant API

11 years agoam c3dc8929: Use updated stop supplicant API
Irfan Sheriff [Thu, 8 Nov 2012 14:14:30 +0000 (06:14 -0800)]
am c3dc8929: Use updated stop supplicant API

* commit 'c3dc8929286e3f3b46d4d014c5b7aeecb416f4e0':
  Use updated stop supplicant API

11 years agoUse updated stop supplicant API
Irfan Sheriff [Mon, 5 Nov 2012 15:44:10 +0000 (07:44 -0800)]
Use updated stop supplicant API

Bug: 7227463
Change-Id: Ifecb256fed68c2046b77a5ce7a8c9f25c8e3fe62

11 years agoam 8be5ea33: (-s ours) am 07c8a6d2: Reconcile with jb-mr1-factory-release jb-mr1...
The Android Open Source Project [Tue, 6 Nov 2012 20:34:12 +0000 (12:34 -0800)]
am 8be5ea33: (-s ours) am 07c8a6d2: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '8be5ea335c6aacb2af1f3c77b19db9509f26e601':

11 years agoam 07c8a6d2: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 20:30:11 +0000 (12:30 -0800)]
am 07c8a6d2: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '07c8a6d238ddf855d5d6b4421d2527c580a374b6':

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 20:19:21 +0000 (12:19 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I2a69ed763c7b5f29c060d52b41897abd27bc740d

11 years agoam ed9208c3: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 31 Oct 2012 16:28:08 +0000 (09:28 -0700)]
am ed9208c3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'ed9208c36ae0d0d93f93412e76eb0ce7d41eed7b':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 31 Oct 2012 16:19:01 +0000 (09:19 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I687546ca2bdfc152e141cda550975329f2bec732

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 19 Oct 2012 22:46:35 +0000 (15:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 9d547387: am 3f91534e: atrace: add sync trace support
Erik Gilling [Fri, 19 Oct 2012 20:22:18 +0000 (13:22 -0700)]
am 9d547387: am 3f91534e: atrace: add sync trace support

* commit '9d54738752df617af3bf281bc1969136fb08943d':
  atrace: add sync trace support

11 years agoam 3f91534e: atrace: add sync trace support
Erik Gilling [Fri, 19 Oct 2012 19:18:45 +0000 (12:18 -0700)]
am 3f91534e: atrace: add sync trace support

* commit '3f91534edf98d2a385c8fa29839cdd15a69f21d3':
  atrace: add sync trace support

11 years agoam af41b37f: am 7176b213: Merge "Add automatic file_contexts handle to make_ext4fs."
Kenny Root [Wed, 17 Oct 2012 20:02:01 +0000 (13:02 -0700)]
am af41b37f: am 7176b213: Merge "Add automatic file_contexts handle to make_ext4fs."

* commit 'af41b37f0088417f98261c24647f195ecd4999fc':
  Add automatic file_contexts handle to make_ext4fs.

11 years agoam 7176b213: Merge "Add automatic file_contexts handle to make_ext4fs."
Kenny Root [Wed, 17 Oct 2012 19:58:58 +0000 (12:58 -0700)]
am 7176b213: Merge "Add automatic file_contexts handle to make_ext4fs."

* commit '7176b213480e87bc303073ccc553fdc824198355':
  Add automatic file_contexts handle to make_ext4fs.

11 years agoatrace: add sync trace support
Erik Gilling [Wed, 17 Oct 2012 19:16:01 +0000 (12:16 -0700)]
atrace: add sync trace support

Change-Id: I2cd2f1a1e51f6e3d1ebbde4d5442be68a218b33d

11 years agoMerge "Add automatic file_contexts handle to make_ext4fs."
Kenny Root [Wed, 17 Oct 2012 19:12:50 +0000 (12:12 -0700)]
Merge "Add automatic file_contexts handle to make_ext4fs."

11 years agoAdd automatic file_contexts handle to make_ext4fs.
rpcraig [Fri, 21 Sep 2012 15:46:20 +0000 (11:46 -0400)]
Add automatic file_contexts handle to make_ext4fs.

Normal make_ext4 use requires a -S option to
pass a correct file_contexts path for labeling.
This becomes impractical under certain conditions
when used on a target device.  For instance, with
the creation of ext4 containers for asec images.
This patch will create a proper sehandle only
if the -S option is not used and only when
run on a target device.

Change-Id: I9bdc8659aae7037ccebbf4464500b79b4b2f56af

11 years agoam 4ff85ad2: am 50d42703: Merge "Remove HAVE_SELINUX guards"
Kenny Root [Wed, 17 Oct 2012 17:10:28 +0000 (10:10 -0700)]
am 4ff85ad2: am 50d42703: Merge "Remove HAVE_SELINUX guards"

* commit '4ff85ad26acab3f4bbab6195c5e092999164f7d8':
  Remove HAVE_SELINUX guards

11 years agoam 50d42703: Merge "Remove HAVE_SELINUX guards"
Kenny Root [Wed, 17 Oct 2012 17:08:04 +0000 (10:08 -0700)]
am 50d42703: Merge "Remove HAVE_SELINUX guards"

* commit '50d42703936b87ffdd5b9ec135d7e0e4af8aa31f':
  Remove HAVE_SELINUX guards

11 years agoMerge "Remove HAVE_SELINUX guards"
Kenny Root [Wed, 17 Oct 2012 16:35:50 +0000 (09:35 -0700)]
Merge "Remove HAVE_SELINUX guards"

11 years agoRemove HAVE_SELINUX guards
Kenny Root [Wed, 17 Oct 2012 06:41:24 +0000 (23:41 -0700)]
Remove HAVE_SELINUX guards

Change-Id: I4808ec7455acf0f60b2ceab6ce447fd5d7eb7100

11 years agoam e24264a6: am f310f6c5: Merge "Remove HAVE_SELINUX guards"
Kenny Root [Wed, 17 Oct 2012 01:02:18 +0000 (18:02 -0700)]
am e24264a6: am f310f6c5: Merge "Remove HAVE_SELINUX guards"

* commit 'e24264a618c6325445cc64c5f7c4000df6d358fa':
  Remove HAVE_SELINUX guards

11 years agoam f310f6c5: Merge "Remove HAVE_SELINUX guards"
Kenny Root [Wed, 17 Oct 2012 00:53:00 +0000 (17:53 -0700)]
am f310f6c5: Merge "Remove HAVE_SELINUX guards"

* commit 'f310f6c5725f9f9985ee30e744a2b65fed9d572e':
  Remove HAVE_SELINUX guards

11 years agoMerge "Remove HAVE_SELINUX guards"
Kenny Root [Tue, 16 Oct 2012 23:33:47 +0000 (16:33 -0700)]
Merge "Remove HAVE_SELINUX guards"

11 years agoRemove HAVE_SELINUX guards
Kenny Root [Wed, 10 Oct 2012 18:13:13 +0000 (11:13 -0700)]
Remove HAVE_SELINUX guards

Change-Id: Ieda8d8c331e9fccc7dcda228852d408ffc94e98c

11 years agoam f5672fec: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
The Android Open Source Project [Mon, 15 Oct 2012 14:43:18 +0000 (07:43 -0700)]
am f5672fec: (-s ours) Reconcile with jb-mr1-factory-release - do not merge

* commit 'f5672feccfc4b3be0ddecc092b949710dec47bba':

11 years agoReconcile with jb-mr1-factory-release - do not merge
The Android Open Source Project [Mon, 15 Oct 2012 14:40:50 +0000 (07:40 -0700)]
Reconcile with jb-mr1-factory-release - do not merge

Change-Id: I5edb3257bf8f06c3274051af0c4da369d8643ca0

11 years agomerge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 17:27:38 +0000 (10:27 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev

11 years agoam e666ccd6: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 12 Oct 2012 14:37:18 +0000 (07:37 -0700)]
am e666ccd6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e666ccd6ab00d689819b537e51ab9b965f8a433a':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 12 Oct 2012 14:32:31 +0000 (07:32 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ia0c83f8eaad8974240651bfa206f0212eb72983d

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 23:27:11 +0000 (16:27 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 796367ef: am a09aa3ea: Add -n and -S options for \'nohup\', offline traces
Glenn Kasten [Thu, 11 Oct 2012 15:41:43 +0000 (08:41 -0700)]
am 796367ef: am a09aa3ea: Add -n and -S options for \'nohup\', offline traces

* commit '796367ef31a7a1409f7ce5756f8142100d31053a':
  Add -n and -S options for 'nohup', offline traces

11 years agoam a09aa3ea: Add -n and -S options for \'nohup\', offline traces
Glenn Kasten [Thu, 11 Oct 2012 15:39:57 +0000 (08:39 -0700)]
am a09aa3ea: Add -n and -S options for \'nohup\', offline traces

* commit 'a09aa3eaad6ed5432ee13c764c67e67f7f43cac9':
  Add -n and -S options for 'nohup', offline traces

11 years agoam 461f556e: am b67683f6: Merge "make_ext4fs: add const qualifier to mountpoint"
Kenny Root [Wed, 10 Oct 2012 21:31:03 +0000 (14:31 -0700)]
am 461f556e: am b67683f6: Merge "make_ext4fs: add const qualifier to mountpoint"

* commit '461f556eb424eb25e692e60b571f4d32dfa4202c':
  make_ext4fs: add const qualifier to mountpoint

11 years agoam b67683f6: Merge "make_ext4fs: add const qualifier to mountpoint"
Kenny Root [Wed, 10 Oct 2012 21:28:35 +0000 (14:28 -0700)]
am b67683f6: Merge "make_ext4fs: add const qualifier to mountpoint"

* commit 'b67683f6c0c75536c991cac797b0c1dbcf9168e0':
  make_ext4fs: add const qualifier to mountpoint

11 years agoMerge "make_ext4fs: add const qualifier to mountpoint"
Kenny Root [Wed, 10 Oct 2012 19:21:20 +0000 (12:21 -0700)]
Merge "make_ext4fs: add const qualifier to mountpoint"

11 years agomake_ext4fs: add const qualifier to mountpoint
Kenny Root [Wed, 10 Oct 2012 18:16:05 +0000 (11:16 -0700)]
make_ext4fs: add const qualifier to mountpoint

Silence compiler warning and enforce some const correctness by adding
the const qualifier to the mountpoint argument in make_ext4fs_internal

Change-Id: I0ce3c04fc36423e43b89e8e8d24735858a55e537

11 years agoam 9acbd28e: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 9 Oct 2012 14:35:46 +0000 (07:35 -0700)]
am 9acbd28e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9acbd28e7c22df3f5f59974bf199f08622941248':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 9 Oct 2012 14:31:08 +0000 (07:31 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I598988c7b0ec650064de569c6120b27c724c478e

11 years agoAdd -n and -S options for 'nohup', offline traces
Glenn Kasten [Tue, 5 Jun 2012 23:42:22 +0000 (16:42 -0700)]
Add -n and -S options for 'nohup', offline traces

Change-Id: Ieef12b36b8519ff689ab5a81447b1b9bf4806171

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 23:05:40 +0000 (16:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 0c434b58: am 24505a58: atrace: make clock & bus bw tracing optional
Jamie Gennis [Sun, 7 Oct 2012 17:36:31 +0000 (10:36 -0700)]
am 0c434b58: am 24505a58: atrace: make clock & bus bw tracing optional

* commit '0c434b58efa2dbe21ce9b8d20e6bc0328147080b':
  atrace: make clock & bus bw tracing optional

11 years agoam 24505a58: atrace: make clock & bus bw tracing optional
Jamie Gennis [Sun, 7 Oct 2012 17:34:57 +0000 (10:34 -0700)]
am 24505a58: atrace: make clock & bus bw tracing optional

* commit '24505a5826d7c5cf89f3da85058befd671a73444':
  atrace: make clock & bus bw tracing optional

11 years agoatrace: make clock & bus bw tracing optional
Jamie Gennis [Fri, 5 Oct 2012 23:04:12 +0000 (16:04 -0700)]
atrace: make clock & bus bw tracing optional

This change makes enabling clock tracing and bus bandwidth tracing depend on
whether the device's kernel supports these features.  If it's not supported it
will be skipped.

Change-Id: I51d57299693635b0ecebb75de5dccd5b62d47be3

11 years agoam 3d646745: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 5 Oct 2012 15:20:58 +0000 (08:20 -0700)]
am 3d646745: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3d646745f76f1f39c295d0da9d17419c237ae186':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Fri, 5 Oct 2012 15:18:42 +0000 (08:18 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I6ad917dd332cd6677d124b08197e1686e66e0fca

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 5 Oct 2012 14:00:34 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam a1e1799a: am a404a7e9: atrace: add clock rate and bus utilization
Erik Gilling [Thu, 4 Oct 2012 23:16:41 +0000 (16:16 -0700)]
am a1e1799a: am a404a7e9: atrace: add clock rate and bus utilization

* commit 'a1e1799a082283f960dafa376ae83880b3b5bf2e':
  atrace: add clock rate and bus utilization

11 years agoam a404a7e9: atrace: add clock rate and bus utilization
Erik Gilling [Thu, 4 Oct 2012 23:15:26 +0000 (16:15 -0700)]
am a404a7e9: atrace: add clock rate and bus utilization

* commit 'a404a7e9bb05f4c1b0c9312d10a4c96c6cbdfcc9':
  atrace: add clock rate and bus utilization

11 years agoatrace: add clock rate and bus utilization
Erik Gilling [Fri, 21 Sep 2012 00:55:10 +0000 (17:55 -0700)]
atrace: add clock rate and bus utilization

Change-Id: I4e1764b51225436fc2b3d61454ee822f511a1a7d

11 years agoam a2b8a756: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 2 Oct 2012 16:24:50 +0000 (09:24 -0700)]
am a2b8a756: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a2b8a756dba78e9c6e86717da0610e2826587ead':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 2 Oct 2012 16:21:03 +0000 (09:21 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Iea091cf0ec873075e14c7a17ed185e9cbde68d1c

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 30 Sep 2012 14:00:30 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 7d910aab: am fa98203c: More Issue #7211769: Crash dialog from background user...
Dianne Hackborn [Fri, 28 Sep 2012 23:19:34 +0000 (16:19 -0700)]
am 7d910aab: am fa98203c: More Issue #7211769: Crash dialog from background user has non-working "report"

* commit '7d910aabe3de5d16e6aa94176753f7a6ed74e3dd':
  More Issue #7211769: Crash dialog from background user has non-working "report"

11 years agoam fa98203c: More Issue #7211769: Crash dialog from background user has non-working...
Dianne Hackborn [Fri, 28 Sep 2012 22:56:53 +0000 (15:56 -0700)]
am fa98203c: More Issue #7211769: Crash dialog from background user has non-working "report"

* commit 'fa98203c441d00d374349ce35c0c7ba2f38cc53a':
  More Issue #7211769: Crash dialog from background user has non-working "report"

11 years agoMore Issue #7211769: Crash dialog from background user has non-working "report"
Dianne Hackborn [Fri, 28 Sep 2012 22:40:29 +0000 (15:40 -0700)]
More Issue #7211769: Crash dialog from background user has non-working "report"

Bug report needs to be launched for the current user.

Change-Id: I2b8f812ede43fc36c76deab544bacf88dba8fefd

11 years agoam 4d48e3e0: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 20 Sep 2012 19:52:43 +0000 (12:52 -0700)]
am 4d48e3e0: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4d48e3e0543d99e53668a036d782a6fb42d2b6f6':
  Build bugreport paths for emulated storage.
  Always read bugreports from EXTERNAL_STORAGE.

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 20 Sep 2012 17:37:31 +0000 (10:37 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic61db28563308c2da38d7b2c2c12e0486914ea17

11 years agoBuild bugreport paths for emulated storage.
Jeff Sharkey [Wed, 12 Sep 2012 20:15:50 +0000 (13:15 -0700)]
Build bugreport paths for emulated storage.

Bug: 7152673
Change-Id: Iae7b298721d2b6690ce9b57245400702fb5d0c4c

11 years agoAlways read bugreports from EXTERNAL_STORAGE.
Jeff Sharkey [Wed, 12 Sep 2012 17:58:00 +0000 (10:58 -0700)]
Always read bugreports from EXTERNAL_STORAGE.

Bug: 7152673
Change-Id: Ibff4503ef21816bfe936eeba89183d1647c85043

11 years agoam e1e9c7d8: am b568de03: Build bugreport paths for emulated storage.
Jeff Sharkey [Thu, 13 Sep 2012 00:03:07 +0000 (17:03 -0700)]
am e1e9c7d8: am b568de03: Build bugreport paths for emulated storage.

* commit 'e1e9c7d87f1253f26e54383958319fd48f1fcc7e':
  Build bugreport paths for emulated storage.

11 years agoam bf640766: am cf4e11b4: Always read bugreports from EXTERNAL_STORAGE.
Jeff Sharkey [Thu, 13 Sep 2012 00:02:34 +0000 (17:02 -0700)]
am bf640766: am cf4e11b4: Always read bugreports from EXTERNAL_STORAGE.

* commit 'bf6407668ef95238a7a9cc7f3afcdd0e4b95c4a4':
  Always read bugreports from EXTERNAL_STORAGE.

11 years agoam b568de03: Build bugreport paths for emulated storage.
Jeff Sharkey [Wed, 12 Sep 2012 20:31:14 +0000 (13:31 -0700)]
am b568de03: Build bugreport paths for emulated storage.

* commit 'b568de03db20f124a458d914eed33cee4630bb81':
  Build bugreport paths for emulated storage.

11 years agoBuild bugreport paths for emulated storage.
Jeff Sharkey [Wed, 12 Sep 2012 20:15:50 +0000 (13:15 -0700)]
Build bugreport paths for emulated storage.

Bug: 7152673
Change-Id: Iae7b298721d2b6690ce9b57245400702fb5d0c4c

11 years agoam cf4e11b4: Always read bugreports from EXTERNAL_STORAGE.
Jeff Sharkey [Wed, 12 Sep 2012 18:01:28 +0000 (11:01 -0700)]
am cf4e11b4: Always read bugreports from EXTERNAL_STORAGE.

* commit 'cf4e11b4f8ba78de68a06b0ad463397d488df522':
  Always read bugreports from EXTERNAL_STORAGE.

11 years agoAlways read bugreports from EXTERNAL_STORAGE.
Jeff Sharkey [Wed, 12 Sep 2012 17:58:00 +0000 (10:58 -0700)]
Always read bugreports from EXTERNAL_STORAGE.

Bug: 7152673
Change-Id: Ibff4503ef21816bfe936eeba89183d1647c85043

11 years agoam 792d945e: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 6 Sep 2012 15:31:26 +0000 (08:31 -0700)]
am 792d945e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '792d945e0bf5d6e53e30bd3d2b6aded46cf1f85d':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 6 Sep 2012 14:55:21 +0000 (07:55 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ibb666e518d3d41ce85b3276a702a28d191cdba92

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 5 Sep 2012 13:34:51 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 526abb06: am 818b58c3: Guard against NPE in SendBug
Guang Zhu [Tue, 4 Sep 2012 21:12:44 +0000 (14:12 -0700)]
am 526abb06: am 818b58c3: Guard against NPE in SendBug

* commit '526abb0665aa6dbde9fc0689a88d90e01eba74cd':
  Guard against NPE in SendBug

11 years agoam 818b58c3: Guard against NPE in SendBug
Guang Zhu [Tue, 4 Sep 2012 21:10:52 +0000 (14:10 -0700)]
am 818b58c3: Guard against NPE in SendBug

* commit '818b58c3cc3d9f99d65bc9e4e7ff5b80021079ec':
  Guard against NPE in SendBug

11 years agoGuard against NPE in SendBug
Guang Zhu [Tue, 4 Sep 2012 20:49:46 +0000 (13:49 -0700)]
Guard against NPE in SendBug

Add some null checks in case that SendBug is invoked while system
server is in fact not running, e.g. during a runtime restart. So
that we don't hit NPE in SendBug, looking suspiciously like the
cause rather than a consequence of the real issue.

Bug: 7097125

Change-Id: I82676ab936fe19a781c32f949e6e429eb4045d63

11 years agoam 96310898: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Sat, 25 Aug 2012 14:21:35 +0000 (07:21 -0700)]
am 96310898: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '96310898348b409cc15de49baba8b7a31b9a8683':
  Don't use intent chooser

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Sat, 25 Aug 2012 14:18:16 +0000 (07:18 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic5f4d5010eedb666a8881982067b136cdc220fa7

11 years agoDon't use intent chooser
Guang Zhu [Thu, 23 Aug 2012 23:09:04 +0000 (16:09 -0700)]
Don't use intent chooser

Since it forces user to make selection, not offering an option to
remember the choice. Remove the new task flag, also adds an
explicit default category

Change-Id: I3834a8fa27782d14989e510c0756d36aaeeb2bab

11 years agoam 341dcc1e: am 46899d1b: Don\'t use intent chooser
Guang Zhu [Thu, 23 Aug 2012 23:14:31 +0000 (16:14 -0700)]
am 341dcc1e: am 46899d1b: Don\'t use intent chooser

* commit '341dcc1e011cb51bb0f8bf702d1164b9b0f6db3b':
  Don't use intent chooser

11 years agoam 46899d1b: Don\'t use intent chooser
Guang Zhu [Thu, 23 Aug 2012 23:13:05 +0000 (16:13 -0700)]
am 46899d1b: Don\'t use intent chooser

* commit '46899d1b5d606e9349a40079b60034e3cf6eaafb':
  Don't use intent chooser

11 years agoDon't use intent chooser
Guang Zhu [Thu, 23 Aug 2012 23:09:04 +0000 (16:09 -0700)]
Don't use intent chooser

Since it forces user to make selection, not offering an option to
remember the choice. Remove the new task flag, also adds an
explicit default category

Change-Id: I3834a8fa27782d14989e510c0756d36aaeeb2bab

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 23 Aug 2012 13:34:31 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 28b1432c: am 62716d52: Merge "Update emmc perf test tool" into jb-mr1-dev
Ken Sumrall [Wed, 22 Aug 2012 23:59:35 +0000 (16:59 -0700)]
am 28b1432c: am 62716d52: Merge "Update emmc perf test tool" into jb-mr1-dev

* commit '28b1432c0258e146c2aca9f2e4b02b2678348a6d':
  Update emmc perf test tool

11 years agoam 62716d52: Merge "Update emmc perf test tool" into jb-mr1-dev
Ken Sumrall [Wed, 22 Aug 2012 23:58:17 +0000 (16:58 -0700)]
am 62716d52: Merge "Update emmc perf test tool" into jb-mr1-dev

* commit '62716d5212c9f993a85654641b534f008e487bd9':
  Update emmc perf test tool

11 years agoMerge "Update emmc perf test tool" into jb-mr1-dev
Ken Sumrall [Wed, 22 Aug 2012 23:56:50 +0000 (16:56 -0700)]
Merge "Update emmc perf test tool" into jb-mr1-dev

11 years agoUpdate emmc perf test tool
Ken Sumrall [Wed, 22 Aug 2012 23:53:03 +0000 (16:53 -0700)]
Update emmc perf test tool

Drop caches before read tests.
Fix random read tests to read area big enough to prevent
the block cache from filling with the data being read.
Test with the read-ahead set to 4K, and at the default value.

Change-Id: Ifffa07fe4c89b6e103ce4fd71d0fa9881fed0dc7

11 years agoam c7314cea: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 22 Aug 2012 22:40:06 +0000 (15:40 -0700)]
am c7314cea: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c7314cea25a040536048bf19515c8fa9e22fee95':

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 22 Aug 2012 22:36:47 +0000 (15:36 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I1bfc1867c44e5793876b1bd237b134cc8357e25a

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 22 Aug 2012 13:34:37 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 7c488c1b: am c8698cb9: Explicitly use an intent chooser for sending bugreport
Guang Zhu [Wed, 22 Aug 2012 03:28:07 +0000 (20:28 -0700)]
am 7c488c1b: am c8698cb9: Explicitly use an intent chooser for sending bugreport

* commit '7c488c1b4e989f742f0525603c41bef9673aa239':
  Explicitly use an intent chooser for sending bugreport

11 years agoam c8698cb9: Explicitly use an intent chooser for sending bugreport
Guang Zhu [Wed, 22 Aug 2012 03:26:29 +0000 (20:26 -0700)]
am c8698cb9: Explicitly use an intent chooser for sending bugreport

* commit 'c8698cb92ef83e96b3c7776be9b47d174095bc15':
  Explicitly use an intent chooser for sending bugreport

11 years agoam fc756f82: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 21 Aug 2012 23:10:01 +0000 (16:10 -0700)]
am fc756f82: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'fc756f82d221fb04dc71c9d5e2e6ef8b75137a02':
  Revert "sendbug improvements on email address handling"

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 21 Aug 2012 23:07:43 +0000 (16:07 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I8313a3f0bfe67f7d4c044d95edd9dcdc5672a37a

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 20 Aug 2012 13:36:06 +0000 (06:36 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoExplicitly use an intent chooser for sending bugreport
Guang Zhu [Sat, 18 Aug 2012 01:14:55 +0000 (18:14 -0700)]
Explicitly use an intent chooser for sending bugreport

This enables:

1. an explicit title for intent chooser, so that the user is
   aware that chosen action is for sending out bugreport

2. the original intent has new task flag that causes
   ResolveActivity to finish() when stop()ped. This means that
   if intent is fired when screen is off (common scenario now
   because bugreport takes a long time), the chooser will not be
   shown

Bug: 6864596

Change-Id: I6cce2d1390c8ac24b15d26e9ba80a845222a1c18

11 years agoRevert "sendbug improvements on email address handling"
The Android Automerger [Fri, 17 Aug 2012 21:55:49 +0000 (14:55 -0700)]
Revert "sendbug improvements on email address handling"

This reverts commit 9ebc639a313d143ade1293cb5932b446d5e623d5.

11 years agoam a834b3b4: am 781c3404: am 7793c09e: Merge changes I4e94b8b9,Iae48d489
Joe Onorato [Fri, 17 Aug 2012 07:24:43 +0000 (00:24 -0700)]
am a834b3b4: am 781c3404: am 7793c09e: Merge changes I4e94b8b9,Iae48d489

* commit 'a834b3b41f12bf78d07509173a7d432bfdf83291':
  Support for multiple modules with the same name is going away.
  Support for multiple modules with the same name is going away.

11 years agoam 781c3404: am 7793c09e: Merge changes I4e94b8b9,Iae48d489
Joe Onorato [Fri, 17 Aug 2012 07:19:08 +0000 (00:19 -0700)]
am 781c3404: am 7793c09e: Merge changes I4e94b8b9,Iae48d489

* commit '781c3404311c081a4f41f15628851aeede0172d6':
  Support for multiple modules with the same name is going away.
  Support for multiple modules with the same name is going away.

11 years agoam 7793c09e: Merge changes I4e94b8b9,Iae48d489
Joe Onorato [Fri, 17 Aug 2012 07:16:44 +0000 (00:16 -0700)]
am 7793c09e: Merge changes I4e94b8b9,Iae48d489

* commit '7793c09ec42bf1a01a5f45f0e723f9a36fcfd9d7':
  Support for multiple modules with the same name is going away.
  Support for multiple modules with the same name is going away.

11 years agoMerge changes I4e94b8b9,Iae48d489
Joe Onorato [Fri, 17 Aug 2012 06:38:01 +0000 (23:38 -0700)]
Merge changes I4e94b8b9,Iae48d489

* changes:
  Support for multiple modules with the same name is going away.
  Support for multiple modules with the same name is going away.

11 years agoSupport for multiple modules with the same name is going away.
Joe Onorato [Tue, 24 Jul 2012 02:15:37 +0000 (19:15 -0700)]
Support for multiple modules with the same name is going away.

Change-Id: I4e94b8b9cc7c88e07e8a09abc26a3e7d495ac5be

11 years agoSupport for multiple modules with the same name is going away.
Joe Onorato [Sat, 21 Jul 2012 23:31:23 +0000 (16:31 -0700)]
Support for multiple modules with the same name is going away.

Change-Id: Iae48d4890aa7266ca7b57b3b9a8712d2d33d4909