Commit graph

18535 commits

Author SHA1 Message Date
Elliott Hughes
992c0f4b5c Merge "Add -e to the adb shell documentation." am: 3c540aec24
am: eaf0ea050f

* commit 'eaf0ea050f125569f8b5e7dc0fd0eedc75e54a55':
  Add -e to the adb shell documentation.
2015-11-10 19:31:39 +00:00
Elliott Hughes
eaf0ea050f Merge "Add -e to the adb shell documentation."
am: 3c540aec24

* commit '3c540aec245f6c010ef2d5e82a22b871335dd1c6':
  Add -e to the adb shell documentation.
2015-11-10 19:28:21 +00:00
Elliott Hughes
3c540aec24 Merge "Add -e to the adb shell documentation." 2015-11-10 19:25:14 +00:00
Elliott Hughes
0e42c2a4ad Add -e to the adb shell documentation.
Change-Id: I7be5d198ef174e969bbb670e629369894c7b0994
2015-11-10 10:54:44 -08:00
Elliott Hughes
4e2131122c Merge "libpixelflinger: MIPS64r6 bug fix" am: d75b6b9257
am: 0942344af0

* commit '0942344af013ad3ab6a8e1cf27e53c8d854ac679':
  libpixelflinger: MIPS64r6 bug fix
2015-11-10 15:54:27 +00:00
Elliott Hughes
0942344af0 Merge "libpixelflinger: MIPS64r6 bug fix"
am: d75b6b9257

* commit 'd75b6b925748d3a241866a2662f2ec0e4db9101c':
  libpixelflinger: MIPS64r6 bug fix
2015-11-10 15:51:35 +00:00
Elliott Hughes
d75b6b9257 Merge "libpixelflinger: MIPS64r6 bug fix" 2015-11-10 15:48:46 +00:00
Ljubomir Papuga
4edb4584a6 libpixelflinger: MIPS64r6 bug fix
This commit fixes MIPS64r6 bootanimation crash.

Change-Id: If7ca817ee2beaf92bb8052602cc759bb4a609419
2015-11-10 14:24:11 +01:00
Josh Gao
155d62feb0 Merge "adb: don\'t try to pull character or block devices." am: 0bb1ce06ea
am: 85a4b33302

* commit '85a4b333020ecf7bf1b5d25cf741ac607ed3d905':
  adb: don't try to pull character or block devices.
2015-11-10 02:35:19 +00:00
Josh Gao
85a4b33302 Merge "adb: don\'t try to pull character or block devices."
am: 0bb1ce06ea

* commit '0bb1ce06ea46f14d5b6bc57db8c8d6c463b5b1de':
  adb: don't try to pull character or block devices.
2015-11-10 02:32:00 +00:00
Josh Gao
0bb1ce06ea Merge "adb: don't try to pull character or block devices." 2015-11-10 02:22:47 +00:00
Josh Gao
8d00a39eff adb: don't try to pull character or block devices.
Change-Id: I1a9e2c0097fe9c4017a9b338e812366c8e1154f0
2015-11-09 18:12:10 -08:00
Josh Gao
1a770d624d Merge "adb: demote skipping a file from an error to a warning." am: 5a08fd35c9
am: 234dbb840a

* commit '234dbb840a58d69d551535a3937c1e56f848b344':
  adb: demote skipping a file from an error to a warning.
2015-11-10 02:05:32 +00:00
Josh Gao
234dbb840a Merge "adb: demote skipping a file from an error to a warning."
am: 5a08fd35c9

* commit '5a08fd35c9ed77a354dfb4b71ba754dc148716ca':
  adb: demote skipping a file from an error to a warning.
2015-11-10 02:03:33 +00:00
Josh Gao
5a08fd35c9 Merge "adb: demote skipping a file from an error to a warning." 2015-11-10 02:02:41 +00:00
Josh Gao
21abf5a7c1 adb: demote skipping a file from an error to a warning.
Change-Id: If6c88e8855369bd7feb570ac5310fc7f44994083
2015-11-09 17:47:56 -08:00
Elliott Hughes
1098a6202b Merge "Fix adb shell escape handling." am: 79964cdf86
am: a55d6810b7

* commit 'a55d6810b7e2149ddf792f04ee16980b62e0fc2d':
  Fix adb shell escape handling.
2015-11-10 01:11:33 +00:00
Elliott Hughes
a55d6810b7 Merge "Fix adb shell escape handling."
am: 79964cdf86

