Tom Cherry
4bf3dc9345
Merge "Create Service and ServiceManager classes"
2015-08-07 19:29:58 +00:00
Elliott Hughes
af60acef82
am 98714882: Merge "adb start-server: Use a separate fd for sending initial OK"
...
* commit '9871488223b5bd8f08f4a22920057297f942f94a':
adb start-server: Use a separate fd for sending initial OK
2015-08-07 19:11:32 +00:00
Elliott Hughes
c5cacda572
am 847ec9a8: Merge "More Mac fastboot failure debugging."
...
* commit '847ec9a88fdae3364b5124e505abc16fa4036d6a':
More Mac fastboot failure debugging.
2015-08-07 19:11:31 +00:00
Elliott Hughes
9871488223
Merge "adb start-server: Use a separate fd for sending initial OK"
2015-08-07 18:31:49 +00:00
Siva Velusamy
9f2d1a9cfc
adb start-server: Use a separate fd for sending initial OK
...
When "adb start-server" is issued, and a server needs to be launched,
adb client forks itself and the child process runs the server routine.
Once the server initializes its various components, it sends an "OK\n"
back to the client via its stderror (or stdout on Windows).
This sequence breaks down if before sending the "OK\n", the server
happens to log something on its stderr. In order to avoid this, the
client now expects the ack to come on a different fd rather than one
of the standard streams.
Bug: https://code.google.com/p/android/issues/detail?id=182150
Change-Id: I9d58a08068d71eb3b77e8a7377e934631c016466
2015-08-07 11:31:07 -07:00
Elliott Hughes
847ec9a88f
Merge "More Mac fastboot failure debugging."
2015-08-07 18:17:19 +00:00
Elliott Hughes
2ae8d2ebae
More Mac fastboot failure debugging.
...
Bug: http://b/22829602
Change-Id: I27738883eb545ed72eaae55fe3a077e6d1421302
2015-08-07 10:49:36 -07:00
Tom Cherry
bac3299720
Create Service and ServiceManager classes
...
Change-Id: I363a5e4751ad83d2f4096882a6fbbeddca03acfe
2015-08-07 10:16:39 -07:00
Elliott Hughes
c1b6378d96
am e1101677: Merge "adb: fix killing of old version of adb process"
...
* commit 'e1101677eabaaddc2a60c6456cce1fd5e38f5b4e':
adb: fix killing of old version of adb process
2015-08-07 03:10:57 +00:00
Elliott Hughes
e1101677ea
Merge "adb: fix killing of old version of adb process"
2015-08-07 03:04:30 +00:00
Elliott Hughes
c61955305e
am db3492cf: Merge "win32: adb_test/libbase_test fixes"
...
* commit 'db3492cf1703e15a1e92218fe00291932780656f':
win32: adb_test/libbase_test fixes
2015-08-07 01:43:34 +00:00
Elliott Hughes
db3492cf17
Merge "win32: adb_test/libbase_test fixes"
2015-08-07 01:36:03 +00:00
Spencer Low
cbf26b76c7
win32: adb_test/libbase_test fixes
...
- My recent change with -DUNICODE=1 required changing
GetProfilesDirectory() to GetProfilesDirectoryA() for the ANSI version
of the API.
- enh's edit to my previous change deleted a test that used
/proc/version, but I think another test was missed. Merge that test into
another.
Change-Id: Ic748549848e7be922bcbf218d5b0c3fca2a90704
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-08-06 18:09:32 -07:00
Andres Morales
dec7201e59
am fe1b4627: am 19f223f3: Merge "[gatekeeperd] Check parent profile for SID lookups" into mnc-dev
...
* commit 'fe1b462765d6db4b8b431704dda1b4b3882db61f':
[gatekeeperd] Check parent profile for SID lookups
2015-08-06 22:49:30 +00:00
Andres Morales
fe1b462765
am 19f223f3: Merge "[gatekeeperd] Check parent profile for SID lookups" into mnc-dev
...
* commit '19f223f3cfe43a4ded903a5d6a5f07bbadf115f5':
[gatekeeperd] Check parent profile for SID lookups
2015-08-06 22:30:53 +00:00
Andres Morales
19f223f3cf
Merge "[gatekeeperd] Check parent profile for SID lookups" into mnc-dev
2015-08-06 22:22:18 +00:00
Jeff Sharkey
94629bdec3
resolved conflicts for merge of 779a38a5
to mnc-dr-dev-plus-aosp
...
Change-Id: Ieaa0dcd8e93fba3060e9a85f17b1f5eabc6b8c9e
2015-08-06 14:22:46 -07:00
Jeff Sharkey
779a38a5cd
am b9f438ff: Protect runtime storage mount points.
...
* commit 'b9f438ff841f87c8ffbca85b13a533718a18e15f':
Protect runtime storage mount points.
2015-08-06 19:35:56 +00:00
Jeff Sharkey
b9f438ff84
Protect runtime storage mount points.
...
We have a bunch of magic that mounts the correct view of storage
access based on the runtime permissions of an app, but we forgot to
protect the real underlying data sources; oops.
This series of changes just bumps the directory heirarchy one level
to give us /mnt/runtime which we can mask off as 0700 to prevent
people from jumping to the exposed internals.
Also add CTS tests to verify that we're protecting access to
internal mount points like this.
Bug: 22964288
Change-Id: I32068e63a3362b37e8ebca1418f900bb8537b498
2015-08-06 11:45:31 -07:00
Elliott Hughes
ee00d9ccfe
am 2fbae482: am c672cb07: Merge "Include the error code if GetPipeProperties fails."
...
* commit '2fbae4829b07c97e82c24e6bf54e58f7de477fe6':
Include the error code if GetPipeProperties fails.
2015-08-06 18:09:32 +00:00
Elliott Hughes
2fbae4829b
am c672cb07: Merge "Include the error code if GetPipeProperties fails."
...
* commit 'c672cb07431c66e80a4e1b8845f25a7abb0bac9b':
Include the error code if GetPipeProperties fails.
2015-08-06 17:58:07 +00:00
Elliott Hughes
c672cb0743
Merge "Include the error code if GetPipeProperties fails."
2015-08-06 17:49:41 +00:00
Elliott Hughes
6e02c24cfc
Include the error code if GetPipeProperties fails.
...
Bug: http://b/22829602
Change-Id: I90a89e70518053a4581e1862a7dbd5d09e06dadc
2015-08-06 10:48:19 -07:00
Elliott Hughes
9f78b82661
am 802c6fd0: am ff52e23f: Merge "Stop being silly."
...
* commit '802c6fd0900863b576b9d2c1b0b482988f14dd33':
Stop being silly.
2015-08-06 17:35:28 +00:00
Elliott Hughes
802c6fd090
am ff52e23f: Merge "Stop being silly."
...
* commit 'ff52e23f0327ec1b68495e84f7e42e7c3a3d3f0e':
Stop being silly.
2015-08-06 17:29:49 +00:00
Elliott Hughes
ff52e23f03
Merge "Stop being silly."
2015-08-06 17:21:35 +00:00
Elliott Hughes
5be6b37c5d
Stop being silly.
...
Change-Id: I9c18205457396d625502a83e374c1207a3d90b0b
2015-08-06 08:46:32 -07:00
Yasuhiro Matsuda
39ac947939
am b84e1f54: am 50de8224: Merge "Enable perfboot.py to install APKs before measurement."
...
* commit 'b84e1f540379c6af9ccfc22e779b67f67b8c210a':
Enable perfboot.py to install APKs before measurement.
2015-08-06 12:40:27 +00:00
Yasuhiro Matsuda
fb35b7c463
am 9e2ed7b0: am 7f2e05e9: Merge "Fix incorrect exception handling in perfboot.py"
...
* commit '9e2ed7b080bbe0f01fb82d77b30f6d1df372490a':
Fix incorrect exception handling in perfboot.py
2015-08-06 12:40:26 +00:00
Yasuhiro Matsuda
b84e1f5403
am 50de8224: Merge "Enable perfboot.py to install APKs before measurement."
...
* commit '50de8224a6ec2e6e0de4197eb545c17ee4303dff':
Enable perfboot.py to install APKs before measurement.
2015-08-06 12:33:37 +00:00
Yasuhiro Matsuda
9e2ed7b080
am 7f2e05e9: Merge "Fix incorrect exception handling in perfboot.py"
...
* commit '7f2e05e9a3f44528d9fa624da9386b01ccaa54a6':
Fix incorrect exception handling in perfboot.py
2015-08-06 12:33:32 +00:00
Yasuhiro Matsuda
50de8224a6
Merge "Enable perfboot.py to install APKs before measurement."
2015-08-06 03:55:04 +00:00
Spencer Low
71635bb966
adb: fix killing of old version of adb process
...
The original code was:
if (strcmp(__adb_error, "unknown host service") != 0)
But that was changed by 078f0fcf4c
to:
if (*error == "unknown host service") {
I think the comparison should be != so that "unknown host service"
falls-through and kills the server, and so if it is some other error,
that the other error is returned immediately.
Change-Id: Ia490a4a870d1d123a3c5ab258dd5fa0930e8032d
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-08-05 19:26:50 -07:00
Yasuhiro Matsuda
c0822e83ad
Enable perfboot.py to install APKs before measurement.
...
This CL adds --apk-dir option, which specifies the directory
that contains APK files to be installed before measuring
boot time.
BUG: 22207911
Change-Id: Ifeacf34c779248686443a9ef02485272c140a456
2015-08-06 11:02:17 +09:00
Yasuhiro Matsuda
7f2e05e9a3
Merge "Fix incorrect exception handling in perfboot.py"
2015-08-06 01:48:34 +00:00
Andres Morales
1cf7d259e8
[gatekeeperd] Check parent profile for SID lookups
...
Bug: 22257554
Change-Id: I1a363729b449a2bc8594b48dada719fd79da7036
2015-08-05 10:32:13 -07:00
Yasuhiro Matsuda
f3d0d42f1a
Fix incorrect exception handling in perfboot.py
...
RuntimeError used to be missed unintentionally.
BUG: 22207911
Change-Id: I69772350c22fac93d49745c3bc934dda7188bb77
2015-08-05 20:26:03 +09:00
Yasuhiro Matsuda
75c09ba367
am ee640552: am 1ada513f: Merge "Fix perfboot.py to exit by Ctrl+C."
...
* commit 'ee6405527f11010e09a72c4eaf2c47bac170c49c':
Fix perfboot.py to exit by Ctrl+C.
2015-08-05 02:39:00 +00:00
Yasuhiro Matsuda
ee6405527f
am 1ada513f: Merge "Fix perfboot.py to exit by Ctrl+C."
...
* commit '1ada513f5042a13fff3fb64671d110defb6725fc':
Fix perfboot.py to exit by Ctrl+C.
2015-08-05 02:32:43 +00:00
Yasuhiro Matsuda
1ada513f50
Merge "Fix perfboot.py to exit by Ctrl+C."
2015-08-05 02:26:27 +00:00
Yusuke Sato
ba48c3f64a
am b57438c8: am e4154f46: Merge "perfboot.py: check 2 more event logs by default"
...
* commit 'b57438c848e377873aefd89f68afb7650a6043e9':
perfboot.py: check 2 more event logs by default
2015-08-04 21:05:59 +00:00
Yusuke Sato
b57438c848
am e4154f46: Merge "perfboot.py: check 2 more event logs by default"
...
* commit 'e4154f46d38f58bdc01a2bdb6923d0f7ba098426':
perfboot.py: check 2 more event logs by default
2015-08-04 20:55:20 +00:00
Yusuke Sato
e4154f46d3
Merge "perfboot.py: check 2 more event logs by default"
2015-08-04 20:42:58 +00:00
Yusuke Sato
43c4d998cf
perfboot.py: check 2 more event logs by default
...
'sf_stop_bootanim' is useful for tracking the time wasted by
showing the 'outro' part of the boot animation.
'wm_boot_animation_done' is also useful for tracking user
perceived boot time.
(cherry-pick of cbcf2778c3
)
Bug: 22207911
Change-Id: I3549338a2161fa29675993c239f57809270797f8
2015-08-04 12:06:36 -07:00
Yasuhiro Matsuda
59d32a7515
Fix perfboot.py to exit by Ctrl+C.
...
BUG: 22207911
Change-Id: I0cc41f834207efd2965483c8636bbc709e54358f
2015-08-04 17:48:41 +09:00
Daniel Rosenberg
0dbbb935f9
am e20a4194: am 516d30d5: Merge "rootdir: Create symlinks in Android.mk"
...
* commit 'e20a4194b8faacc542aee519a62a01954376be60':
rootdir: Create symlinks in Android.mk
2015-08-04 01:12:57 +00:00
Elliott Hughes
a761d047ac
am f7af90c9: am 3cf2a8e0: Merge "Fix a comment typo."
...
* commit 'f7af90c9df6e863c15b39da811f194435aa5da94':
Fix a comment typo.
2015-08-04 01:07:26 +00:00
Elliott Hughes
1a9da25a77
am 1da90f0c: am feacf20d: Merge "adb: win32: file descriptor reliability improvements"
...
* commit '1da90f0c14d315b10d8cc8cd2cfaacd794758ec3':
adb: win32: file descriptor reliability improvements
2015-08-04 01:07:25 +00:00
Daniel Rosenberg
5343154101
am 39087653: am 13d62278: Merge "Skip mounting /, just mark block device as ro if needed."
...
* commit '390876539ec12115268710762d86d8c4c5738c25':
Skip mounting /, just mark block device as ro if needed.
2015-08-04 01:07:23 +00:00
Daniel Rosenberg
e20a4194b8
am 516d30d5: Merge "rootdir: Create symlinks in Android.mk"
...
* commit '516d30d5029c101ef32b600d3143513d3ce16933':
rootdir: Create symlinks in Android.mk
2015-08-04 01:06:03 +00:00