summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Trigger a policy reload from post-fs-data.Stephen Smalley2013-08-261-0/+3
| | | | | | | | Once userdata is available and decrypted, trigger a policy reload to pick up any policy update files stored under /data/security. Change-Id: Ic2b3121c3395429b108c40d1d7f5a3124a5896c5 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* Merge "Add support for socket security context specification."Colin Cross2013-08-247-14/+24
|\
| * Add support for socket security context specification.Stephen Smalley2013-08-237-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an optional argument to the socket option for specifying a SELinux security context for the socket. Normally the socket security context is automatically computed from the service security context or set using the seclabel option, but this facility allows dealing with two scenarios that cannot be addressed using the existing mechanisms: 1) Use of logwrapper to wrap a service. In this case, init cannot determine the service security context as it does not directly execute it and we do not want logwrapper to run in the same domain as the service. 2) Situations where a service has multiple sockets and we want to label them distinctly. Change-Id: I7ae9088c326a2140e56a8044bfb21a91505aea11 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Merge "Handle policy reloads within ueventd rather than restarting it."Colin Cross2013-08-232-4/+11
|\ \
| * | Handle policy reloads within ueventd rather than restarting it.Stephen Smalley2013-07-262-4/+11
| |/ | | | | | | | | | | | | | | | | | | | | Restarting ueventd upon policy reloads has reportedly created stability problems for some users and could cause events to be lost. Stop restarting ueventd and instead handle policy reloads within ueventd. Also stops restarting installd upon policy reloads. Change-Id: Ic7f310d69a7c420e48fbc974000cf4a5b9ab4a3b Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Merge "Add USB Vendor ID for WACOM"Elliott Hughes2013-08-161-1/+3
|\ \
| * | Add USB Vendor ID for WACOMWing Tseng2013-08-151-1/+3
|/ / | | | | | | | | Change-Id: I3deee6d5bdfb9c5bbc0fddcfa39814d27ee281c2 Signed-off-by: Wing Tseng <Wing_Tseng@pegatroncorp.com>
* | Merge "Add USB Vendor ID for MSI"Elliott Hughes2013-08-121-0/+3
|\ \ | |/ |/|
| * Add USB Vendor ID for MSIastonehuang2013-08-011-0/+3
|/ | | | Change-Id: I4f4bfb6ef08058bf749917119a2b08952e7bc337
* Merge "Add USB Vendor ID for ECS"Elliott Hughes2013-07-251-0/+3
|\
| * Add USB Vendor ID for ECSecsgms2013-07-241-0/+3
| | | | | | | | Change-Id: Ib2fa70204d37f53dc642091eb927d865ddc585b5
* | am 5954ecb8: Merge "Allow more characters in partition name links"Colin Cross2013-07-222-3/+18
|\ \ | |/ | | | | | | * commit '5954ecb87b8c77425d8cc766c0cc798957a07a7d': Allow more characters in partition name links
| * Merge "Allow more characters in partition name links"Colin Cross2013-07-222-3/+18
| |\
| | * Allow more characters in partition name linksJohan Redestig2013-07-182-3/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | We have several partitions with underscores in their names which would not be properly linked in: /dev/block/platform/msm_sdcc.1/by-name/ With this change more characters (_-.) are allowed in partition name links. Also, any other character is replaced with '_' so the resulting link names have the same length as the partition name. Change-Id: I746566c03db98b10326c755692362d2c10e528ae
* | am f265426f: am 596ee9ea: Merge "Improve the crasher stack-overflow command."Elliott Hughes2013-07-161-2/+4
|\ \ | | | | | | | | | | | | * commit 'f265426f020162b9e8c20fb051f613de3640254b': Improve the crasher stack-overflow command.
| * \ am 596ee9ea: Merge "Improve the crasher stack-overflow command."Elliott Hughes2013-07-161-2/+4
| |\ \ | | |/ | | | | | | | | | * commit '596ee9ea8ae37b17fbdff91508f55250d528f1d2': Improve the crasher stack-overflow command.
| | * Merge "Improve the crasher stack-overflow command."Elliott Hughes2013-07-161-2/+4
| | |\
| | | * Improve the crasher stack-overflow command.Elliott Hughes2013-07-151-2/+4
| | |/ | | | | | | | | | | | | | | | Runs a lot quicker, with no intermediate noise. Change-Id: Icd911ff305da2e0889029dc78d5c2b39f32111c5
* | | init.rc: remove "on fs" sectionNick Kralevich2013-07-121-8/+0
| | | | | | | | | | | | | | | | | | | | | This was only ever used by the emulator. Now the emulator uses an fstab file. Change-Id: I1a071e567e1f1a379f9c8079cc2dc17660d8455f
* | | am 2713be91: am fb1c9cf6: Merge "use ext4 instead of yaffs"Nick Kralevich2013-07-121-4/+4
|\ \ \ | |/ / | | | | | | | | | * commit '2713be91a84078e8b0b9b755ce17881b750e85a7': use ext4 instead of yaffs
| * | am fb1c9cf6: Merge "use ext4 instead of yaffs"Nick Kralevich2013-07-121-4/+4
| |\ \ | | |/ | | | | | | | | | * commit 'fb1c9cf6fa4efafb3e0c6b0bc93c7f087d926a48': use ext4 instead of yaffs
| | * Merge "use ext4 instead of yaffs"Nick Kralevich2013-07-121-4/+4
| | |\
| | | * use ext4 instead of yaffsNick Kralevich2013-07-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to allow the emulator to use ext4 images. Bug: https://code.google.com/p/android/issues/detail?id=38561 Change-Id: I02fde6382ad67cf7f4f3b695396841f70bb9301d
* | | | am a9396549: Fix my incorrect merge resolution for ↵Elliott Hughes2013-07-111-10/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder. * commit 'a9396549b37d13c518c662c04f6ff42e9ae47c24': Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.
| * | | Fix my incorrect merge resolution for ↵Elliott Hughes2013-07-111-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder. Change-Id: I3f8bc955f035b49407540053462e53b3f262d381
* | | | am 7b9c33b1: Fix my incorrect merge resolution for ↵Elliott Hughes2013-07-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 132b7d750e6f3e835676dfc5edbb94978f9370f8. * commit '7b9c33b1e0e47f72d0af35d8a948900697da5871': Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.
| * | | Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.Elliott Hughes2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The conflict was the actual intended change. Change-Id: Icc9493e4b24b7b53a18e2c7406ef24a81e4d4a7b
* | | | am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-masterElliott Hughes2013-07-111-0/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '786b1232d201d46f59bd9da84bfcfcb9ad80bb6c': fs_mgr_priv: Extend fs wait timeout to 20 seconds
| * | | resolved conflicts for merge of 42031e0e to stage-aosp-masterElliott Hughes2013-07-111-0/+10
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I3e6337c258b3e7fb6eee4ed8e3664a69ae219fd6
| | * | Merge "fs_mgr_priv: Extend fs wait timeout to 20 seconds"Ken Sumrall2013-07-101-1/+1
| | |\ \ | | | |/ | | |/|
| | | * fs_mgr_priv: Extend fs wait timeout to 20 secondsAndrew Boie2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In practice 5 seconds is too short to wait for a disk device node to show up if the disk is USB; 20 seconds is a much more comfortable window. Change-Id: Iaf2c1f46b41a44fc1240d52d8498ca9cb639ea80 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | am 149a9b68: am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, ↵Colin Cross2013-07-030-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | as Android emulator ignores it by default." * commit '149a9b68ab09e4934556e9247ee5f98008a65662': Added net.dns1 prop for emulator, as Android emulator ignores it by default.
| * | | am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android ↵Colin Cross2013-07-030-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | emulator ignores it by default." * commit 'fafcabd0dd4432de3c7f5956edec23f6ed241b56': Added net.dns1 prop for emulator, as Android emulator ignores it by default.
| | * | Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by ↵Colin Cross2013-07-031-0/+1
| | |\ \ | | | | | | | | | | | | | | | default."
| | | * | Added net.dns1 prop for emulator, as Android emulator ignores it by default.Ron Munitz2013-05-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit sets up the system property which is actually used by the Connectivity Service (frameworks/base/services/java/com/android/server/ConnectivityService.java). It fixes an (obsolete?) convention where the dns was affected directly by the interface (i.e. "net.eth0.dns1=10.0.2.3"), which causes the Android Emulator (goldfish) to ignore this value, and effectively have no DNS resolving at all. An immediate fix can be either add reference to net.eth%s.dns%s in the ConnectivityService and possibly on the dhcp code as well which would be bloated, or just stick to the apparant new convention. I chose the latter as a one line fix which gets the job done. Change-Id: Id4364129e9a82c1f48403068a837aca54de07944
* | | | | am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-masterColin Cross2013-06-241-28/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * commit 'b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a': init: move initial property area allocation into bionic property_service: make /dev/__properties__ readable
| * | | | resolved conflicts for merge of b6c60285 to stage-aosp-masterColin Cross2013-06-241-28/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: I5afba55b668065499fa28369cf217d4f5eafab4a
| | * | | Merge changes Ieb94caab,I762da21eColin Cross2013-06-251-30/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: init: move initial property area allocation into bionic property_service: make /dev/__properties__ readable
| | | * | | init: move initial property area allocation into bionicGreg Hackmann2013-06-191-28/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic's __system_property_add() now expands the property area as needed by mapping in more pages. Rather than duplicate the mapping code, move it inside bionic and have bionic's __system_property_area_init() set up the first page. Signed-off-by: Greg Hackmann <ghackmann@google.com> (cherry picked from commit f14eef0c3c456bfe39f7e9d57c8f7ae4ec775972) Change-Id: Ieb94caab1527c71f2155efe3795490b0ea215a29
| | | * | | property_service: make /dev/__properties__ readableNick Kralevich2013-06-191-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, system properties are passed via the environment variable ANDROID_PROPERTY_WORKSPACE and a file descriptor passed from parent to child. This is insecure for setuid executables, as the environment variable can be changed by the caller. Make the /dev/__properties__ file accessible, so an app can get properties directly from the file, rather than relying on environment variables. Preserve the environment variable for compatibility with pre-existing apps. Bug: 8045561 (cherry picked from commit 7ece0a862cf97e85bbe69458a32a2bd165456874) Change-Id: I762da21ef4075f288745efed0ec7d16c2b71303c
* | | | | | am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '39021a48a0e0687c654423acd5a4c99a1d79440d': init: Retain traditional restart behavior for critical and oneshot services. init: Safely restart services to avoid race conditions.
| * | | | | am 83ada447: Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '83ada447aed69dfcd0a88e952eced8db1e4d6584': init: Retain traditional restart behavior for critical and oneshot services. init: Safely restart services to avoid race conditions.
| | * | | | Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * changes: init: Retain traditional restart behavior for critical and oneshot services. init: Safely restart services to avoid race conditions.
| | | * | | init: Retain traditional restart behavior for critical and oneshot services.Mike Kasick2012-03-224-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an SVC_RESTART state that's used for an explicit "restart" of a running service. This retains the traditional restart behavior for critical and oneshot services (previously altered by 7e36edd8), whereby these services are "simply restarted" instead of counting as a crash (for a critical serivce) or going into the disabled state (for a oneshot service).
| | | * | | init: Safely restart services to avoid race conditions.Mike Kasick2012-03-221-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, service restarts (either an explicit "restart", or a "stop, start" pair) exhibited a race condition whereby the new (restarting) service process was often spawned before the old (stopping) process had terminated. This may have resulted in the new service process failing to acquire a limited resource (file lock, socket bind, etc.) that the old process had not yet released. Now, a stopping service remains in the SVC_RUNNING state until its exiting process has been reaped by waitpid. This prevents a "stop, start" sequence from spawning a second service process before resources held by the first are released. This enables safe service restarts by stopping the service, waiting for the old service process to terminate, and (only then) starting the new service process. In the event of "restarting" an already stopped service, the previous behavior is maintained whereby the service is simply started. This scenario could be special-cased by the restart command, however, we have observed instances where services are, unintentionally, stopped and started "too quickly," and so simultaneous processes for the same service should never be allowed. Note that this commit alters the behaviors for explicit restarts of critical and oneshot services. Previously these serivces would simply be restarted, whereas now, an explicit restart of a critical service counts as a crash (which may result in a recovery reboot) and oneshot services go into the disabled state.
* | | | | | am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144eColin Cross2013-06-192-49/+78
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a44c31cc91bce7124e896adb072a10f2740a96b4': toolbox: reimplement watchprops using __system_property_foreach() libcutils: reimplement property_list() using __system_property_foreach()
| * | | | | am e755dfd4: Merge changes I1db3137b,I0f66144eColin Cross2013-06-192-49/+78
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e755dfd43812ebd9a0d0d6a2106316f343ffb5a2': toolbox: reimplement watchprops using __system_property_foreach() libcutils: reimplement property_list() using __system_property_foreach()
| | * | | | Merge changes I1db3137b,I0f66144eColin Cross2013-06-192-49/+78
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: toolbox: reimplement watchprops using __system_property_foreach() libcutils: reimplement property_list() using __system_property_foreach()
| | | * | | | toolbox: reimplement watchprops using __system_property_foreach()Greg Hackmann2013-06-181-39/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally, replace the watchlist array with a hashmap since the array assumes properties are enumerated in a consistent order and foreach() probably won't. (find_nth() never guaranteed this either but it usually worked in practice.) Signed-off-by: Greg Hackmann <ghackmann@google.com> (cherry picked from commit 389e358017ad15485f2bd9120feebfffa489131b) Change-Id: I1db3137b130474f4bb205f01f0bdcf37cf974764
| | | * | | | libcutils: reimplement property_list() using __system_property_foreach()Greg Hackmann2013-06-181-10/+19
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Greg Hackmann <ghackmann@google.com> (cherry picked from commit e7bb159d16f9e60850a3c79cc388587959015a65) Change-Id: I0f66144eb8a4a48e04e4fcd125ad37f19ad94b8e
generated by cgit v1.1 at 2025-01-27 08:35:20 +0000