Commit graph

7220 commits

Author SHA1 Message Date
Brian Carlstrom
a0915abd2f Merge "Fix build some more" 2014-03-15 21:19:28 +00:00
Christopher Tate
5a6b8d15ea Fix build some more
Missed one.

(cherry picked from commit f7f080ce62)

Change-Id: I33bf8bcc651330b9bc434da02c47c29bc0d54369
2014-03-15 14:16:26 -07:00
Brian Carlstrom
8e01210767 Merge "Fix the build" 2014-03-15 20:59:19 +00:00
Christopher Tate
dc507769b5 Fix the build
(cherry-picked from commit 296dc44637)

Change-Id: I924f4796fbb70a0f45cc23a852e26e634c5b0e0e
2014-03-15 13:57:34 -07:00
Mark Salyzyn
7ad096340f Merge "libziparchive: 64 bit compile issues" 2014-03-14 23:30:40 +00:00
Mark Salyzyn
99ef9914be libziparchive: 64 bit compile issues
- All within LOG messages.

Change-Id: I52e81b49e8127276359c62febd4cc1d8d69102d9
2014-03-14 14:47:15 -07:00
Mark Salyzyn
31fa960474 Merge "toolbox: ls: 64 bit compile warnings" 2014-03-14 20:52:59 +00:00
Mark Salyzyn
4727c7711e toolbox: ls: 64 bit compile warnings
Change-Id: Ia538c7177f8d5cf2c1f0efb5b575da6527c13968
2014-03-14 13:47:16 -07:00
David 'Digit' Turner
ee223d50a0 Merge "adb: Increase the max number of emulator instances to 64" 2014-03-14 20:27:47 +00:00
Mark Salyzyn
3b8de6705b Merge "liblog: Build Breakage in sdk(linux)" 2014-03-14 19:18:23 +00:00
Mark Salyzyn
c0626fdcaf liblog: Build Breakage in sdk(linux)
- Build Breakage in branch: aosp-idea133 @ 1072786

Change-Id: I36da253b69a66977ec568a5f96d38b970c25fe3e
2014-03-14 12:05:57 -07:00
Mark Salyzyn
fc204a966f Merge changes Ia9509ad0,I4e815d74,I10e8d92c
* changes:
  logcat: test White Black list
  logd: Find log time for arbitrary time to tail
  logd: liblog: logcat: Arbitrary time to tail
2014-03-14 17:49:42 +00:00
Mark Salyzyn
95cfc7b8e2 logcat: test White Black list
Change-Id: Ia9509ad09dd86e4d9169ed7d0b33911f1ca9eec6
2014-03-14 10:24:42 -07:00
Mark Salyzyn
a1c60cf80d logd: Find log time for arbitrary time to tail
- prototype to evaluate the increase in complexity or
  performance impact.

Change-Id: I4e815d74c023092fbb75055d260f75de57ad6522
2014-03-14 10:24:19 -07:00
Mark Salyzyn
fa3716b250 logd: liblog: logcat: Arbitrary time to tail
Change-Id: I10e8d92c933e31ee11e78d2d1114261a30c4be0e
2014-03-14 10:23:51 -07:00
Mark Salyzyn
6ab10a1c17 Merge "libdiskconfig: 64-bit issues" 2014-03-14 01:03:31 +00:00
Mark Salyzyn
1874e6557c libdiskconfig: 64-bit issues
Change-Id: Ie5e790c36395ec2f844294b91241a8f8ba3834b8
2014-03-13 17:46:53 -07:00
Mark Salyzyn
1a3798996b Merge "toolbox: schedtop 64 bit build issue" 2014-03-14 00:31:45 +00:00
Mark Salyzyn
161b55fc5d toolbox: schedtop 64 bit build issue
Change-Id: I77b8ca2c32b9ff33abb6acadae47f0ab47b47907
2014-03-13 17:14:15 -07:00
Mark Salyzyn
f3dcda5f85 Merge changes I1572338c,I39965007,I521753b1
* changes:
  logd: liblog: logcat: Add LogWhiteBlackList
  logd: prune by worst offending UID
  logd: liblog: logcat: Add Statistics
