Commit graph

14010 commits

Author SHA1 Message Date
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
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
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
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
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
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
Tao Bao
c6e93fec84 Set mode bits for /system/etc/recovery.img.
/system/etc/recovery.img defaults to 0644. Change it to 0440.

Bug: 22641135
Change-Id: I45cdb0cc1b58f35fbcd0f16e7cc6c4eef63b0b74
(cherry picked from commit b602e6f9a3)
2015-07-27 19:17:15 -07:00
Lee Campbell
f75b5ff175 am fe39394e: Merge "init: Adding support to import directories"
* commit 'fe39394e0b82ba5be905a1867dd79734b690e06c':
  init: Adding support to import directories
2015-07-27 23:20:58 +00:00
Dan Albert
05432f07eb am 20cf8702: Merge "Create adb Python package."
* commit '20cf8702a37c2517cb1225babaa81747b8443376':
  Create adb Python package.
2015-07-27 23:13:19 +00:00
Lee Campbell
fe39394e0b Merge "init: Adding support to import directories" 2015-07-27 23:11:30 +00:00
Dan Albert
20cf8702a3 Merge "Create adb Python package." 2015-07-27 23:02:54 +00:00
Dan Albert
8e1fdd7806 Create adb Python package.
This is mostly just the AdbWrapper that we used in our tests, but I've
cleaned up the API to be a little more Pythonic (mostly in the sense
that commands are passed as lists rather than strings that are
shlex.split() by the shell command), and implemented the workaround
error checking for adb shell.

Move the tests up a directory. Having them buried a level down has
only been annoying.

There are now two files containing Python tests. test_device.py
contains tests specifically checking the AndroidDevice API, and
test_adb.py checks the ADB client program. To run both, use

    python -m unittest discover [-v]

Change-Id: Ibd158c528d31126a5b048bd00bc93039dbc468bc
2015-07-27 15:52:15 -07:00
Andreas Gampe
0c61a650ce am 2e132ef6: Merge "Logd: Handle unused variable and fields"
* commit '2e132ef6bd93154b7c04875ecf00cb12a19d77f6':
  Logd: Handle unused variable and fields
2015-07-27 22:43:54 +00:00
Andreas Gampe
2e132ef6bd Merge "Logd: Handle unused variable and fields" 2015-07-27 22:33:54 +00:00
Lee Campbell
f13b1b3139 init: Adding support to import directories
Support added so init scripts can now import directories.

BUG: 22721249
Change-Id: I02b566bfb50ea84469f1ea0c6ad205435a1df286
TEST: Tested importing a folder on arm64 emulator
2015-07-27 14:56:03 -07:00
Andreas Gampe
d75564f9b8 Logd: Handle unused variable and fields
For build-system CFLAGS clean-up.

Bug: 18632512
Change-Id: If81d6705b44e9a29f64c44c56ea633c031e831b7
2015-07-27 14:17:33 -07:00
Nick Kralevich
ba03cc953f am 5f3b05ad: Merge "init.rc: mkdir /data/anr 0775 system system"
* commit '5f3b05ad14db2a4ebc9eb25567bc951d465b3151':
  init.rc: mkdir /data/anr 0775 system system
2015-07-26 04:39:27 +00:00
Nick Kralevich
5f3b05ad14 Merge "init.rc: mkdir /data/anr 0775 system system" 2015-07-26 04:25:44 +00:00
Nick Kralevich
c2ea70ae6e init.rc: mkdir /data/anr 0775 system system
Ensure that /data/anr always exists. This allows us to eliminate
some code in system_server and dumpstate. In addition, this change
solves a common problem where people would create the directory
manually but fail to set the SELinux label, which would cause
subsequent failures when they used the directory for ANRs.

Bug: 22385254
Change-Id: I29eb3deb21a0504aed07570fee3c2f87e41f53a0
2015-07-25 21:06:20 -07:00
Elliott Hughes
12d912bc4f am ed217967: Merge "Fix socket_network_client_timeout error check."
* commit 'ed21796754c4879bedaa1a479ae288dda6dad478':
  Fix socket_network_client_timeout error check.
2015-07-25 02:13:39 +00:00
Elliott Hughes
038b76c23e am bb4370f8: Merge "Turn on warnings for libcutils, fix a bug."
* commit 'bb4370f833a661033184d258892906d63a347571':
  Turn on warnings for libcutils, fix a bug.
