Commit graph

16082 commits

Author SHA1 Message Date
Elliott Hughes
145afc2cc4 am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit 'fb1ecbc55e7edeafb138eb2a60ca89ba9a7b1f0f':
  Use __ANDROID__ instead of HAVE_ANDROID_OS.
2015-07-30 16:50:15 +00:00
Elliott Hughes
fb1ecbc55e am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit 'e6e71608bd60b4745b048ec466b5ea1301020b32':
  Use __ANDROID__ instead of HAVE_ANDROID_OS.
2015-07-30 16:42:50 +00:00
Elliott Hughes
e6e71608bd Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." 2015-07-30 16:34:47 +00:00
Elliott Hughes
9b828adfad Use __ANDROID__ instead of HAVE_ANDROID_OS.
Change-Id: I9967f3fd758c2a5b40be5b60ae72be7e2fb75136
2015-07-30 09:33:43 -07:00
Elliott Hughes
c6dbc85845 am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '42dbc4b1859fe4de16b19e9b74324b345c5fcb9d':
  Use _WIN32 rather than HAVE_WINSOCK.
2015-07-30 15:17:07 +00:00
Elliott Hughes
42dbc4b185 am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '44443bead6cf3c6e71029e7181f64ba82c6a8c8e':
  Use _WIN32 rather than HAVE_WINSOCK.
2015-07-30 15:03:27 +00:00
Elliott Hughes
44443bead6 Merge "Use _WIN32 rather than HAVE_WINSOCK." 2015-07-30 14:49:56 +00:00
Yasuhiro Matsuda
6b802c4b95 am 102ead3a: am b10e562b: Merge "Introduce a mechanism to trace boot sequence."
* commit '102ead3ae187a007b8a90b61ea243197927b6ae2':
  Introduce a mechanism to trace boot sequence.
2015-07-30 08:05:13 +00:00
Yasuhiro Matsuda
102ead3ae1 am b10e562b: Merge "Introduce a mechanism to trace boot sequence."
* commit 'b10e562b4cb5ffd6f02ab891d40644b581ad5d47':
  Introduce a mechanism to trace boot sequence.
2015-07-30 07:51:09 +00:00
Yasuhiro Matsuda
b10e562b4c Merge "Introduce a mechanism to trace boot sequence." 2015-07-30 07:42:09 +00:00
Yasuhiro Matsuda
eeea3fc1be am 1a1f9beb: am dcf89091: Merge "Add a script to record Android boot time."
* commit '1a1f9beb1dbd0da0f305ff44816661cc404ba877':
  Add a script to record Android boot time.
2015-07-30 05:47:39 +00:00
Yasuhiro Matsuda
1a1f9beb1d am dcf89091: Merge "Add a script to record Android boot time."
* commit 'dcf890914c7571d3068046b9df1f672e9f45b4d2':
  Add a script to record Android boot time.