2014-03-13 21:56:29 +00:00
Mark Salyzyn
dfa7a07f5b logd: liblog: logcat: Add LogWhiteBlackList
- liblog android_logger_get_log_size and android_logger_get_readable_size
  adjusted to return long instead of int because of -G flag extending range

NB: ifdef'd only for userdebug and eng builds

- liblog Add android_logger_[sg]et_prune_list and android_logger_set_log_size
- logcat Add -P, -p and -G flags
- logd Add LogWhiteBlackList and configurable log size

(cherry picked from commit 18a5432158)

Change-Id: I1572338c1b34bd968ad7867857ef708156ec3b6a
2014-03-13 14:48:07 -07:00
Mark Salyzyn
64d6fe9362 logd: prune by worst offending UID
(cherry picked from commit 3c4919e474)

Change-Id: I39965007569123ff5eebe01b5bfa555bbcb2dfe7
2014-03-13 14:48:02 -07:00
Mark Salyzyn
34facab86b logd: liblog: logcat: Add Statistics
- logd add statistical collection and formatting
- liblog add android_logger_get_statistics call
- logcat add -S flag
- logcat add -b all

(cherry picked from commit 51a29c8dc4)

Change-Id: I521753b1969ecd4590c956aeeb1557d101059d67
2014-03-13 14:47:58 -07:00
David 'Digit' Turner
094fd86b14 adb: Increase the max number of emulator instances to 64
When the ADB server starts, it probes the localhost ports to find
existing emulator instances, starting from 5555 with increments of
2, and stopping after ADB_LOCAL_TRANSPORT_MAX tries, which was
set to 16.

This means that the ADB server could not detect on startup more
than 16 existing emulator instances.

This increases the limit to 64, to match a corresponding change
on the emulator side.

  See https://android-review.googlesource.com/#/c/83553/

Change-Id: I35c69f8017298c3e5797bd396b8d788d44eaa00f
2014-03-13 11:21:58 +01:00
Nick Kralevich
897d345b1f Merge "don't load property_contexts from /data" 2014-03-12 22:31:18 +00:00
Mark Salyzyn
939a5b09b8 Merge "logd: default user space logger" 2014-03-12 21:02:49 +00:00
Mark Salyzyn
99ff9469c5 logd: default user space logger
Change-Id: I16825c26f098241376d4014f3a8e93174387dbcf
2014-03-12 13:17:57 -07:00
Nick Kralevich
de151571a4 don't load property_contexts from /data
Bug: 12613118
Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13
(cherry picked from commit dc3a42bb11)
2014-03-11 21:27:27 -07:00
JP Abgrall
5fb1a34af4 Merge "Added transfer progress reporting for push and pull commands." 2014-03-12 02:53:37 +00:00
Mark Lindner
76f2a93b18 Added transfer progress reporting for push and pull commands.
Added a new '-p' switch to the 'push' and 'pull' commands that outputs
the file transfer progress (bytes transmitted, total bytes, and % done).
This provides useful feedback when transferring large files, and also
makes it possible for other tools to easily monitor the progress of a
forked push/pull command.

Change-Id: Iee6f42f5bd41292e5bc80fba779f526f0072e356
2014-03-11 19:31:26 -07:00
Greg Hackmann
28e41cce80 Merge "libadfhwc: use %zu for logging size_t" 2014-03-11 22:58:09 +00:00
Doug Zongker
cb0bb7c5f4 Merge "remove pixelflinger from healthd" 2014-03-11 21:55:56 +00:00
Doug Zongker
0280f278f6 remove pixelflinger from healthd
The minui library has changed to no longer use libpixelflinger.  It
also offers a more efficient way of storing and loading frames of
animation; use it to represent the battery-full state images.

Also removes the unused battery_charge.png image.

Bug: 12131110
Change-Id: I6cc8b19f36a806c99cda30cc47b5968daf6b333b

Conflicts:
	charger/charger.c
	charger/images/battery_0.png
	charger/images/battery_1.png
	charger/images/battery_2.png
	charger/images/battery_3.png
	charger/images/battery_4.png
	charger/images/battery_5.png
	charger/images/battery_charge.png
	healthd/Android.mk
