Commit graph

16050 commits

Author SHA1 Message Date
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
ddbbc6d2db am 75ecc74a: Merge "metrics: Add license information."
* commit '75ecc74a295f2230bdac32bcc4e39b0e47078be4':
  metrics: Add license information.
2015-07-29 16:26:41 +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
Jeff Sharkey
d57125af1a Merge "Give secondary users read-only physical cards." into mnc-dev 2015-07-29 01:19:43 +00: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
Elliott Hughes
ce2047a947 am 1a706865: Merge "Fix const-ness of strrchr callers."
* commit '1a706865307f4fbb2397cb3ca2eefad4ff6f83ea':
  Fix const-ness of strrchr callers.
2015-07-28 21:34:47 +00:00
Tao Bao
5c151c4a4b am beb13044: am 1cae8cc1: Merge "Set mode bits for /system/etc/recovery.img."
* commit 'beb1304469c916bedf625ab126d75b38a688c62f':
  Set mode bits for /system/etc/recovery.img.
2015-07-28 21:24:21 +00:00
Elliott Hughes
524551fd67 Merge "Document the current MAX_USBFS_BULK_SIZE situation." 2015-07-28 21:19:23 +00:00
Elliott Hughes
93f65faee8 Document the current MAX_USBFS_BULK_SIZE situation.
Bug: http://b/22688598
Change-Id: I8e5b92996d635f6b939f3add4dda0b9023629a8b
2015-07-28 14:18:50 -07:00
Elliott Hughes
1a70686530 Merge "Fix const-ness of strrchr callers." 2015-07-28 21:15:57 +00:00
Tao Bao
beb1304469 am 1cae8cc1: Merge "Set mode bits for /system/etc/recovery.img."
* commit '1cae8cc13a5524b4354c187c49bb831965825c20':
  Set mode bits for /system/etc/recovery.img.
2015-07-28 21:02:36 +00:00
Tao Bao
1cae8cc13a Merge "Set mode bits for /system/etc/recovery.img." 2015-07-28 20:47:00 +00:00
Jeffrey Vander Stoep
6beb774d5e am 26f0f657: Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev
* commit '26f0f657ec027430bde7d2237890ba59b3fd174a':
  init.rc: add healthd to system group to allow write to /dev/cpuset
2015-07-28 20:08:40 +00:00
Jeffrey Vander Stoep
26f0f657ec Merge "init.rc: add healthd to system group to allow write to /dev/cpuset" into mnc-dev 2015-07-28 19:54:40 +00:00
Jeff Vander Stoep
a30a8e02dd init.rc: add healthd to system group to allow write to /dev/cpuset
Also add to root group to avoid introducting new bugs.

Bug: 22699101
Change-Id: I9da31e0cc955efd711df3f4c6b17e39d74c01549
2015-07-28 12:27:36 -07:00
Mark Salyzyn
6e629e46a1 am f2e86153: am fac3bf35: Merge changes Id65ed2e8,Idbf8fae9
* commit 'f2e86153eda03144f14f75899a5743ec54e667f9':
  liblog: deprecate TARGET_USES_LOGD
  logd: deprecate TARGET_USES_LOGD
2015-07-28 18:31:40 +00:00
Mark Salyzyn
f2e86153ed am fac3bf35: Merge changes Id65ed2e8,Idbf8fae9
* commit 'fac3bf35af412292e1a955510095c4234dc0fd53':
  liblog: deprecate TARGET_USES_LOGD
  logd: deprecate TARGET_USES_LOGD
2015-07-28 18:08:55 +00:00
Mark Salyzyn
fac3bf35af Merge changes Id65ed2e8,Idbf8fae9
* changes:
  liblog: deprecate TARGET_USES_LOGD
  logd: deprecate TARGET_USES_LOGD
