Elliott Hughes
e68e3f458c
Merge "Move SendLargeFile into SyncConnection." am: ddf41f1ad0
am: 49f4f575f9
...
am: d88988970c
* commit 'd88988970c72434eda97319882436b40fe348a6b':
Move SendLargeFile into SyncConnection.
2015-11-21 01:55:27 +00:00
Elliott Hughes
d88988970c
Merge "Move SendLargeFile into SyncConnection." am: ddf41f1ad0
...
am: 49f4f575f9
* commit '49f4f575f9ba35264dd98f8b1b9d1c4d71f75f30':
Move SendLargeFile into SyncConnection.
2015-11-21 01:51:53 +00:00
Elliott Hughes
49f4f575f9
Merge "Move SendLargeFile into SyncConnection."
...
am: ddf41f1ad0
* commit 'ddf41f1ad0bc5fbe4a09fbcfde74492a51a705cf':
Move SendLargeFile into SyncConnection.
2015-11-21 01:48:14 +00:00
Elliott Hughes
ddf41f1ad0
Merge "Move SendLargeFile into SyncConnection."
2015-11-21 01:44:08 +00:00
Elliott Hughes
6aab58c499
Move SendLargeFile into SyncConnection.
...
Just a trivial refactor. Code change comes later.
Change-Id: If9e509a8c44649e5be4daaca57972939b037b8db
2015-11-20 17:35:17 -08:00
Chih-hung Hsieh
4f73f9e6a0
Merge "Add explicit cast to shut off clang warnings." am: 79cfba55e9
am: 7a2aa9d26d
...
am: 25f9b5c836
* commit '25f9b5c83629e99ca5314071b82e0fa16f40aa13':
Add explicit cast to shut off clang warnings.
2015-11-20 20:40:46 +00:00
Chih-hung Hsieh
25f9b5c836
Merge "Add explicit cast to shut off clang warnings." am: 79cfba55e9
...
am: 7a2aa9d26d
* commit '7a2aa9d26d2c0f7fb37e733137938285e36dda72':
Add explicit cast to shut off clang warnings.
2015-11-20 20:38:22 +00:00
Chih-hung Hsieh
7a2aa9d26d
Merge "Add explicit cast to shut off clang warnings."
...
am: 79cfba55e9
* commit '79cfba55e9d1ff72930f2c10dd5805864baf4276':
Add explicit cast to shut off clang warnings.
2015-11-20 20:35:13 +00:00
Chih-hung Hsieh
79cfba55e9
Merge "Add explicit cast to shut off clang warnings."
2015-11-20 20:30:10 +00:00
Elliott Hughes
159b455fcb
Merge "Avoid SIGPIPE in adb." am: 8c5511c692
am: 1146ae0205
...
am: bd9a852e10
* commit 'bd9a852e10c7af3f2eddd6c3b9401849b792a808':
Avoid SIGPIPE in adb.
2015-11-20 20:28:48 +00:00
Elliott Hughes
bd9a852e10
Merge "Avoid SIGPIPE in adb." am: 8c5511c692
...
am: 1146ae0205
* commit '1146ae0205f249ef6b380b362b524d8efbe2e961':
Avoid SIGPIPE in adb.
2015-11-20 20:26:23 +00:00
Elliott Hughes
1146ae0205
Merge "Avoid SIGPIPE in adb."
...
am: 8c5511c692
* commit '8c5511c692eaf3a9239be68dcc8650162933bd10':
Avoid SIGPIPE in adb.
2015-11-20 20:22:05 +00:00
Elliott Hughes
8c5511c692
Merge "Avoid SIGPIPE in adb."
2015-11-20 20:18:01 +00:00
Chih-Hung Hsieh
caa8810c64
Add explicit cast to shut off clang warnings.
...
* The literals are signed int type and got warnings about
.... cannot be narrowed to type int16_t [-Wc++11-narrowing]
Change-Id: I156d8e456c70840953aebb24739f94256248b810
2015-11-20 10:21:55 -08:00
Elliott Hughes
65433da1cb
Avoid SIGPIPE in adb.
...
We're now able to send packets faster than the device can handle them,
meaning that sometimes we're several packets through before the device
says "hey, wait, I can't write" and closes the connection. At best this
led to us reporting that we couldn't sync because "Connection reset";
at worst we'd get SIGPIPE because we were still streaming to a connection
that had already been closed.
This change renames adb_main adb_server_main, and moves the ignoring of
SIGPIPE into adb_commandline so it applies to both client and server (but
not adbd).
This change doesn't address the "wrong error message" part of the problem,
but at least it means you'll get *an* error message.
Bug: http://b/25230872
Change-Id: Ic60e4d13ed03fdcdf0d5cbc97201ebd1097c16ed
2015-11-20 09:42:23 -08:00
Sergio Giro
43f13d0d68
Merge "libutils: fix cache removal when callback invalidates the key" am: b0df9dca7c
am: e483305e47
...
am: a96cd36afb
* commit 'a96cd36afbff682e24365092dd85bbe9c9165afc':
libutils: fix cache removal when callback invalidates the key
2015-11-20 17:17:38 +00:00
Sergio Giro
a96cd36afb
Merge "libutils: fix cache removal when callback invalidates the key" am: b0df9dca7c
...
am: e483305e47
* commit 'e483305e4736787c5395d2d20b2be1d17d573ee7':
libutils: fix cache removal when callback invalidates the key
2015-11-20 17:15:02 +00:00
Sergio Giro
e483305e47
Merge "libutils: fix cache removal when callback invalidates the key"
...
am: b0df9dca7c
* commit 'b0df9dca7ca4d7ea2506f42e8b7ad720099401f6':
libutils: fix cache removal when callback invalidates the key
2015-11-20 17:12:41 +00:00
Sergio Giro
b0df9dca7c
Merge "libutils: fix cache removal when callback invalidates the key"
2015-11-20 17:09:10 +00:00
Sergio Giro
b7170fe3fe
libutils: fix cache removal when callback invalidates the key
...
Bug: 24785286
Change-Id: I9d17d2247258a56ef7776b3a701389e825a9c533
2015-11-20 14:54:51 +00:00
Mark Salyzyn
3e83beff9d
Merge "liblog: resolve deadlocks" am: 8f8a88cad3
am: 247e22090a
...
am: f8dc0c9907
* commit 'f8dc0c990708039271c69ec1a75e7f3275bca3f0':
liblog: resolve deadlocks
2015-11-19 22:58:14 +00:00
Mark Salyzyn
f8dc0c9907
Merge "liblog: resolve deadlocks" am: 8f8a88cad3
...
am: 247e22090a
* commit '247e22090ad2f31423c59f97f70420cbee21edf9':
liblog: resolve deadlocks
2015-11-19 22:51:53 +00:00
Mark Salyzyn
247e22090a
Merge "liblog: resolve deadlocks"
...
am: 8f8a88cad3
* commit '8f8a88cad334a630d6325672a7c6a32a0769a783':
liblog: resolve deadlocks
2015-11-19 22:45:38 +00:00
Mark Salyzyn
8f8a88cad3
Merge "liblog: resolve deadlocks"
2015-11-19 22:37:25 +00:00
Mark Salyzyn
2d2e0a5c5e
liblog: resolve deadlocks
...
Although ever present, an increased regression introduced with
commit b6bee33182
(liblog: logd:
support logd.timestamp = monotonic).
A signal handler can interrupt in locked context, if log is written
in the signal handler, we are in deadlock. To reduce the contention
and chances for this problem separate out timestamp lock from is
loggable lock to reduce contention situations. Provide a best-guess
response if lock would fail in timestamp path.
Use a common lock() inline within each module, with a comment speaking
to the issues surrounding calling a function that has a mutex within
a signal handler.
ToDo: Hold off signals temporarily in mainline, restart when unblock.
Can not use pthread_sigmask(SIG_BLOCK,,) as it breaks AtCmd.
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 25563384
Change-Id: I47e2c87c988c3e359eb9eef129c6a3a08e9eedef
2015-11-19 13:14:16 -08:00
Jeff Sharkey
6157f1c8fa
Merge "Create user_de directory for user 0."
2015-11-19 18:45:41 +00:00
Jeff Sharkey
af1e35e07b
Create user_de directory for user 0.
...
This mirrors what we do for "/data/data" for user 0. Eventually we
should move to vold/installd doing the user 0 initialization.
Bug: 22358539
Change-Id: I48cd27b990e6bd6e37870c41aef0e7dc3106caa4
2015-11-19 11:14:40 -07:00
Qiwen Zhao
7ac8cacdfe
Merge remote-tracking branch \'origin/mnc-dr2-dev\' into mnc-dr2-dev-plus-aosp
...
am: 09aa2f9b2c
* commit '09aa2f9b2c34339878dfd218d1c6e09644a108b0':
Fix build break with uninitialized boost_fd.
Improve cpuset support for surfaceflinger.
liblog: printable do not escape tabs
libutils: Add UNEXPECTED_NULL status_t
2015-11-19 16:30:32 +00:00
Qiwen Zhao
09aa2f9b2c
Merge remote-tracking branch 'origin/mnc-dr2-dev' into mnc-dr2-dev-plus-aosp
2015-11-19 08:25:35 -08:00
Mark Salyzyn
64b8f7dbed
liblog: logcat: Add year and zone to date on each line am: 39888aef13
-s ours
...
am: 77469ff33b
* commit '77469ff33b2937a3b660466d629a9b4ea4f354f3':
2015-11-19 15:59:05 +00:00
Mark Salyzyn
77469ff33b
liblog: logcat: Add year and zone to date on each line
...
am: 39888aef13
-s ours
* commit '39888aef136da3334dbdd86e18b92733c7795e81':
liblog: logcat: Add year and zone to date on each line
2015-11-19 15:55:37 +00:00
Mark Salyzyn
a26e7a9ea6
logd: switch asprintf to std::string am: 5c3835d943
-s ours
...
am: f45f44487c
* commit 'f45f44487c1393eef2f336dd2e2914caff9b1747':
2015-11-19 15:53:45 +00:00
Mark Salyzyn
f45f44487c
logd: switch asprintf to std::string
...
am: 5c3835d943
-s ours
* commit '5c3835d9431f9b1277a110a61375231181307094':
logd: switch asprintf to std::string
2015-11-19 15:50:37 +00:00
Mark Salyzyn
c0607f84c1
logd: white and black switch to std::string am: 8a7f778c01
-s ours
...
am: c2f73a220b
* commit 'c2f73a220b539f5c71c12f41a8559adbff1d2467':
2015-11-19 15:49:04 +00:00
Mark Salyzyn
7baba7c890
logd: statistics switch to std::string am: 2a2b0d1c6e
-s ours
...
am: b1d949a045
* commit 'b1d949a04521f861cfb3fedb8ae4d2ac445fdc0a':
2015-11-19 15:48:57 +00:00
Mark Salyzyn
c2f73a220b
logd: white and black switch to std::string
...
am: 8a7f778c01
-s ours
* commit '8a7f778c018fc67f6fdc7d9dca7f7ed53f7c7fdc':
logd: white and black switch to std::string
2015-11-19 15:29:53 +00:00
Mark Salyzyn
b1d949a045
logd: statistics switch to std::string
...
am: 2a2b0d1c6e
-s ours
* commit '2a2b0d1c6ed99cbd195c72fab666546320981e61':
logd: statistics switch to std::string
2015-11-19 15:25:24 +00:00
Andreas Gampe
855c7f573e
Logd: Handle unused variable and fields am: 244f32fa2d
...
am: 9a17511f6d
* commit '9a17511f6d14091d96a63dd8d1bba67fe996f8fb':
2015-11-19 05:49:17 +00:00
Daniel Rosenberg
7e75120c7d
rootdir: Allow board specific folders and symlinks in root directory am: ff1160b28f
-s ours
...
am: b391ebf5dd
* commit 'b391ebf5dde0a0e85edf40d3bb087ed4835eca6a':
2015-11-19 05:49:11 +00:00
Daniel Rosenberg
cfb0900e0c
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/system/core
2015-11-19 05:48:52 +00:00
Daniel Rosenberg
407bbd7b3c
Fix "adb remount" for when the root directory is in system.img am: a852aacb56
-s ours
...
am: 8ecf4114da
* commit '8ecf4114dad8def74266efe5ad9e7a8a1874bbd1':
2015-11-19 05:48:49 +00:00
Daniel Rosenberg
1f1d7eeb76
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/system/core
2015-11-19 05:48:47 +00:00
Daniel Rosenberg
c0f6e3097a
Fix "adb remount" for when the root directory is in system.img am: a852aacb56
-s ours
...
am: 8ecf4114da
* commit '8ecf4114dad8def74266efe5ad9e7a8a1874bbd1':
2015-11-19 05:48:44 +00:00
Tao Bao
2539f1ddca
Set mode bits for /system/etc/recovery.img. am: 096c4f2d8a
...
am: 98f6aa7ec4
* commit '98f6aa7ec4037499d1053779478a49f486f807cf':
2015-11-19 05:48:40 +00:00
Daniel Rosenberg
0cad2822d4
fs_mgr: Add support for A/B partitions am: fd2f0b4dc4
...
am: ebff8b97d5
* commit 'ebff8b97d56a0182db6177fce7754570db4b66b0':
2015-11-19 05:48:33 +00:00
Daniel Rosenberg
a6f79b9d84
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/system/core
2015-11-19 05:48:27 +00:00
Daniel Rosenberg
abeb924783
rootdir: Create symlinks in Android.mk am: 6a5a81a3d6
-s ours
...
am: d254d33ece
* commit 'd254d33ecea4caf82e38d40653efa0015f2291e3':
2015-11-19 05:48:25 +00:00
Daniel Rosenberg
75ad2212db
rootdir: Create symlinks in Android.mk am: 6a5a81a3d6
-s ours
...
am: d254d33ece
* commit 'd254d33ecea4caf82e38d40653efa0015f2291e3':
2015-11-19 05:48:22 +00:00
Daniel Rosenberg
28b3296fe0
Skip mounting /, just mark block device as ro if needed. am: c906751994
...
am: 7648c0910f
* commit '7648c0910f9063a9a38a698796312de3730e3983':
2015-11-19 05:47:16 +00:00
Daniel Rosenberg
2f80d898e2
Remove creation of root directory folders am: c97e1cb39d
...
am: 5c331c5be8
* commit '5c331c5be821fe5c900cee56a842a3a8b4a12315':
2015-11-19 05:47:09 +00:00