Commit Graph

3616 Commits

Author SHA1 Message Date
Mike Lockwood 2f78d81a1f Merge "Merge commit '5383476727659544875b90d49a5371886a31c1fe'" 2012-03-21 17:11:18 -07:00
Mike Lockwood 2abac4c303 Merge "Merge commit '9dd2eef'" 2012-03-21 17:11:08 -07:00
Mike Lockwood 4aade437d0 Merge "Merge commit 'c4fd60b'" 2012-03-21 17:10:57 -07:00
Mike Lockwood 9865be95cf Merge commit '19155b5'
Do not start sshd by default

Change-Id: I22e6dbb6834321709e9b7c5ae49846d7f9f7c67a
2012-03-21 16:30:54 -07:00
Mike Lockwood ddd48d1c00 Merge commit '5383476727659544875b90d49a5371886a31c1fe'
empty -s ours merge

Change-Id: Ie70e28bcea06dffeebee3887145a30e89626cb62
2012-03-21 16:30:33 -07:00
Mike Lockwood a9bb7261b4 Merge commit '9dd2eef'
sshd to init.rc

Change-Id: I8eedc3b47f1260502034067d9006cac827cb1089
2012-03-21 16:28:04 -07:00
Mike Lockwood 0e5667c18d Merge commit 'c4fd60b'
empty -s ours merge

Change-Id: I148e9138d71a962e463c3252f888c2eccd2bdc4c
2012-03-21 16:27:40 -07:00
Geremy Condra 054de5cc5b Merge "init: make chmod/mkdir/chown not follow symlinks" 2012-03-21 16:03:13 -07:00
Geremy Condra 9ed1fe7732 init: make chmod/mkdir/chown not follow symlinks
This change brings init's do_chmod, mkdir, and do_chown into line
with open's O_NOFOLLOW semantics, causing them to fail when the
last element of their target path is a symlink.

Change-Id: If00e1a25cfe17ef6f738af4bf0541abd0c1b084b
2012-03-21 15:13:08 -07:00
Mike Lockwood 19155b5cd3 init.rc: Do not start sshd by default
Change-Id: Ieacd4e8fbfcd91ed2342b7a104a9b1f4114fc6d5
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-03-21 11:58:05 -07:00
The Android Open Source Project d1fe0d83fa am 17680510: am 7967e4c0: Reconcile with ics-mr1-release
* commit '176805101c10d44f21a65402c9926922b20e1de0':
2012-03-21 09:09:00 -07:00
The Android Open Source Project 176805101c am 7967e4c0: Reconcile with ics-mr1-release
* commit '7967e4c021b8790eaac08ab3fb035431ec118cae':
2012-03-21 09:06:31 -07:00
The Android Open Source Project 7967e4c021 Reconcile with ics-mr1-release
Change-Id: I543778af0009368aa57aba5e0861d981b4351e61
2012-03-21 09:01:27 -07:00
The Android Open Source Project eac5a25f5f am 049a7882: am 3ebb3dad: Reconcile with ics-mr1-release
* commit '049a78828418c9581b2926a41633dd1b441b2ee8':
2012-03-21 08:29:29 -07:00
The Android Open Source Project 049a788284 am 3ebb3dad: Reconcile with ics-mr1-release
* commit '3ebb3dad6e8da55b2057d064c2c0275f478b4f61':
2012-03-21 08:26:53 -07:00
The Android Open Source Project 3ebb3dad6e Reconcile with ics-mr1-release
Change-Id: I5e32c5ab33c5beeab7576a1984dc0add942c590b
2012-03-21 08:23:48 -07:00
Arve Hjønnevåg 1670f831a5 init.rc: Fix permissions on /sys/power/state and /sys/power/wakeup_count
Change-Id: I06a1a2affebdf64f008eaa61a0851f1e832059c5
2012-03-20 20:34:24 -07:00
Nick Kralevich 56c3065b79 logger: Add the update kernel struct to userspace
Android's kernel logger can optionally return UID information
in addition to the previously returned information. This
information is available by telling the kernel to use the
updated structure via the newly introduced LOGGER_SET_VERSION
ioctl.

int fd = open("/dev/log/main", O_RDONLY);
int version = 2;
ioctl(fd, LOGGER_SET_VERSION, &version);