2015-07-28 17:48:25 +00:00
Bill Yi
49fc21c60e am 4c0ebdf2: am 15b8a778: Merge branch \'rewrite-metrics\' into merge-metrics
* commit '4c0ebdf2ed3ae5ea61887c5ef97efc363b85d3ad': (200 commits)
  metrics: Import protobufs from Chromium.
  metrics: replace "Logging.*" with "Platform.*"
  platform2: Fix issues with new version of libchrome
  init: fix typo and prevent startup error
  metrics: Add a check for abnormally small messages to prevent crashes
  libchromeos: Switch http Response to use streams
  Revert "metrics: Fix the import path of protobufs."
  metrics: Fix the import path of protobufs.
  platform2: Switch over to libchrome r323904
  metrics: add TPM.EarlyResetDuringCommand CrOS event.
  delete __STDC_{FORMAT,LIMIT}_MACROS
  metrics: make metrics library also use /var/lib/metrics/uma-events
  metrics: tell what file we can't open on error
  metrics: move sample file from /var/run to /var/lib
  metrics: don't upload metrics when metrics are disabled
  metrics: Disable uploader on non-official build.
  platform2: Switch over to using base64 functions from libchromeos
  metrics: fix -Winconsistent-missing-override warning
  metrics: Fix upload_service to work with base::MessageLoop
  metrics: generate app_version from standard lsb-release fields
  ...
2015-07-28 16:59:31 +00:00
Bill Yi
d981388e2b am db639251: am 5cab5290: Merge branch \'rewrite-crash-reporter\' into merge-crash-reporter
* commit 'db639251c9e2a5cba4d19655ffe8bfc9e63c2923': (225 commits)
  Remove superfluous legacy DBus includes
  crash: do not call list-proxies if it does not exist.
  crash: Point to canonical org.chromium.SessionManagerInterface.xml
  crash: update OWNERS file
  platform2: Explicitly use base:: namespace with CommandLine
  crash-reporter: add support for device coredump
  delete __STDC_{FORMAT,LIMIT}_MACROS
  crash: Convert list_proxies to chromeos-dbus-bindings generator
  crash: Fix session manager D-Bus call service name
  crash: Remove glib from crash_reporter
  crash: Shorten crash-reporter project alias.
  crash-reporter: Use chromeos::KeyValueStore.
  crash-reporter: Clean up testing code.
  crash-reporter: Add session_manager logs to Chrome crashes.
  crash-reporter: Attach Chrome logs to crash reports.
  crash-reporter: add a sanity check for kernel dmesg records
  Update libchrome to r307740 and fix build errors
  crash-reporter: disable device coredumps in verified mode
  crash-reporter: accept kernel dmesg records with no ramoops header
  crash-reporter: remove gflags dependency
  ...
2015-07-28 16:59:28 +00:00
Bill Yi
4c0ebdf2ed am 15b8a778: Merge branch \'rewrite-metrics\' into merge-metrics
* commit '15b8a778760707b33bffd97491ccc80854d994ce': (200 commits)
  metrics: Import protobufs from Chromium.
  metrics: replace "Logging.*" with "Platform.*"
  platform2: Fix issues with new version of libchrome
  init: fix typo and prevent startup error
  metrics: Add a check for abnormally small messages to prevent crashes
  libchromeos: Switch http Response to use streams
  Revert "metrics: Fix the import path of protobufs."
  metrics: Fix the import path of protobufs.
  platform2: Switch over to libchrome r323904
  metrics: add TPM.EarlyResetDuringCommand CrOS event.
  delete __STDC_{FORMAT,LIMIT}_MACROS
  metrics: make metrics library also use /var/lib/metrics/uma-events
  metrics: tell what file we can't open on error
  metrics: move sample file from /var/run to /var/lib
  metrics: don't upload metrics when metrics are disabled
  metrics: Disable uploader on non-official build.
  platform2: Switch over to using base64 functions from libchromeos
  metrics: fix -Winconsistent-missing-override warning
  metrics: Fix upload_service to work with base::MessageLoop
  metrics: generate app_version from standard lsb-release fields
  ...
2015-07-28 16:43:59 +00:00
Bill Yi
db639251c9 am 5cab5290: Merge branch \'rewrite-crash-reporter\' into merge-crash-reporter
* commit '5cab52906c1e7d7dd0adc0b03b8eb8994e5d3e9c': (225 commits)
  Remove superfluous legacy DBus includes
  crash: do not call list-proxies if it does not exist.
  crash: Point to canonical org.chromium.SessionManagerInterface.xml
  crash: update OWNERS file
  platform2: Explicitly use base:: namespace with CommandLine
  crash-reporter: add support for device coredump
  delete __STDC_{FORMAT,LIMIT}_MACROS
  crash: Convert list_proxies to chromeos-dbus-bindings generator
  crash: Fix session manager D-Bus call service name
  crash: Remove glib from crash_reporter
  crash: Shorten crash-reporter project alias.
  crash-reporter: Use chromeos::KeyValueStore.
  crash-reporter: Clean up testing code.
  crash-reporter: Add session_manager logs to Chrome crashes.
  crash-reporter: Attach Chrome logs to crash reports.
  crash-reporter: add a sanity check for kernel dmesg records
  Update libchrome to r307740 and fix build errors
  crash-reporter: disable device coredumps in verified mode
  crash-reporter: accept kernel dmesg records with no ramoops header
  crash-reporter: remove gflags dependency
  ...
