Doug Zongker
884a2a65ae
am dcbf0a40: am cb0bb7c5: Merge "remove pixelflinger from healthd"
...
* commit 'dcbf0a40c965bd6264607f4515269477fe229363':
remove pixelflinger from healthd
2014-03-11 23:26:50 +00:00
Greg Hackmann
e8e0daaefa
am 28e41cce: Merge "libadfhwc: use %zu for logging size_t"
...
* commit '28e41cce803f0f9e45344a060444f8575a417409':
libadfhwc: use %zu for logging size_t
2014-03-11 23:19:03 +00:00
Doug Zongker
dcbf0a40c9
am cb0bb7c5: Merge "remove pixelflinger from healthd"
...
* commit 'cb0bb7c5f48d4441902282a1ceaf32c5defd10db':
remove pixelflinger from healthd
2014-03-11 23:19:02 +00: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
Doug Zongker
ee6ef15e67
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
2014-03-11 12:25:41 -07:00
JP Abgrall
0631bf3ddb
am 7e463719: am b4f1b3ca: am 44390474: Merge "adb: Don\'t unlink special files on sync failure."
...
* commit '7e463719c9fb559a164ace78743da6d439a6ed9f':
adb: Don't unlink special files on sync failure.
2014-03-08 05:46:42 +00:00
JP Abgrall
4700f296e6
am beea8a77: am 270ebefc: am b2c34ece: Merge "adb: Don\'t clobber block devices during push"
...
* commit 'beea8a77a1ee191346302315659b7914eefe0d8e':
adb: Don't clobber block devices during push
2014-03-08 05:46:42 +00:00
Mark Salyzyn
d9c798335c
am a4d7f8d4: am c1790a0b: am 0c3d19ff: Merge "libcutils: 64-bit compile issues"
...
* commit 'a4d7f8d4191cc4a74ef99596b19c084c93c58571':
libcutils: 64-bit compile issues
2014-03-08 05:46:41 +00:00
Alex Ray
5103ac8a52
am 27514f6d: am f2d09863: am 9f4d558e: Merge "ueventd: easier debug logging"
...
* commit '27514f6de9d2ad039a187e5584f296ec05a4ef18':
ueventd: easier debug logging
2014-03-08 05:46:40 +00:00
Alex Ray
665902ee5a
am db480f75: am 6a58c4f3: am 33e86e00: Merge "libcutils: add method to get klog level"
...
* commit 'db480f7516977123a0c5c6f6705b282d2e55ab89':
libcutils: add method to get klog level
2014-03-08 05:46:35 +00:00
JP Abgrall
7e463719c9
am b4f1b3ca: am 44390474: Merge "adb: Don\'t unlink special files on sync failure."
...
* commit 'b4f1b3ca6502041bd5350b211f894928790d214d':
adb: Don't unlink special files on sync failure.
2014-03-08 02:00:31 +00:00
JP Abgrall
beea8a77a1
am 270ebefc: am b2c34ece: Merge "adb: Don\'t clobber block devices during push"
...
* commit '270ebefc6c0c7937e8bef112a257b25509a1c2b7':
adb: Don't clobber block devices during push
2014-03-08 02:00:30 +00:00
Mark Salyzyn
a4d7f8d419
am c1790a0b: am 0c3d19ff: Merge "libcutils: 64-bit compile issues"
...
* commit 'c1790a0b99bd55ec1eb2201e60e8c2167a334c7c':
libcutils: 64-bit compile issues
2014-03-08 02:00:30 +00:00
Alex Ray
27514f6de9
am f2d09863: am 9f4d558e: Merge "ueventd: easier debug logging"
...
* commit 'f2d09863204fc04c7f030ce7adf51deb5de952ce':
ueventd: easier debug logging
2014-03-08 02:00:29 +00:00
Alex Ray
db480f7516
am 6a58c4f3: am 33e86e00: Merge "libcutils: add method to get klog level"
...
* commit '6a58c4f342fa104fbabcd195561b90966f227a76':
libcutils: add method to get klog level
2014-03-08 02:00:29 +00:00
JP Abgrall
b4f1b3ca65
am 44390474: Merge "adb: Don\'t unlink special files on sync failure."
...
* commit '443904746301e4d519e51075487ea4c8b9a860e3':
adb: Don't unlink special files on sync failure.
2014-03-08 01:56:37 +00:00
JP Abgrall
270ebefc6c
am b2c34ece: Merge "adb: Don\'t clobber block devices during push"
...
* commit 'b2c34ece647c212baa30c474394c498a2d6dd61f':
adb: Don't clobber block devices during push
2014-03-08 01:56:36 +00:00
Mark Salyzyn
c1790a0b99
am 0c3d19ff: Merge "libcutils: 64-bit compile issues"
...
* commit '0c3d19ff3db7b04081a7a729a81642c5903f741a':
libcutils: 64-bit compile issues
2014-03-08 01:56:13 +00:00
Alex Ray
f2d0986320
am 9f4d558e: Merge "ueventd: easier debug logging"
...
* commit '9f4d558e0c80602aa8707ec9d0bdd33a93aa4f16':
ueventd: easier debug logging
2014-03-08 01:56:12 +00:00
Alex Ray
6a58c4f342
am 33e86e00: Merge "libcutils: add method to get klog level"
...
* commit '33e86e004037765ef97a1d7f4017a7bdb6312bcf':
libcutils: add method to get klog level
2014-03-08 01:56:12 +00: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
Dianne Hackborn
733aebd398
Merge "Add ability to have a callback when wakeups happen."
2014-03-07 23:19:11 +00: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
Glenn Kasten
45b9581fc9
audio_is_valid_format is true for all PCM formats
...
Change-Id: I733f3208315816575f6d4f7722e906ab50b161af
2014-03-07 12:32:14 -08:00
JP Abgrall
8f672edfa4
am d4148e94: am ecac99b5: am 1367854a: Merge "adb: fix windows build after "forward --list" fix."
...
* commit 'd4148e94e97c6abe402e819f6164276575a91936':
adb: fix windows build after "forward --list" fix.
2014-03-07 19:00:41 +00:00
Dianne Hackborn
9552cdf434
Add ability to have a callback when wakeups happen.
...
Change-Id: I02ff0e035bf8a97bd1a3b6b1699181fc3a137d79
2014-03-07 11:00:39 -08:00
JP Abgrall
076a4bfd80
am 9d6abbda: am 9f573bb3: am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"
...
* commit '9d6abbdaccd520055fc47b6b3b36232cf23897fd':
Fix adb forward --list when forwarding a lot
2014-03-07 19:00:39 +00:00
Andy Hung
173f4995b0
Update audio_bytes_per_sample for PCM 24 bit packed
...
Change-Id: Ic79f604893f5c4f2e8e35189d6638b5b160435ed
Signed-off-by: Andy Hung <hunga@google.com>
2014-03-07 18:20:15 +00:00
JP Abgrall
d4148e94e9
am ecac99b5: am 1367854a: Merge "adb: fix windows build after "forward --list" fix."
...
* commit 'ecac99b54ce704f282ff6706f8cfada48f41b35c':
adb: fix windows build after "forward --list" fix.
2014-03-07 03:50:24 +00:00
JP Abgrall
ecac99b54c
am 1367854a: Merge "adb: fix windows build after "forward --list" fix."
...
* commit '1367854a891090d1be1edfb12515691b20b350cf':
adb: fix windows build after "forward --list" fix.
2014-03-07 03:47:03 +00: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
9d6abbdacc
am 9f573bb3: am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"
...
* commit '9f573bb362c3716c54df77d85a0285897daa242a':
Fix adb forward --list when forwarding a lot
2014-03-07 03:08:07 +00:00
JP Abgrall
9f573bb362
am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"
...
* commit '66e95d76c47a3a099931bbebe7f4a0af4d3f7fbb':
Fix adb forward --list when forwarding a lot
2014-03-07 03:04:44 +00:00
Mark Salyzyn
318900ad80
am d01c257f: am 8f632327: am bb0fbdbe: Merge "logd: liblog: 64-bit issues"
...
* commit 'd01c257f0f19a30178a6d5ec9d6d00d6b702fed3':
logd: liblog: 64-bit issues
2014-03-07 03:02:41 +00:00
Colin Cross
0f43cf0730
am e4980725: am 9690230a: am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"
...
* commit 'e4980725dc14c913978a3bdb30dd1844781bbd27':
Fix the build for NEON in libpixelflinger
2014-03-07 03:02:40 +00:00
JP Abgrall
66e95d76c4
Merge "Fix adb forward --list when forwarding a lot"
2014-03-07 02:59:03 +00:00
Mark Salyzyn
d01c257f0f
am 8f632327: am bb0fbdbe: Merge "logd: liblog: 64-bit issues"
...
* commit '8f63232712e318da88d2f543fe29066c26d39c32':
logd: liblog: 64-bit issues
2014-03-06 22:41:23 +00:00
Colin Cross
e4980725dc
am 9690230a: am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"
...
* commit '9690230a3c22977be24006d24ea35dd3efadc362':
Fix the build for NEON in libpixelflinger
2014-03-06 22:41:22 +00:00