2015-07-25 02:01:34 +00:00
Yabin Cui
10821da322 am 8a502000: Merge "init: expand_props for onrestart commands."
* commit '8a502000d15cce102569d3609e24846ef19a4a77':
  init: expand_props for onrestart commands.
2015-07-25 02:01:32 +00:00
Elliott Hughes
ed21796754 Merge "Fix socket_network_client_timeout error check." 2015-07-25 01:58:57 +00:00
Elliott Hughes
bb4370f833 Merge "Turn on warnings for libcutils, fix a bug." 2015-07-25 01:56:24 +00:00
Elliott Hughes
eabe8af7e3 Fix socket_network_client_timeout error check.
Change-Id: Ia30ffc1a7815c63d247d9ba298c2fe9d7a780af2
2015-07-24 18:54:02 -07:00
Yabin Cui
8a502000d1 Merge "init: expand_props for onrestart commands." 2015-07-25 01:49:01 +00:00
Elliott Hughes
8fea1ede67 Turn on warnings for libcutils, fix a bug.
This doesn't actually spot the bug I'm about to fix, but maybe one day...

Change-Id: Ib8a2016ecd8a426f38960a05d439646255ea6cd8
2015-07-24 18:48:31 -07:00
Yabin Cui
ee53006564 init: expand_props for onrestart commands.
It is only a temporary fix. I hope the code can be moved into a member
function of class Command.

Bug: 22654233
Change-Id: I38c24fb624e54986a953f44d398b3b80c3795d24
2015-07-24 18:17:16 -07:00
Yabin Cui
bd5f10addf am 699be5f6: Merge "init: do expand_props before calling the builtins."
* commit '699be5f66950d0767cb6d9e1190ecd6932a4c7bb':
  init: do expand_props before calling the builtins.
2015-07-25 01:05:25 +00:00
Yabin Cui
699be5f669 Merge "init: do expand_props before calling the builtins." 2015-07-25 00:54:21 +00:00
Elliott Hughes
b8fa711fa9 am 3fe6de1c: Merge "Add a simple test for using non-ASCII paths with adb."
* commit '3fe6de1c39f532d4f462da8acbb3d2e84ee1a053':
  Add a simple test for using non-ASCII paths with adb.
2015-07-24 23:22:35 +00:00
Elliott Hughes
3fe6de1c39 Merge "Add a simple test for using non-ASCII paths with adb." 2015-07-24 23:07:56 +00:00
Elliott Hughes
614e0a47d3 Add a simple test for using non-ASCII paths with adb.
Bug: https://code.google.com/p/android/issues/detail?id=8185
Change-Id: If28a0ff345f44b60d6651bb36afb0bf72fe55e16
2015-07-24 15:26:46 -07:00
Yabin Cui
00ede7d262 init: do expand_props before calling the builtins.
Also switch expand_props to std::string.

Bug: 22654233

Change-Id: I62910d4f74e2b1a5bd2b14aea440767a2a8462b7
2015-07-24 15:02:19 -07:00
Elliott Hughes
7d86f5e527 am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."
* commit '239f6ac8e73e294eaf21ec70a9f2f7a3631ab964':
  Fix Win32 adb build (for the second time today).
2015-07-24 21:47:49 +00:00
Elliott Hughes
239f6ac8e7 Merge "Fix Win32 adb build (for the second time today)." 2015-07-24 21:34:17 +00:00
Elliott Hughes
4f1d7b55d7 Fix Win32 adb build (for the second time today).
Change-Id: I83cb407660cd8b5ed65a80574875fe261e8a8926
2015-07-24 14:32:46 -07:00
Elliott Hughes
f077e45cc4 am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp."
* commit '9dad4ec4408bf412c265ac9bb27c84bb5098e67c':
  Clean up the locking in usb_linux.cpp.
2015-07-24 20:37:12 +00:00
Elliott Hughes
9dad4ec440 Merge "Clean up the locking in usb_linux.cpp." 2015-07-24 20:21:53 +00:00
Elliott Hughes
812f030477 Clean up the locking in usb_linux.cpp.
tsan complained that usb_bulk_write accesses usb_handle members outside
a lock. Fix that, but by moving everything over to C++11 locking.

Note that the old code was checking whether pthread_cond_timedwait returned
a negative value, which it will never do --- it will signal timeout (or
any other error) by returning a positive errno value. The rewrite does
what they appeared to intend to do (break out on timeout), rather than
what they actually did (keep trying forever).

Bug: http://b/22598587
Change-Id: Iab6869ffed4874143a7da97193d6b09e34cf2933
2015-07-24 12:35:50 -07:00