* commit '79964cdf86ce18f5911873249aa5f505be59051f':
  Fix adb shell escape handling.
2015-11-10 01:08:48 +00:00
Elliott Hughes
79964cdf86 Merge "Fix adb shell escape handling." 2015-11-10 01:06:58 +00:00
Tom Cherry
ecea12ef6d Merge "Fix isValid() condition for libsync tests" am: 48f2e1ed31
am: b1b0965094

* commit 'b1b0965094cd9b5f23991ddd065eb5128a4dce67':
  Fix isValid() condition for libsync tests
2015-11-09 22:36:15 +00:00
Tom Cherry
b1b0965094 Merge "Fix isValid() condition for libsync tests"
am: 48f2e1ed31

* commit '48f2e1ed317f6a330b129c788bd19dac2a4df8ad':
  Fix isValid() condition for libsync tests
2015-11-09 22:31:44 +00:00
Tom Cherry
48f2e1ed31 Merge "Fix isValid() condition for libsync tests" 2015-11-09 22:27:56 +00:00
Elliott Hughes
28416d6d33 Fix adb shell escape handling.
Start of input is, by definition, the start of a line. Give the states
names to make the error clearer. We should also swallow the escape
character until/unless it's proven not to have been part of an escape
sequence. Finally, implement an ssh(1)-like -e option so the user can
choose -- or, more importantly, disable -- escape character handling.

Change-Id: I28a91db47e15f3e7de96303c0b9a98d302b9c92e
2015-11-09 13:57:47 -08:00
Nick Kralevich
7dafe5b818 Merge "Enable hidepid=2 on /proc" am: 2d8f1d4c47
am: ea8452cc72

* commit 'ea8452cc720cfcf2d8d1f469bbaafec968202e99':
  Enable hidepid=2 on /proc
2015-11-09 20:35:18 +00:00
Nick Kralevich
ea8452cc72 Merge "Enable hidepid=2 on /proc"
am: 2d8f1d4c47

* commit '2d8f1d4c478b9d921730d3fc9b290315e2ff9f04':
  Enable hidepid=2 on /proc
2015-11-09 20:29:44 +00:00
Nick Kralevich
2d8f1d4c47 Merge "Enable hidepid=2 on /proc" 2015-11-09 20:05:22 +00:00
Elliott Hughes
3396ad2c16 Merge "adb/base: minor compiler portability improvements" am: 892f0e9300
am: 8163cbc535

* commit '8163cbc535566e189aa704b21ce38d13b84efee2':
  adb/base: minor compiler portability improvements
2015-11-09 18:27:17 +00:00
Elliott Hughes
8163cbc535 Merge "adb/base: minor compiler portability improvements"
am: 892f0e9300

* commit '892f0e93007dc912f18a09fd281c73adf762277a':
  adb/base: minor compiler portability improvements
2015-11-09 18:25:22 +00:00
Elliott Hughes
892f0e9300 Merge "adb/base: minor compiler portability improvements" 2015-11-09 18:22:42 +00:00
Spencer Low
363af568b8 adb/base: minor compiler portability improvements
I've been using these changes to compile with Visual Studio.

- GetFileBasename(): __FILE__ uses \ with Visual Studio.

- adb_trace.cpp: Apparently VS needs an ampersand before the function name.

- "expr1 ? : expr2" is a GCC extension.

- <algorithm> contains std::min().

- seekdir can't always be #define'd because some headers have members
  named seekdir.

- adb_utils.cpp: Not really a compiler issue, just a random fix:
  0x7F/DEL is not printable.

Change-Id: I0dfb634f1ba4ccbc0d1b9f71b00e838fbebb3b41
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-09 10:22:13 -08:00
Rom Lemarchand
ca4c088214 Merge "init: skip "name" DT entry" am: 24e3b8d091
am: b95031f87a

* commit 'b95031f87a013d86188c63fe47908f35c7c34654':
  init: skip "name" DT entry
2015-11-09 17:41:09 +00:00
Rom Lemarchand
b95031f87a Merge "init: skip "name" DT entry"
am: 24e3b8d091

* commit '24e3b8d0912350e64b0268a627449cf7457039b8':
  init: skip "name" DT entry
2015-11-09 17:38:26 +00:00
Rom Lemarchand
24e3b8d091 Merge "init: skip "name" DT entry" 2015-11-09 17:35:09 +00:00
Nick Kralevich
c39ba5ae32 Enable hidepid=2 on /proc
Add the following mount options to the /proc filesystem:

  hidepid=2,gid=3009