2014-03-11 14:45:33 -07:00
Greg Hackmann
18b7127845 libadfhwc: use %zu for logging size_t
Change-Id: Ica75935a194509f9d85d8e577b81f9de03aaaea4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-11 14:42:53 -07:00
JP Abgrall
4439047463 Merge "adb: Don't unlink special files on sync failure." 2014-03-08 01:34:24 +00:00
JP Abgrall
b2c34ece64 Merge "adb: Don't clobber block devices during push" 2014-03-08 01:34:03 +00:00
JP Abgrall
55b6c843a6 adb: Don't unlink special files on sync failure.
adb push some_disk_image /dev/block/mmcblk0p9
should not unlink the dev just because adb was ctrl-c'd.

Change-Id: I1b6669e8dba1f80fc1438b8deb618180b7e9a1b2
Signed-off-by: JP Abgrall <jpa@google.com>
2014-03-07 17:31:25 -08:00
JP Abgrall
4ce2f838e7 adb: Don't clobber block devices during push
In the past, an adb push would ALWAYS unlink the target path.
Now, we only links and regular files (and links).
This allows the following to work:

   adb shell ls -l /dev/block/mmcblk0p8
     # brw------- root     root     179,   8 2013-11-28 07:43 mmcblk0p8
   adb push n7.jpa.mda.post_jb_encryption.raw  /dev/block/mmcblk0p8

Bug: 11984121
Change-Id: I982c7a1cd87986621f2bebdcb41c4e281f67f772
2014-03-07 17:29:39 -08:00
Mark Salyzyn
0c3d19ff3d Merge "libcutils: 64-bit compile issues" 2014-03-07 23:33:31 +00:00
Mark Salyzyn
0425b64e0b libcutils: 64-bit compile issues
- Use inttypes.h to print uint64_t values.

Change-Id: Ia10a3b67cadcce282563467a464ec07066cc2051
2014-03-07 15:28:43 -08:00
Alex Ray
9f4d558e0c Merge "ueventd: easier debug logging" 2014-03-07 22:08:12 +00:00
Alex Ray
33e86e0040 Merge "libcutils: add method to get klog level" 2014-03-07 22:07:04 +00:00
Alex Ray
18ccc1b8ee ueventd: easier debug logging
Move ueventd debug flag into the Android.mk.
Boost klog level if event logging enabled.

Change-Id: Iae48edbc43c487092c2424023576af29c76ff401
2014-03-07 13:58:02 -08:00
Alex Ray
157e1b645a libcutils: add method to get klog level
Change-Id: I55e8311bae97703be26e57b415a8ab0a6d9b4361
2014-03-07 13:58:02 -08:00
JP Abgrall
1367854a89 Merge "adb: fix windows build after "forward --list" fix." 2014-03-07 03:42:04 +00:00
JP Abgrall
5b0bb4898c adb: fix windows build after "forward --list" fix.
EWOULDBLOCK is not there on windows.
It gets translated by the adb_write() wrapper into EGAIN.
But the Linux one does not translate EWOULDBLOCK into EGAIN.
Without EWOULDBLOCK, it works just fine.

Change-Id: Ic293be392aa4364637428ea94ef87890ffa09b9b
Signed-off-by: JP Abgrall <jpa@google.com>
2014-03-06 19:40:45 -08:00
JP Abgrall
66e95d76c4 Merge "Fix adb forward --list when forwarding a lot" 2014-03-07 02:59:03 +00:00
Mark Salyzyn
bb0fbdbefd Merge "logd: liblog: 64-bit issues" 2014-03-06 18:59:35 +00:00
Colin Cross
0a8a56361e Merge "Fix the build for NEON in libpixelflinger" 2014-03-06 18:15:56 +00:00
Kévin PETIT
d82b2a3eb4 Fix the build for NEON in libpixelflinger
ARCH_ARM_HAVE_NEON is only ever defined to true, so test for that.
For the NEON function to be used, the file has to include
machine/cpu-features.h so that __ARM_HAVE_NEON is defined.

Change-Id: I0db196b39c493092415859e009531fcff6fc1e8b
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-03-06 15:53:27 +00:00