Change-Id: I3914be41de55342c2918f8978fcd4d2b96a09288
2012-03-20 16:21:22 -07:00
Benoit Goby 3236b7a4d3 Merge "adb: Remove unused flags" 2012-03-20 16:11:42 -07:00
Kenny Root 77a62ceac5 MinGW does not have sys/cdefs.h
Change-Id: I5cafafce8488d355ed3865a9fd1173fbebbc5b03
2012-03-20 13:46:30 -07:00
Colin Cross e888674074 Merge "init: manually set controlling tty for console services" 2012-03-19 23:56:00 -07:00
Kenny Root 418fbe66e0 Merge "Add cdefs decoration to list.h" 2012-03-19 17:42:15 -07:00
Jeff Brown 5e0621f78a qsort_t was only defined in glibc 2.8
Change-Id: I646bac8ed4d94bf75a33b886e700c91c3837bc32
2012-03-19 15:39:08 -07:00
Jeff Brown 4a6b384f60 Provide portable wrapper for qsort_r.
qsort_r() is declared differently on BSD and GNU libc and
may be absent on other platforms.

Provide qsort_r_compat() which should work everywhere.

Change-Id: I17a9026573b1ed971ff7d79895e7eb41ba108807
2012-03-19 14:07:26 -07:00
Jeff Brown 14d0c6c7c0 Add missing includes.
Caused warnings about implicitly defined malloc() and sprintf().

Change-Id: Ia56309adc11caf5801ffd88e374c512b785cfd93
2012-03-19 14:06:50 -07:00
Dima Zavin c4edb9ec90 Merge "cutils: str_parms: when deleting entry, need to also remove key" 2012-03-19 09:56:14 -07:00
Glenn Kasten b1108c8594 Merge "audio_channel_in/out_mask_from_count" 2012-03-19 07:31:50 -07:00
Colin Cross 50fb5a6933 init: manually set controlling tty for console services
Normally, calling open on a tty will set that tty as the process
group controlling tty if none already exists.  However, if the tty
is /dev/console, the kernel will never automatically set it as the
controlling tty.  Call the TIOCSCTTY manually on the fd, which will
always attempt to set it as the controlling tty.

Fixes ctrl-c on the console shell when androidboot.console is not
passed on the kernel command line and the default /dev/console is
used.

Change-Id: I449cc41b47e93ac38ad6987413bb54131e1ec0cd
2012-03-18 15:39:59 -07:00
Benoit Goby f366b3698b adb: Don't synchronize with transport using sleep
Services that cause adbd to reboot are currently implemented this way:
    write(fd, response)
    close(fd)
    sleep(1)
    exit(1)
sleep(1) is necessary to leave time for the transport to transmit
the response before the daemon exits. This is slow and unreliable.
Instead, add a flag to the asocket to make it exit the daemon only
after the socket is closed.

Change-Id: I9df45ea6221f0d9b828703b9b2316a5d4fe59352
2012-03-16 15:30:05 -07:00
Benoit Goby 7941cf87f6 Revert "Reimplement the "adb root" command to more closely match its previous behavior"
This reverts commit 535164e9d9.
2012-03-16 15:30:05 -07:00
Benoit Goby 9f1af8cde9 adb: Remove unused flags
BUILD_ADBD is always true

ANDROID_GADGET is not used in the code anymore. adbd now checks at
runtime if /dev/android_adb is present

Change-Id: If6c3278606c79cc74d1ef5978e7b8e3a4513aef8
2012-03-16 15:29:34 -07:00
Kenny Root 0009b73ed8 Add cdefs decoration to list.h
In case someone includes this from C++ code.

Change-Id: I3b5a8bde5b5b9e8dcee64abaf33383f21eff7046
2012-03-15 21:45:07 -07:00
Glenn Kasten 0ad682cdde Merge "Add get_sched_policy_name() and use in ps and top" 2012-03-15 15:45:19 -07:00
Glenn Kasten 86c7cc8189 Add get_sched_policy_name() and use in ps and top
This will make it easier to add additional policies (cgroups) if needed.
Also added comments to the sched_policy APIs.