2015-07-28 16:43:57 +00:00
Mark Salyzyn
514243d5bd liblog: deprecate TARGET_USES_LOGD
This is not the kernel logger you are loiking for

Bug: 22787659
Change-Id: Id65ed2e8e7ffe4b2be1bdeed65fa8db23bd66b51
2015-07-28 09:37:07 -07:00
Mark Salyzyn
cb41e3673b logd: deprecate TARGET_USES_LOGD
This is not the kernel logger you are looking for

Bug: 22787659
Change-Id: Idbf8fae908287ae9a96007b6353ec56d3c49f5bf
2015-07-28 09:37:07 -07:00
Bill Yi
15b8a77876 Merge branch 'rewrite-metrics' into merge-metrics
BUG:22773266
2015-07-28 09:35:42 -07:00
Bill Yi
5cab52906c Merge branch 'rewrite-crash-reporter' into merge-crash-reporter
BUG:22773266
2015-07-28 09:33:03 -07:00
Andreas Gampe
18f8bb5f19 am 1bc7ac07: am a5b6715c: Merge "Adf: Remove unused variable"
* commit '1bc7ac078e07fe0e469b12dac63f0c171e954e2e':
  Adf: Remove unused variable
2015-07-28 15:35:22 +00:00
Andreas Gampe
1bc7ac078e am a5b6715c: Merge "Adf: Remove unused variable"
* commit 'a5b6715c82f44a70b4e38441a76b5799bd9f8257':
  Adf: Remove unused variable
2015-07-28 15:21:22 +00:00
Andreas Gampe
a5b6715c82 Merge "Adf: Remove unused variable" 2015-07-28 15:08:21 +00:00
Elliott Hughes
3e7048c027 Fix const-ness of strrchr callers.
This causes build failures in google3 where they use GCC. glibc only
provides const-correct overloads for string functions for GCC >= 4.4,
but clang -- which is what we use -- pretends to be GCC 4.2.

Change-Id: I2a054823ea6201ebcea46d5e77b80a975eefc622
2015-07-28 08:07:21 -07:00
Elliott Hughes
c6c02ecd2a am 4cfbf781: am bb9fcb1e: Merge "Remove gpttool."
* commit '4cfbf781cb917f2a4c79e3b2e2acdb0776adc71d':
  Remove gpttool.
2015-07-28 15:01:25 +00:00
Elliott Hughes
4cfbf781cb am bb9fcb1e: Merge "Remove gpttool."
* commit 'bb9fcb1e257cda42d9138e34de835cab493bdc50':
  Remove gpttool.
2015-07-28 14:49:24 +00:00
Elliott Hughes
bb9fcb1e25 Merge "Remove gpttool." 2015-07-28 14:34:23 +00:00
Erik Kline
a7720ca1f9 am cc451785: Fix incorrectly sized buffer.
* commit 'cc451785fe4426566f6c4a6a5156d4fb40bcc22d':
  Fix incorrectly sized buffer.
2015-07-28 10:08:04 +00:00
Erik Kline
cc451785fe Fix incorrectly sized buffer.
Also: use a more correct size type.

Bug: 21562630
Bug: 21764392
Bug: 22464419
Change-Id: I9a9cf64f0481670828fac707e00196e222d0311e
2015-07-28 17:56:06 +09:00
Andreas Gampe
a9f0a80c52 Adf: Remove unused variable
For build-system CFLAGS clean-up.

Bug: 18632512
Change-Id: Iaacfc08aeaf1a3f27771a136f2c977e54971257b
2015-07-27 22:08:16 -07:00
Elliott Hughes
6454a0434a Remove gpttool.
We already have external/gptfdisk.

Change-Id: I6b7208b8393991f67f6d8b32ece53ecb5b33c5ff
2015-07-27 21:33:43 -07:00