2015-07-30 05:35:22 +00:00
Yasuhiro Matsuda
dcf890914c Merge "Add a script to record Android boot time." 2015-07-30 05:21:41 +00:00
Yasuhiro Matsuda
ab3798399d Add a script to record Android boot time.
perfboot.py repeats the record of each event log during Android
boot specified times. By default, interval between measurements
is adjusted in such a way that CPUs are cooled down sufficiently
to avoid boot time slowdown caused by CPU thermal throttling.
This script also works around the issue of dropbox slowing down
boot time on userdebug build (http://b/20890386) by limiting
the number of files to be created by dropbox.
The result is output in a tab-separated value format.

BUG: 22207911
Change-Id: I0ddbac5d1c941efda87bc6db6388d8194d4bb3dd
2015-07-30 14:16:15 +09:00
Elliott Hughes
841e96f4d1 am ae7e8d44: am 6fd4de76: Merge "Fix Win32 <ziparchive/zip_archive.h>."
* commit 'ae7e8d44b0d5e00e8487e6a53d7abf87fb2477dd':
  Fix Win32 <ziparchive/zip_archive.h>.
2015-07-30 03:44:35 +00:00
Elliott Hughes
ae7e8d44b0 am 6fd4de76: Merge "Fix Win32 <ziparchive/zip_archive.h>."
* commit '6fd4de76e05d98fa1fcbe07f579a715d61fbfbee':
  Fix Win32 <ziparchive/zip_archive.h>.
2015-07-30 03:32:31 +00:00
Elliott Hughes
6fd4de76e0 Merge "Fix Win32 <ziparchive/zip_archive.h>." 2015-07-30 03:19:10 +00:00
Elliott Hughes
bb50a393ff Fix Win32 <ziparchive/zip_archive.h>.
Contrary to the comment in AndroidConfig.h, mingw does have
__BEGIN_DECLS and __END_DECLS; you just have to #include <sys/cdefs.h>
first. Which is strictly true normally too, but you're going to
get it transitively with bionic or glibc.

Change-Id: I2f2de45f56a7217f91df322d8e896280997ae7a0
2015-07-29 19:58:57 -07:00
Elliott Hughes
2b72d68eb8 am e0541c7d: am a6597598: Merge "fix adb {forward,reverse} --no-rebind"
* commit 'e0541c7d7e329f83b23bfde4f515cefd39d65a66':
  fix adb {forward,reverse} --no-rebind
2015-07-30 01:06:27 +00:00
Elliott Hughes
e0541c7d7e am a6597598: Merge "fix adb {forward,reverse} --no-rebind"
* commit 'a6597598a0b82759960df09fd173192ca8c82f0c':
  fix adb {forward,reverse} --no-rebind
2015-07-30 00:51:26 +00:00
Elliott Hughes
adbf442a51 Use _WIN32 rather than HAVE_WINSOCK.
Change-Id: I9855b6fe72e2f2f3a8360c0993a67cb988024ee4
2015-07-29 17:45:24 -07:00
Elliott Hughes
a6597598a0 Merge "fix adb {forward,reverse} --no-rebind" 2015-07-30 00:38:05 +00:00
Spencer Low
a6b340af12 fix adb {forward,reverse} --no-rebind
adb forward --no-rebind (and the matching reverse command) seem to have
been broken by 424af02f36. I fixed-up the
string parsing and also fixed the error message not to include
strerror(errno) since that does not apply because it is an
application-level error that doesn't have anything to do with the
OS/libc.

Change-Id: Iba7286283bfcf1782076355edcd9c355c0a0edfd
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-07-29 17:21:21 -07:00
Elliott Hughes
92a3d2ba32 am 34c92f46: am fc2f1e61: Merge "Move libutils off AndroidConfig.h."
* commit '34c92f4652651697a7de7fa10c214afed9a6658a':
  Move libutils off AndroidConfig.h.
2015-07-30 00:15:35 +00:00
Elliott Hughes
34c92f4652 am fc2f1e61: Merge "Move libutils off AndroidConfig.h."
* commit 'fc2f1e61146627e387b8273981914dd5bc059317':
  Move libutils off AndroidConfig.h.
2015-07-29 22:11:42 +00:00
Elliott Hughes
fc2f1e6114 Merge "Move libutils off AndroidConfig.h." 2015-07-29 22:00:28 +00:00
Elliott Hughes
1f8bc86a7d Move libutils off AndroidConfig.h.
Change-Id: Ia0e4a4f968c640eb44317821d2dc6b195f9f490e
2015-07-29 14:31:54 -07:00
Bertrand Simonnet
4c041f55a3 am da65eee8: am 05b9edc2: Merge "crash_reporter: Add license information."
* commit 'da65eee80acdb4f501d213655e0be9005e638a05':
  crash_reporter: Add license information.
2015-07-29 17:45:49 +00:00
Bertrand Simonnet
6675db397e am ddbbc6d2: am 75ecc74a: Merge "metrics: Add license information."
* commit 'ddbbc6d2db4468ac136895c6f53532e3b3c389ff':
  metrics: Add license information.
2015-07-29 17:45:47 +00:00
Bertrand Simonnet
da65eee80a am 05b9edc2: Merge "crash_reporter: Add license information."
* commit '05b9edc207b481bb128b1b7357fe328826850930':
  crash_reporter: Add license information.
2015-07-29 16:26:43 +00:00
Bertrand Simonnet
ddbbc6d2db am 75ecc74a: Merge "metrics: Add license information."
* commit '75ecc74a295f2230bdac32bcc4e39b0e47078be4':
  metrics: Add license information.
2015-07-29 16:26:41 +00:00
Bertrand Simonnet
05b9edc207 Merge "crash_reporter: Add license information." 2015-07-29 16:03:02 +00:00
Bertrand Simonnet
75ecc74a29 Merge "metrics: Add license information." 2015-07-29 16:02:52 +00:00
Jeff Sharkey
e01761998b am d57125af: Merge "Give secondary users read-only physical cards." into mnc-dev
* commit 'd57125af1a81f34b162ecd5de81e6f1365aff588':
  Give secondary users read-only physical cards.
2015-07-29 04:04:33 +00:00
Yasuhiro Matsuda
f93db4b827 Introduce a mechanism to trace boot sequence.
This CL adds a trigger and a service so that Systrace can be used
for tracing events during boot.
persist.debug.atrace.boottrace property is used for switching on
and off tracing during boot. /data/misc/boottrace/categories
file is used for specifying the categories to be traced.
These property and file are rewritten by Systrace when the newly
added option --boot is specified.

Here is an example of tracing events of am and wm catetories
during boot.

$ external/chromium-trace/systrace am wm --boot

This command will cause the device to reboot. Once the device has
booted up, the trace report is created by hitting Ctrl+C.

As written in readme.txt, this mechanism relies on persistent
property, so tracing events that are emitted before that are not
recorded. This is enough for tracing events after zygote is
launched though.
This only works on userdebug or eng build for security reason.

BUG: 21739901
Change-Id: I03f2963d77a678f47eab5e3e29fc7e91bc9ca3a4
2015-07-29 12:53:05 +09:00
Jeff Sharkey
d57125af1a Merge "Give secondary users read-only physical cards." into mnc-dev 2015-07-29 01:19:43 +00:00
Bertrand SIMONNET
45f59d634d crash_reporter: Add license information.
The license file was taken from the original repository at:
https://chromium.googlesource.com/chromiumos/platform2/+/master/LICENSE

Change-Id: I05a8284346ceb326fb80c692e24653bc446cc33d
2015-07-28 17:31:05 -07:00
Bertrand SIMONNET
0296345ea7 metrics: Add license information.
The license was copied from the original repo at:
https://chromium.googlesource.com/chromiumos/platform2/+/master/LICENSE

Change-Id: I39c3479d62a107bd8d264faa72021cdeed25cea2
2015-07-28 17:30:08 -07:00
Dan Albert
dee79f85b6 am fa3622b2: am c0e8d0fc: Merge "Fix AndroidDevice.get_prop, add tests."
* commit 'fa3622b22481787202808101a772ac2270cf96cd':
  Fix AndroidDevice.get_prop, add tests.
2015-07-29 00:17:19 +00:00
Elliott Hughes
b6bfa337e5 am 07bed194: am 87998c07: Merge "Move sdcard off PAGESIZE and onto PAGE_SIZE."
* commit '07bed1941f902c1d65a410e49d33882e0da7b5ed':
  Move sdcard off PAGESIZE and onto PAGE_SIZE.
2015-07-29 00:17:17 +00:00
Dan Albert
fa3622b224 am c0e8d0fc: Merge "Fix AndroidDevice.get_prop, add tests."
* commit 'c0e8d0fc50dc635c6723497900cf3b0d2eb572dc':
  Fix AndroidDevice.get_prop, add tests.
2015-07-29 00:04:52 +00:00
Elliott Hughes
07bed1941f am 87998c07: Merge "Move sdcard off PAGESIZE and onto PAGE_SIZE."
* commit '87998c07a325d8cfa7517516edac7173dbea63bf':
  Move sdcard off PAGESIZE and onto PAGE_SIZE.
2015-07-29 00:04:50 +00:00
Dan Albert
c0e8d0fc50 Merge "Fix AndroidDevice.get_prop, add tests." 2015-07-28 23:46:10 +00:00
Elliott Hughes
87998c07a3 Merge "Move sdcard off PAGESIZE and onto PAGE_SIZE." 2015-07-28 23:44:09 +00:00
Dan Albert
e2b4a5fee0 Fix AndroidDevice.get_prop, add tests.
Had messed this up while refactoring before I submitted and neglected
to add a test. Thanks to mazda@ for catching this.

Also disabled the root/unroot tests for user builds.

Change-Id: Icb819a820a2afa227d548d678ae471d5195f0b96
2015-07-28 16:42:58 -07:00
Elliott Hughes
e24e9a5091 Move sdcard off PAGESIZE and onto PAGE_SIZE.
Only sdcard is using PAGESIZE, and glibc doesn't have it.

Bug: http://b/22735893
Change-Id: Ib8af14a2e99d98881a79f21ad1a695499c7d74bd
2015-07-28 16:36:47 -07:00
Elliott Hughes
edb90efc1c am 0adda0d5: am 524551fd: Merge "Document the current MAX_USBFS_BULK_SIZE situation."
* commit '0adda0d5f5e8b3a732860b70a320704b7564a825':
  Document the current MAX_USBFS_BULK_SIZE situation.
2015-07-28 21:54:24 +00:00
Elliott Hughes
24419f3c2e am ce2047a9: am 1a706865: Merge "Fix const-ness of strrchr callers."
* commit 'ce2047a947eaf3c02e39c22a7b461e8a0acd87f2':
  Fix const-ness of strrchr callers.
2015-07-28 21:54:23 +00:00
Jeff Sharkey
10a239b971 Give secondary users read-only physical cards.
Long ago, we mounted secondary physical cards as readable by all
users on the device, which enabled the use-case of loading media on
a card and viewing it from all users.

More recently, we started giving write access to these secondary
physical cards, but this created a one-directional channel for
communication across user boundaries; something that CDD disallows.

This change is designed to give us the best of both worlds: the
package-specific directories are writable for the user that mounted
the card, but access to those "Android" directories are blocked for
all other users.  Other users remain able to read content elsewhere
on the card.

Bug: 22787184
Change-Id: I4a04a1a857a65becf5fd37d775d927af022b40ca
2015-07-28 14:42:21 -07:00
Elliott Hughes
0adda0d5f5 am 524551fd: Merge "Document the current MAX_USBFS_BULK_SIZE situation."
* commit '524551fd67a581966b52c89a0712a5d3baaf7967':
  Document the current MAX_USBFS_BULK_SIZE situation.
2015-07-28 21:34:50 +00:00