Change-Id: I33ce1cc4deae10983241f7391294b7a512d2c47c
2012-03-15 15:10:45 -07:00
Wei Zhong dca76e6187 add IP checking for adb over TCP
whitelist connection for
1) emulator
2) "eng" or "tests" build, or
3) IP matches with "persist.service.adb.client_ip"

Change-Id: I8ac149149873f3bd206bd4d5abc063e5274fb468
Signed-off-by: Wei Zhong <wzhong@google.com>
2012-03-15 14:40:11 -07:00
Dima Zavin c4c631a15f Merge "cutils: str_parms: free the key if the value was replaced during create/add" 2012-03-15 13:24:17 -07:00
Jean-Michel Trivi 427d2b43c2 Fix switch indentation in audio_bytes_per_sample
Align "case" keyword with "switch" keyword.

Change-Id: I57ef96253fb1fc925315b557ea27ccc35f63c2f8
2012-03-15 10:18:42 -07:00
Wu-cheng Li 019524a60e Merge "Add camera ping command and release message." 2012-03-14 23:42:21 -07:00
Dima Zavin efd7501d53 cutils: str_parms: when deleting entry, need to also remove key
When removing one entry, we can't just remove it from the map since
key will not be freed. So, instead, search through the map for the key
and free it once it is found.

Change-Id: Id745c166a4acc5ea25f6d6cdbfe4f8fbc21cbbb3
Reported-by: Xin Qian <xqian@marvell.com>
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-14 23:17:11 -07:00
Dima Zavin 86bfbe3cae cutils: str_parms: free the key if the value was replaced during create/add
Change-Id: I9f31da62f10f78ed11693a7c04e2be29b0790c93
Reported-by: Xin Qian <xqian@marvell.com>
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-14 23:17:11 -07:00
Glenn Kasten 89f7ba3df8 audio_channel_in/out_mask_from_count
Change-Id: I879d188cf64ea1dbfa1a0574dee77119c2b08e26
2012-03-14 17:06:13 -07:00
Nick Kralevich 820571f4c3 Merge "init.rc: Add documentation" 2012-03-14 16:23:57 -07:00
Nick Kralevich f3ef1271f2 init.rc: Add documentation
Android developers should never place files in /data/local/tmp.
Files or directories in /data/local/tmp can be minipulated by the
shell user.

Android developers should never create world-writable files
or directories. This is a common source of security vulnerabilities.

Change-Id: I6d2cd620ab49d8ca3f39282f7d2ed682a9ba91c3
2012-03-14 15:36:47 -07:00
Wu-cheng Li 2923c0ba52 Add camera ping command and release message.
The problem is both face unlock and camera application try to open
the hardware camera at the same time. A new camera open API is
added to let face unlock take the camera away from the existing
client. The release message is used to notify the existing client,
so it has time to release the hardware camera and clean up.

If existing client tries to use the camera after it is released,
the method will return error. It is still possible that the
camera has been taken and the existing client has not got the
notification. When any method returns error, the existing client
can use ping command to check whether the camera has been released.
If yes, the client can silently finish the app itself or show a
toast if it wants.

bug:5584464

Change-Id: I87f9f7db2f7b2b70ab2405f9b3da0d8946d6a01b
2012-03-14 10:35:53 +08:00
Andrew Hsieh 9d4dbf4835 Merge "Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a" 2012-03-13 16:28:08 -07:00
Kenny Root ad5b9c7205 Put keystore into the drmrpc group
The keystore service needs to access hardware crypto devices to
fulfill its function on devices with hardware crypto. This role
was assigned to the (now misnamed) drmrpc group.

Change-Id: Ia32f9e96b4372f0974984451680f9a0f6157aa01
2012-03-13 15:51:04 -07:00
Dianne Hackborn 1a87808b30 Merge "Forget name for AID_SDCARD_R." 2012-03-12 15:22:44 -07:00
Dima Zavin eccfb08f38 Revert "cutils: str_parms: make test executable build for host instead"
This reverts commit 7d31e6e533.
2012-03-12 15:06:05 -07:00
Dima Zavin cf7d2849cb Merge "cutils: str_parms: make test executable build for host instead" 2012-03-12 13:47:42 -07:00
Dima Zavin 21750e7941 Merge "cutils: str_parms: test str_parms_add_str too" 2012-03-12 13:47:34 -07:00