This change blocks /proc access unless you're in group 3009
(aka AID_READPROC).

Please see
  https://github.com/torvalds/linux/blob/master/Documentation/filesystems/proc.txt
for documentation on the hidepid option.

hidepid=2 is preferred over hidepid=1 since it leaks less information
and doesn't generate SELinux ptrace denials when trying to access
/proc without being in the proper group.

Add AID_READPROC to processes which need to access /proc entries for
other UIDs.

Bug: 23310674
Change-Id: I22bb55ff7b80ff722945e224845215196f09dafa
2015-11-09 09:08:46 -08:00
Rom Lemarchand
1dcf325844 init: skip "name" DT entry
DTs have a standard "name" entry which is not to be
turned into an android property, so skip it.

Change-Id: I79f6638b4123358c8d80510c1666cf5d4561160e
2015-11-08 17:51:50 -08:00
Elliott Hughes
8f9c7c33c5 Merge "AOSP master doesn\'t have "cmd"." am: 54b5e85373
am: b31710e7d4

* commit 'b31710e7d4ad7c682f1a5d27f7c8eddff5868a44':
  AOSP master doesn't have "cmd".
2015-11-07 17:11:06 +00:00
Elliott Hughes
b31710e7d4 Merge "AOSP master doesn\'t have "cmd"."
am: 54b5e85373

* commit '54b5e85373619a838641d276a840caad284b09b3':
  AOSP master doesn't have "cmd".
2015-11-07 17:07:43 +00:00
Elliott Hughes
54b5e85373 Merge "AOSP master doesn't have "cmd"." 2015-11-07 17:05:12 +00:00
Elliott Hughes
39696f4ce8 Merge "use new cmd command" am: ae2a64e2ba
am: 143914ec2f

* commit '143914ec2ff2ad7306d3d7b16689524a4c63ad8b':
  use new cmd command
2015-11-07 02:09:39 +00:00
Elliott Hughes
143914ec2f Merge "use new cmd command"
am: ae2a64e2ba

* commit 'ae2a64e2baf015cf51da67133a33238588be5550':
  use new cmd command
2015-11-07 02:07:00 +00:00
Elliott Hughes
79e1c7a7f8 AOSP master doesn't have "cmd".
Change-Id: I0f524b779a623a9e2db923fd9003b102460ae46f
2015-11-06 18:05:16 -08:00
Elliott Hughes
ae2a64e2ba Merge "use new cmd command" 2015-11-07 02:03:31 +00:00
Todd Kennedy
6fa848adba use new cmd command
Instead of using the pm command, 'adb install' and 'adb uninstall' will now
use the cmd command. Additionally, the APK will be streamed directly to
package installer instead of creating a temporary file.

(cherry-pick of d039800a4e008b52c532f901e3bb34b40877cf30.)
Change-Id: Ie7529afa5b039d29cc8183f36085ff4e66b3457a
2015-11-06 18:00:05 -08:00
Josh Gao
a39ff9d81b Merge "adb: pull empty directories." am: 7fc45c3326
am: 92c436d38d

* commit '92c436d38dbf257d150280c9e3e4fda40a4cd46e':
  adb: pull empty directories.
2015-11-07 01:00:18 +00:00
Josh Gao
a83913d344 Merge "adb: remove superfluous checks." am: 8c2fb1f3de
am: 68fc89d92b

* commit '68fc89d92b315409a8ec01e90658b48fe3100786':
  adb: remove superfluous checks.
2015-11-07 01:00:03 +00:00
Josh Gao
92c436d38d Merge "adb: pull empty directories."
am: 7fc45c3326

* commit '7fc45c3326ba4ecaa49ec0713dce61b053c9b9e4':
  adb: pull empty directories.
2015-11-07 00:57:07 +00:00
Josh Gao
68fc89d92b Merge "adb: remove superfluous checks."
am: 8c2fb1f3de

* commit '8c2fb1f3de20ffd00b5704994536353d56cd5b6f':
  adb: remove superfluous checks.
2015-11-07 00:56:50 +00:00
Josh Gao
7fc45c3326 Merge "adb: pull empty directories." 2015-11-07 00:53:03 +00:00
Josh Gao
8c2fb1f3de Merge "adb: remove superfluous checks." 2015-11-07 00:52:12 +00:00
Josh Gao
a837df8590 adb: remove superfluous checks.
Change-Id: I4d9ceb301b0d242b0bad9a0faa8e2a1824f36cca
2015-11-06 15:19:53 -08:00