Commit Graph

410 Commits

Author SHA1 Message Date
Todd Poynor 6a35bb3529 Merge "init.rc: Set owner and permissions for cpufreq files" 2012-04-11 15:28:57 -07:00
Todd Poynor 0653b97b25 init.rc: Set owner and permissions for cpufreq files
Change-Id: Iaaf8491915567dbe22cab1798081a00fed4fb2e2
2012-04-11 14:50:09 -07:00
Mike Lockwood 4f5d5176a3 init.rc: Add support for new USB accessory configurations
Also moved USB scripts to new file init.usb.rc

Change-Id: I98e099fbd8de3eb3e1e18c9ef69312608033a50c
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-04-11 12:35:49 -07:00
Jamie Gennis db49739f39 Add tracing initialization to init.rc.
This change adds init.rc steps to allow kernel tracing to support inserting
messages from any userland process.

Change-Id: I01970728d7132a25408fed09a213a015ac05ccaf
2012-04-10 15:52:39 -07:00
Robert Greenwalt 1d91fcf7c0 Add MDNS service
Adds both the new service and another socket for netd.

Change-Id: Ie0271a2c48aa55217ae3fcdcc8e121b86b5a589b
2012-04-06 15:38:21 -07:00
Nick Kralevich c8583c680a Merge "change files in /dev/log/ to 666" 2012-03-29 10:40:00 -07:00
Nick Kralevich 3439cc6145 change files in /dev/log/ to 666
With newer Android kernels, anyone can read from the files in
/dev/log. If you're in the logs group (have the READ_LOGS) permission,
you'll see all entries. If you're not in that group, you'll see
log messages associated with your UID.

Relax the permissions on the files in /dev/log/ to allow an application
to read it's own log messages.

Bug: 5748848
Change-Id: Ie740284e96a69567dc73d738117316f938491777
2012-03-29 09:32:33 -07:00
Marius Renn 71513567dc Multi-Project Commit: Move of filterfw out of system/media (6 of 7)
This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.

Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.

Change-Id: I87d034a30bb4b98a85a028cb728e37fb97256039
2012-03-27 10:56:06 -07:00
Nick Kralevich 31fb858654 Merge "drmserver: add group drm" 2012-03-26 13:06:12 -07:00
Benoit Goby 62e5cbaebc Merge "Revert "Reimplement the "adb root" command to more closely match its previous behavior"" 2012-03-26 12:56:49 -07:00
Nick Kralevich 3c9eed88c5 drmserver: add group drm
Make the drm server run as UID=drm, GID=drm. This ensures that
any files created by the drmserver app do not have GID=system.

Bug: 5834297
Change-Id: I3409ad350e9cc82bb0982cdbe470ec1f10b1ca67
2012-03-26 11:30:03 -07:00
Kenny Root 2affe824ba Merge "Put keystore into the drmrpc group" 2012-03-21 17:54:16 -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 a9bb7261b4 Merge commit '9dd2eef'
sshd to init.rc

Change-Id: I8eedc3b47f1260502034067d9006cac827cb1089
2012-03-21 16:28:04 -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
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
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
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
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
Chia-chi Yeh 89c5926f08 am 0b32a75b: am c8d1a0e1: am 5ebced39: init.rc: update the permission of /data/local.
* commit '0b32a75b7c7f25bd9ab325f44626c402fd9b9b23':
  init.rc: update the permission of /data/local.
2012-03-08 14:31:23 -08:00
Chia-chi Yeh c8d1a0e18e am 5ebced39: init.rc: update the permission of /data/local.
* commit '5ebced39093d1223566166b8cc6abfe6729c487d':
  init.rc: update the permission of /data/local.
2012-03-08 14:27:08 -08:00
Chia-chi Yeh 5383476727 am 5ebced39: init.rc: update the permission of /data/local.
* commit '5ebced39093d1223566166b8cc6abfe6729c487d':
  init.rc: update the permission of /data/local.
2012-03-08 14:26:47 -08:00
Chia-chi Yeh 5ebced3909 init.rc: update the permission of /data/local.
Bug: 6131945
Change-Id: I3094a471dcfb02b786f47b6778c8fed3726325ec
2012-03-07 15:13:39 -08:00
Nick Kralevich e7fd911fd4 Restrict zygote to system user.
CVE-2011-3918: Address denial of service attack against Android's
zygote process. This change enforces that only UID=system can
directly connect to zygote to spawn processes.

Change-Id: I89f5f05fa44ba8582920b66854df3e79527ae067
2012-01-27 13:06:53 -08:00
James Dong dae26c6ac4 am 3e9c9ac5: am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1
* commit '3e9c9ac5ee7a36653b90cb86eb6445496b536c16':
  Close a security hole - do not give world readable/writable access to /data/drm
2012-01-11 16:19:37 -08:00
James Dong d95c615219 am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1
* commit '032afc1d52289f486538c9ed53f17b9889ea94df':
  Close a security hole - do not give world readable/writable access to /data/drm
2012-01-11 16:18:16 -08:00
James Dong 3e9c9ac5ee am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1
* commit '032afc1d52289f486538c9ed53f17b9889ea94df':
  Close a security hole - do not give world readable/writable access to /data/drm
2012-01-11 16:18:11 -08:00
Dima Zavin f90b0e04a6 rootdir: convert all usages of $prop to ${prop}
Change-Id: Ic2472606e869d23c0f499a192cd7bb21ca3cf5b5
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-11 04:36:13 -08:00
Dima Zavin 3e7b7739e3 init: import the hardware specific init file in init.rc
This removes the hardcoding of the file import in init and instead
allows the init.rc file to fully control what is loaded.

Change-Id: I933e5bbab57f1e8705a370d660f92c6508da94d2
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-11 04:35:58 -08:00
Dima Zavin 683a09352a rootdir: convert all usages of $prop to ${prop}
Change-Id: Ic2472606e869d23c0f499a192cd7bb21ca3cf5b5
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-10 09:37:55 -08:00
James Dong 09cdc0ea12 Close a security hole - do not give world readable/writable access to /data/drm
o related-to-bug: 5834297

Change-Id: I8e459610b4f69999be37364c2359b2bac82d4a2a
2012-01-06 15:20:20 -08:00
Dima Zavin 7634bf87cf init: import the hardware specific init file in init.rc
This removes the hardcoding of the file import in init and instead
allows the init.rc file to fully control what is loaded.

Change-Id: I933e5bbab57f1e8705a370d660f92c6508da94d2
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-05 15:02:00 -08:00
Mike Lockwood 9dd2eef07b add sshd to init.rc
Change-Id: Ide6e8cca58f090e84d85d0298058c523863d1c43
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-29 11:48:04 -05:00
Nick Kralevich 27cca21a5d set mmap_min_addr to 32768
Bug: 5712789
Change-Id: I586a99cd63d8fba06bc2562b1cfce531ee4f554c
2011-12-06 08:31:17 -08:00
Nick Kralevich f9557fba34 Set /proc/sys/kernel/dmesg_restrict to 1
Set dmesg_restrict to 1 to help limit inadvertent information leaks
from the kernel to non-privileged programs.  Root and programs with
CAP_SYSLOG will continue to have access to dmesg output.

See "dmesg_restrict" in Documentation/sysctl/kernel.txt from the
Linux kernel source code.

Bug: 5585365
Change-Id: Iffcf060ea4bd446ab9acf62b8b61d315d4ec4633
2011-11-08 14:46:19 -08:00
Nick Kralevich 1e339a710e Merge "Set kptr_restrict to 2." 2011-11-08 11:39:43 -08:00
Dima Zavin 3c58933aa7 am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd
* commit '4a2539085062a715b0d345eb50ea48738423c909':
  rootdir: init.rc: write default oom_adj before starting ueventd
2011-11-07 17:32:02 +00:00
Dima Zavin 4a25390850 rootdir: init.rc: write default oom_adj before starting ueventd
Otherwise, ueventd's oom_adj value would have been 0 and it could
easily get killed early during low memory events

Change-Id: I1adbd18c37215b26ae77e70f7b8dbd1e143fc2d4
Signed-off-by: Dima Zavin <dima@android.com>
2011-11-04 12:45:56 -07:00
Nick Kralevich 2e7c833279 Set kptr_restrict to 2.
To make writing kernel exploits harder, set /proc/sys/kernel/kptr_restrict
to "2". This prohibits users from accessing kernel symbols via /proc/kallsyms

Bug: 5555668
Change-Id: Ib31cb6fcb4d212a0b570ce9e73ae31f721ed801b
2011-11-02 09:24:27 -07:00
Mathias Agopian 04a875902e restart surfaceflinger and drmserver when servicemanager dies
Bug: 5450389

Change-Id: Ib4e73836721e25e2a88185167b030ea75e0d74e3
2011-10-31 14:27:47 -07:00
sinikang 8cdd4c335f am aa75df74: [maguro] : add setprop net.tcp.buffersize.hspa
* commit 'aa75df74db5beffd25821ed6c360c36197d7bac1':
  [maguro] : add setprop net.tcp.buffersize.hspa
2011-10-17 17:03:15 -07:00
sinikang aa75df74db [maguro] : add setprop net.tcp.buffersize.hspa
-window size optimized for hspa
-Patchset2 : space removed

Change-Id: Ia4d1043d1a93c929721a4d7cca60ce9ff8bbf67a
Signed-off-by: sinikang <sinikang@samsung.com>
2011-10-17 15:56:02 -07:00
Nick Kralevich d707fb3fb6 enable heap randomization.
Bug: 5250555

Change-Id: I7acb0645402611875c481aec33ece85fced7a336
2011-10-11 15:35:39 -07:00
Wink Saville 4e803c3c18 Merge "Add log group to rild to improve log collection on modem issue" 2011-10-10 12:24:48 -07:00
Jeffrey Tinker f791e17bc9 Merge "Add drmrpc group to mediaserver and drmserver so they can make the drm rpc calls" 2011-10-07 19:40:35 -07:00
Jeffrey Tinker 65c4df51f8 Add drmrpc group to mediaserver and drmserver so they can make the drm rpc calls
Bug 4598045 Implementing secure video path on TI OMAP4 chip for ICS

Change-Id: Iacfe3e79f067172085b96bb4cd4484101aa5be1e
2011-10-06 18:19:46 -07:00
Kazuhiro Ondo e65e946382 Add log group to rild to improve log collection on modem issue
Add log group to ril-daemon service. rild is the best place to
know the issue on the modem in many time. It would be helpful
if rild alone can capture the snapshot of logcat buffers at
the moment of problem.

Change-Id: Ie0dcda126fb748a00e650427de35541672359287
2011-09-30 11:53:09 -07:00
David 'Digit' Turner a503456526 emulator: Move qemu-props to core service
The qemu-props program is launched at boot to read a series of
system property assignments from the emulator and apply them.

This is necessary to deal with the dynamic nature of the emulated
platform (e.g. the screen density which depends on the skin and
cannot be hard-coded in the platform image).

This patch ensures that qemu-props is started before any other
service that may read one of these properties (e.g. surface flinger).
This is done by encapsulating the program into a 'core' service.
Core services are all stared before regular ones.

Before the patch, qemu-props was started manually inside a script
that is called from a late emulator-specific boot service
(goldfish-setup).

The problem was that sometimes qemu-props was run too late.
This resulted in random flakiness, especially when running
on a low-end host machine.

Fix for bug 2161189 (and probably a few others)

Change-Id: I2933a25dcb5fecbb1fc238f157264e621b8f295b
2011-09-16 00:25:16 +02:00
JP Abgrall 8e3ff70444 init.rc: allow all users to open the qtaguid misc dev
The netfilter xt_qtaguid module uses a misc dev so that processes
that use the module can be tracked.
Every process that does socket tagging must open that dev.

Change-Id: I6af3e0f0180637b14455dd9607724523f142c402
2011-09-11 16:12:27 -07:00
Robert Greenwalt 1ac40f4ef1 Increase the window sizes on wifi and lte.
Set to 524288,1048576,2097152, 262144,524288,1048576.

bug:5226360
Change-Id: Id9d4257c51a355d78246b4ca59ab462fbe5b72be
2011-09-07 15:40:26 -07:00
Dima Zavin ca47cef749 init: add charge mode handling
Introduces a 'charger' section that is processed when androidboot.mode
supplied on the kernel commandline is "charger".

In this mode, sections such as fs, post-fs, etc are skipped. Only the
'early-init' and 'init' sections of the init rc files are processed before
processing the 'charger' section.

Change-Id: If9eb6334de18f04cbcf2aab784578e2993615242
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-02 12:11:18 -07:00
JP Abgrall 85e37b0a81 init: allow mediaserver to tag socket (group net_bw_acct)
The mediaserver needs to do communication on behalf of other apps
(browser, ...).
It needs to be able to tag sockets. The kernel will check for net_bw_acct
group membership.

Change-Id: I7fb063fdb7d9435d7f979df6622ff17f34049cbc
2011-08-18 00:10:06 -07:00
Dianne Hackborn d09196d00c Merge "Activity Manager now takes care of setting OOM values." 2011-08-08 14:55:14 -07:00
Chia-chi Yeh a24687197d init.rc: add inet permission to VPN daemons explicitly.
Racoon still needs it after dropping root privilege, or pure IPSec VPN
will fail. Mtpd works without it because net_raw implies inet. However
it would be better to set all of them clearly without the assumption.

Change-Id: I50762af2c25ec9cc559e528c7b14f469494fd553
2011-08-08 10:11:40 -07:00
Dianne Hackborn 06787f4089 Activity Manager now takes care of setting OOM values.
All init needs to do is make these files writeable so that the
activity manager can set them.

Change-Id: Ieea43208fadc01504d813be379aecbafcadf0d34
2011-08-07 16:30:24 -07:00
Mike Lockwood 7804cbf483 Move some common USB configuration logic to init.rc
Change-Id: Ib75ccfd9c4aa8aace936370c33f33a922ca3c51f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-29 12:59:32 -04:00
Eric Laurent 3507616870 Fix issue 4604090: notification sound interrupted.
Removed system from mediaserver groups. Not needed anymore
now that AudioFlinger acquires wake locks via PowerManagerService.

Change-Id: I177b968a0a30557d871188bf3991b96d9b391d3c
2011-07-25 18:41:30 -07:00
Conley Owens 4a2b0fcd6e am aa4a66a1: am 1e5e2d76: am af6e3266: am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache."
* commit 'aa4a66a16dd9b97fb876bb296366442b8745a10b':
  Create world readable, system writeable /data/resource-cache.
2011-07-15 14:12:23 -07:00
Conley Owens aa4a66a16d am 1e5e2d76: am af6e3266: am d0b93f43: Merge "Create world readable, system writeable /data/resource-cache."
* commit '1e5e2d7673a9ea915283f6626fa692cc169b0e67':
  Create world readable, system writeable /data/resource-cache.
2011-07-15 11:30:44 -07:00
Chia-chi Yeh 56286d6fdb Merge "init: update permissions for VPN." 2011-07-10 16:16:06 -07:00
Chia-chi Yeh 9bb4d411e0 init: update permissions for VPN.
VPN no longer uses system properties to keep network parameters.
Besides, profiles are now stored and encrypted by keystore.

Change-Id: I7575f04f350b7d8d5ba7008eb874a72180d057e8
2011-07-08 20:03:03 -07:00
Chia-chi Yeh 50d9819ef4 Merge "init: clean up init.rc as now mkdir handles EEXIST." 2011-07-08 19:26:45 -07:00
Chia-chi Yeh ea74414159 init: clean up init.rc as now mkdir handles EEXIST.
Change-Id: I3fa2a618ef27197315fc128738a284ac644e86c0
2011-07-08 16:52:18 -07:00
Eric Laurent f48fd5d403 Temporary workaround for issue 4604090
There was a regression caused by a change in Honeycomb that removed
mediaserver process from system group to improve security: This prevents
the audio HAL (which runs in mediaserver process) from taking wake locks
while audio is playing thus causing the pcm stream to get unexpectedly
suspended.

This temporary workaround is just to allow ICS dogfood in better conditions until
a real fix taking into account the security issue is implemented.

Change-Id: Ic19a23da4b4383559188b6f5c3a82604c3d95d74
2011-07-07 11:45:59 -07:00
Mike Lockwood e89675584d Merge "init.rc: Allow system process to configure RNDIS USB ethernet address" 2011-07-06 17:53:56 -07:00
Mathias Agopian 64416c816c Merge "don't restart surfaceflinger when the window manager dies" 2011-07-06 11:10:41 -07:00
Mike Lockwood 9350a00ce6 init.rc: Allow system process to configure RNDIS USB ethernet address
Change-Id: Id339d8359e592dbc1279e423d9a5adc3a775949d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-06 12:45:49 -04:00
Mathias Agopian b4daef4531 don't restart surfaceflinger when the window manager dies
Change-Id: Ia3c60e6c5471e2b72d53c936de44b730c68095e0
2011-07-01 17:11:51 -07:00
Brian Carlstrom 856f63c0df Merge "Revert "Add keychain user"" 2011-07-01 13:43:33 -07:00
Eino-Ville Talvala 1c9a996c50 Add mobile filter framework library into the bootclasspath.
Change-Id: Ia9ae45de5d58ba5e98821fd04add96c6062c1a18
2011-07-01 10:30:01 -07:00
Brian Carlstrom 0491893023 Revert "Add keychain user"
This reverts commit 6541ef1562.

Bug:4970237
Change-Id: I23a90eb89c1d19893d2ba7065fc624c0521cb06e
2011-07-01 09:50:31 -07:00
vidya rao 9d94942bcd am 6a18a077: am 04cf629b: Move RILD to class main
* commit '6a18a07774123c409cefd9a92f1c4c6504f4edfd':
  Move RILD to class main
2011-06-27 14:15:33 -07:00
vidya rao 6a18a07774 am 04cf629b: Move RILD to class main
* commit '04cf629be5e99a3a920aecc0b059444bd07e9d84':
  Move RILD to class main
2011-06-24 22:54:11 -07:00
vidya rao 04cf629be5 Move RILD to class main
-- This is needed so the modems (LTE & CDMA) are powered on and running
   before unlocking encrypted devices

Change-Id: I842f5286499fd76abc554ded550fb837d12b324e
2011-06-24 16:41:29 -07:00
Mike Lockwood 535164e9d9 Reimplement the "adb root" command to more closely match its previous behavior
The adb gadget driver used to reset the USB bus when the adbd daemon exited,
and the host side adb relied on this behavior to force it to reconnect
with the new adbd instance after init relaunches it.  The new gadget
drivers no longer automatically reset the USB bus when adbd is restarted
which caused adb to hang since it was no longer forced to reconnect with the
device.  We attempted to work around this on the host side adb, but that
work around has not been reliable.

This change adds a property trigger on the service.adb.root system property
which will reset the USB bus and restart the adbd daemon when adbd sets
the property to 1.  This should be much closer to the previous behavior
and will hopefully fix some problems with automated testing.

Change-Id: I177c37400009a3d83f21a5f9431f94fd1cc19b9b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-22 08:36:53 -04:00
Mike Lockwood 352dfdfaea init.rc: Changes for new USB gadget drivers
Change-Id: I68fcf167c9fc71bb5f44793648a35d3181fd36d7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 15:53:58 -04:00
Mårten Kongstad b45280d259 Create world readable, system writeable /data/resource-cache.
/data/resource-cache is used to store idmap files.

Change-Id: I9b1dbc8d607333b71c05f55a4a402ae92193c36c
2011-05-31 15:41:15 +02:00
jeffhao 2b8f76cdbb Tracking merge of dalvik-dev to master
Reordered bootclasspath to allow verification of all framework methods.
  git cherry-pick --no-commit  ec164a0170955fe63106c2576a65bc4ffb1df425

Address CVE-2011-1090.
  git cherry-pick --no-commit  3365288d3c00072689cd9d733e055561cadc87b5

Change-Id: I6a89bc600ced06a0cb84ae1670cb7a6ea39de9c8
2011-05-27 00:50:44 -07:00
Brian Carlstrom 70080d97cf Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (6 of 6)" 2011-05-17 10:37:56 -07:00
Brian Carlstrom a31a351182 Make CertInstaller installed CA certs trusted by applications via default TrustManager (6 of 6)
frameworks/base

        Adding IKeyChainService APIs for CertInstaller and Settings use
    	keystore/java/android/security/IKeyChainService.aidl

    libcore

        Improve exceptions to include more information
    	luni/src/main/java/javax/security/auth/x500/X500Principal.java

        Move guts of RootKeyStoreSpi to TrustedCertificateStore, leaving only KeyStoreSpi methods.
        Added support for adding user CAs in a separate directory for system.
        Added support for removing system CAs by placing a copy in a sytem directory
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/RootKeyStoreSpi.java
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStore.java

        Formerly static methods on RootKeyStoreSpi are now instance methods on TrustedCertificateStore
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java

        Added test for NativeCrypto.X509_NAME_hash_old and X509_NAME_hash
        to make sure the implementing algorithms doe not change since
        TrustedCertificateStore depend on X509_NAME_hash_old (OpenSSL
        changed the algorithm from MD5 to SHA1 when moving from 0.9.8 to
        1.0.0)

    	luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

        Extensive test of new TrustedCertificateStore behavior
    	luni/src/test/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStoreTest.java

        TestKeyStore improvements
        - Refactored TestKeyStore to provide simpler createCA method (and
          internal createCertificate)
        - Cleaned up to remove use of BouncyCastle specific X509Principal
          in the TestKeyStore API when the public X500Principal would do.
        - Cleaned up TestKeyStore support methods to not throw Exception
          to remove need for static blocks for catch clauses in tests.

    	support/src/test/java/libcore/java/security/TestKeyStore.java
    	luni/src/test/java/libcore/java/security/KeyStoreTest.java
    	luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

        Added private PKIXParameters contructor for use by
        IndexedPKIXParameters to avoid wart of having to lookup and pass
        a TrustAnchor to satisfy the super-class sanity check.

    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java
    	luni/src/main/java/java/security/cert/PKIXParameters.java

    packages/apps/CertInstaller

        Change CertInstaller to call IKeyChainService.installCertificate
        for CA certs to pass them to the KeyChainServiceTest which will
        make them available to all apps through the
        TrustedCertificateStore. Change PKCS12 extraction to use AsyncTask.

    	src/com/android/certinstaller/CertInstaller.java

        Added installCaCertsToKeyChain and hasCaCerts accessor for use by
        CertInstaller. Use hasUserCertificate() internally. Cleanup coding
        style.

    	src/com/android/certinstaller/CredentialHelper.java

    packages/apps/KeyChain

        Added MANAGE_ACCOUNTS so that IKeyChainService.reset
        implementation can remove KeyChain accounts.

    	AndroidManifest.xml

        Implement new IKeyChainService methods:
        - Added IKeyChainService.installCaCertificate to install certs
          provided by CertInstaller using the TrustedCertificateStore.
        - Added IKeyChainService.reset to allow Settings to remove the
          KeyChain accounts so that any app granted access to keystore
          credentials are revoked when the keystore is reset.

    	src/com/android/keychain/KeyChainService.java

    packages/apps/Settings

        Changed com.android.credentials.RESET credential reset action to
        also call IKeyChainService.reset to remove any installed user CAs
        and remove KeyChain accounts to have AccountManager revoke
        credential granted to private keys removed during the RESET.

    	src/com/android/settings/CredentialStorage.java

        Added toast text value for failure case

    	res/values/strings.xml

    system/core

        Have init create world readable /data/misc/keychain to allow apps
        to access user added CA certificates installed by the CertInstaller.

    	rootdir/init.rc

Change-Id: I768ca8e8e990ff333ce0f7069a0935173498c5ed
2011-05-16 18:05:23 -07:00
Chia-chi Yeh 69f43c90cb Update the device permission of /dev/tun.
Change-Id: Ie8ad60047fc7160997100bd28a0abb439406806a
2011-05-12 13:43:34 -07:00
David 'Digit' Turner 7db617efc0 resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp
Change-Id: I159dd58c403bc38f9637163d8cd5e6270e4f201c
2011-04-29 13:31:31 +02:00
David 'Digit' Turner b013bfc171 am 52a64057: Merge "ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc"
* commit '52a64057b60b0ad242e95fdc285ec60e0191d5b5':
  ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
2011-04-28 02:30:33 -07:00
David 'Digit' Turner f431d0499b ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
+ Add /dev/qemu_pipe line for QEMU pipes.

Change-Id: If3c5c675bfc1585a1d6ffcd1042aaedbc2e94763
2011-04-26 18:07:45 +02:00
Jeffrey Tinker f642c3d12f Make drmserver's primary group be system, so setgid is not required in ueventd.stingray.rc
Change-Id: Ie8a287620d22b5c1bdc459fb288b7403589ab474
2011-03-17 10:55:05 -07:00
Glenn Kasten cfce282678 Bug 4089635 mediaserver fewer supplementary groups
Change-Id: I90111567564397ca08e87dcfcbdf23337bf79ae6
2011-03-14 11:43:45 -07:00
Glenn Kasten b7b770dd76 Bug 4086255 drmserver process needs system group
Change-Id: If9a325b9e716abe00f3ad6f20b012861308abd2d
2011-03-11 14:33:11 -08:00
Ken Sumrall 5db0897c65 Merge "Load the persistent properties after decrypting the /data partition" into honeycomb-mr1 2011-03-10 19:32:27 -08:00
Ken Sumrall c5c51033c8 Load the persistent properties after decrypting the /data partition
Fix for bug 3415286.  The persistent properties are normally read early
in the boot process after /data is mounted.  However, for an encrypted
system, at that point /data is a tmpfs ramdisk.  This change adds a new
command to init (load_persist_props) to read the persistent properties,
and adds an action to init.rc to load the persistent properties.  This
action is triggered by setting a property in vold, but that's in a
different CL.

Change-Id: I74b3057974ee6029c29d956b76fef5566700d471
2011-03-10 18:12:19 -08:00
Mathias Agopian a40481b2cc Run surfaceflinger in its own process. [DO NOT MERGE]
This is to allow OpenGL ES rendering from the system process,
and help with debugging.

Bug: 4086003
Change-Id: I732e95f4fcaa358f430cc195d8e63a69263bffdc
2011-03-10 17:30:08 -08:00
David Turner f0900adeb2 am 663268ca: am fe111c83: am e6b638be: Merge "x86: Add vold.fstab to mount the SD card"
* commit '663268caac636e32b19173743594899e52df0830':
  x86: Add vold.fstab to mount the SD card
2011-03-02 15:33:14 -08:00
David Turner 663268caac am fe111c83: am e6b638be: Merge "x86: Add vold.fstab to mount the SD card"
* commit 'fe111c83708dd3c8746b3a05d4b2f53c7a9f4477':
  x86: Add vold.fstab to mount the SD card
2011-03-02 11:38:57 -08:00
David Turner fe111c8370 am e6b638be: Merge "x86: Add vold.fstab to mount the SD card"
* commit 'e6b638be199a5f16f3eaff69710d92ea248d60a3':
  x86: Add vold.fstab to mount the SD card
2011-03-02 07:58:39 -08:00
Mike Lockwood 0c8b18b960 am 126d4bc1: Give system server permission to enable and disable USB functions DO NOT MERGE
* commit '126d4bc18c93f06016998cf6d014c6055c2d3a40':
  Give system server permission to enable and disable USB functions DO NOT MERGE
2011-02-28 13:14:42 -08:00
Mike Lockwood 5ebe6fe677 am 642075b6: Set USB group for /dev/usb_accessory DO NOT MERGE
* commit '642075b6f74faeca53d9449ec9b74d7c66fe7cdd':
  Set USB group for /dev/usb_accessory DO NOT MERGE
2011-02-28 13:14:39 -08:00
Mike Lockwood 126d4bc18c Give system server permission to enable and disable USB functions DO NOT MERGE
Change-Id: Ie43b6679838436ac004d0b5fa59d3d98cb5b0c76
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-27 17:43:59 -08:00
Mike Lockwood 642075b6f7 Set USB group for /dev/usb_accessory DO NOT MERGE
Change-Id: I41264272ff6ce245cb2b8989ddee4a82059444a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-27 17:43:52 -08:00
Ken Sumrall 012cf8f2de Merge "Fix for bug 3379244, non-eMMC devices don't start all services." 2011-02-22 12:15:10 -08:00
Ken Sumrall dd4d786cbf Fix for bug 3379244, non-eMMC devices don't start all services.
Fix for non-eMMC based devices to properly start the "on nonencrypted"
action.

Change-Id: I5d2966db352b02f1a1724fb105e1cefc46037e42
2011-02-17 18:09:47 -08:00
Jun Nakajima 0db0921b59 x86: Add vold.fstab to mount the SD card
Change-Id: Ie1f70a22dd4e27e8ea956d5e627877d1e2379b95
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-02-13 21:10:40 -08:00
Mike Lockwood ddc4cfd8b2 ueventd.rc: Give system process permission to enable and disable USB functions
Change-Id: I4af1f3fed857df2be96a640f65cd612577c957c7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-08 17:41:19 -05:00
Mike Lockwood 45e96d0e49 Set USB group for /dev/usb_accessory
Change-Id: I17db8d9bb1bf6336979e9b7bce62306d0d7a79d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-08 17:40:50 -05:00
Ying Wang 9ac8484e0b Merge "Reorder BOOTCLASSPATH to match change 7eff81df2a" 2011-02-08 09:59:10 -08:00
Ying Wang 04e5232ac2 Reorder BOOTCLASSPATH to match change 7eff81df2a
Bug: 3385161
Change-Id: I8bb91753c02c031c32ab0070dd424a6ac859311a
2011-02-07 20:04:31 -08:00
Glenn Kasten b03afaafb5 Merge "Bug 3381298 Remove old /data/drm/plugins/native" 2011-02-02 15:58:08 -08:00
Rebecca Schultz Zavin 63e99f447f am e442cff0: am 58fb8220: Raise the viking killer min free values to match the system properties
* commit 'e442cff05ff9f083c91caa3bed74e37318a69fda':
  Raise the viking killer min free values to match the system properties
2011-01-30 12:53:21 -08:00
Rebecca Schultz Zavin 58fb822024 Raise the viking killer min free values to match the system properties
Change-Id: Idcbdb106d704ef63c9a44e635b6e995e0e5f6479
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2011-01-28 22:56:18 -08:00
Dianne Hackborn 24823cfa84 am fee2cfb0: am 9efdcd96: Fix issue #3401380: Raise OOM killer limits
* commit 'fee2cfb01165f6797d783c6a8c0b1fba4f591355':
  Fix issue #3401380: Raise OOM killer limits
2011-01-28 16:40:26 -08:00
Dianne Hackborn 9efdcd969e Fix issue #3401380: Raise OOM killer limits
Change-Id: Ia9c82e7d31b7f1b89bf9650ebea697d9b3a64506
2011-01-28 15:33:13 -08:00
Glenn Kasten b81dfcb4f6 Bug 3381298 Remove old /data/drm/plugins/native
Change-Id: Ic299d328f2e04a65a9dce68909c7b83f3ac03b20
2011-01-23 12:37:03 -08:00
Glenn Kasten 328c0d4a89 Merge "Bug 3361124 Remove drmioserver" 2011-01-23 09:45:24 -08:00
David 'Digit' Turner 0897a4353e am 100511ff: am 88af5ff4: Merge "goldfish: Work-around to start the RIL daemon." into honeycomb
* commit '100511ffaa11b33a6856a434c62ad326a899f252':
  goldfish: Work-around to start the RIL daemon.
2011-01-21 19:04:02 -08:00
David 'Digit' Turner dc743112ca goldfish: Work-around to start the RIL daemon.
This change forces the start of the RIL daemon used to provide
3G connectivity to the system. It should normally be started
automatically by init.rc but there is a bug within
system/core/init/builtins.c that prevents this to happen.

Fixes the "No network connectivity" bug while the network
interface and route were properly setup.

Change-Id: Ieec0f513aabf92b8a59f0a86f64a16e97057c3c3
2011-01-22 02:24:36 +01:00
Glenn Kasten b29b33841b Bug 3361124 Remove drmioserver
Change-Id: Ie3b20b487c1466737921567ab2d043e230356bf4
Note: safe to re-use the drmio uid/gid as no files were ever created.
2011-01-20 07:45:27 -08:00
Ken Sumrall 852c13d1b2 am afa099a1: am 3a159d62: Move rild to the late_start class
* commit 'afa099a1909c02196574d125d735adb0c8918392':
  Move rild to the late_start class
2011-01-19 23:14:43 -08:00
Ken Sumrall 3a159d62a9 Move rild to the late_start class
Now that rild can be killed in a reasonable amount of time, move it
from the core class to late_start.  I was going to move it to main,
but it would get killed and restarted right after the disk crypto
password was entered, which is when the late_start class is started,
and I was seeing issues with rild not re-connecting to the network
when it was killed and restarted.

Change-Id: I60479ddb853953029890fc816538d615ef5a96ab
2011-01-19 23:06:12 -08:00
David 'Digit' Turner ba3bcef024 am 794fb914: am eeeca4dd: rootdir: goldfish: Fix network route during emulation.
* commit '794fb914bef34c1c5f32764947801c95575ecd41':
  rootdir: goldfish: Fix network route during emulation.
2011-01-18 21:57:46 -08:00
David 'Digit' Turner eeeca4dd45 rootdir: goldfish: Fix network route during emulation.
The net.eth0.gw system property is used by the ConnectivityService
to set the default route when it detects that 3G connectivity is
established. Because the property was undefined, the route was
unset which broke networking.

+ Format / document init.goldfish.sh

Change-Id: I1133cf6c093609300315cd0ea363c9e139b42521
2011-01-18 23:38:00 +01:00
David 'Digit' Turner a42f152b4a Merge "rootdir: Fix system emulation startup." into honeycomb 2011-01-18 11:08:04 -08:00
Ken Sumrall 701d40f721 am 383b76f8: am e4349157: Add a new trigger to support a progress bar UI for encrypt in place.
* commit '383b76f86af48d4a1a502d7767ab79f024483864':
  Add a new trigger to support a progress bar UI for encrypt in place.
2011-01-17 15:00:09 -08:00
Ken Sumrall e434915787 Add a new trigger to support a progress bar UI for encrypt in place.
Change-Id: I6a14eb43462505cb7fecfee9fd1ecdea50065963
2011-01-17 14:26:34 -08:00
David 'Digit' Turner 95df887ac0 rootdir: Fix system emulation startup.
This fixes the goldfish-specific config scripts used by init and ueventd
to properly setup the system under emulation. This fixes a lot of broken-ess
introduced by recent permission changes in the system.

Note that there are still several problems after this patch is applied, but
at least it becomes possible to get an adb connection to the emulated system,

Change-Id: Iff47bbf0fe5cb759fa93089284bb0f71e32405a2
2011-01-15 03:15:47 +01:00
Jesse Wilson 30d5d038a9 Move apache-xml to external. (project 4 of 4)
Change-Id: I8e1ea723481ae6d8e609563331c187576f306bce
http://b/3351604
2011-01-13 17:22:50 -08:00
Ken Sumrall 63990cf56f Merge "Move rild to the core class." into honeycomb 2011-01-13 13:42:17 -08:00
Ken Sumrall a02714bd3e Move rild to the core class.
Changes in init.stingray.rc now prevent rild from making sockets
or named pipes on /data.  Now that rild no longer prevents /data
from being unmounted, we can put it in the core class, which doesn't
restart when we enable encryption.  This speeds up the boot by 20+
seconds.

Change-Id: I737baf804e089f4ddbd664eaa1e675a7bd62e699
2011-01-13 13:41:06 -08:00
Ken Sumrall f3c42b6ee4 Move rild to the core class.
Changes in init.stingray.rc now prevent rild from making sockets
or named pipes on /data.  Now that rild no longer prevents /data
from being unmounted, we can put it in the core class, which doesn't
restart when we enable encryption.  This speeds up the boot by 20+
seconds.

Change-Id: I71c426dab1b725e401116234167d41c7ccd958c1
2011-01-10 19:00:49 -08:00
Gloria Wang a44aca6580 Temporarily disable the drm service. do not merge
Change-Id: I5cb04a9c2cc5b95443c6c0ea77132a4102ca47fc
2011-01-10 17:33:25 -08:00
Mike Lockwood 48b911c573 am af7bdc64: Add separate permission and group for access to MTP USB driver
* commit 'af7bdc646088e3112052f4fd35061bb720393287':
  Add separate permission and group for access to MTP USB driver
2011-01-10 09:27:56 -08:00
Mike Lockwood af7bdc6460 Add separate permission and group for access to MTP USB driver
Since the "usb" group and ACCESS_USB permission will be used by regular apps
to access USB devices in host mode, we need a separate permission for the
device side MTP driver.

Change-Id: Ibb546b8726d61e041fc7c273f71929624ad1575b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-10 08:22:30 -05:00
Gloria Wang 16209418de Merge "To remove drm service from groups of "system" and "root"." 2011-01-07 13:36:06 -08:00
Gloria Wang 60b5b408cf To remove drm service from groups of "system" and "root".
Change-Id: Ieac11c667c72465f7082baab0787dc740797049f
2011-01-07 11:46:25 -08:00
Brad Fitzpatrick a2a1f3149f Let SocketClient users write binary data to clients.
This is a dependency for the DNS proxy CLs.

This CL also adds a new socket for the netd process to inherit which
is owned by the inet group.  (so only apps with the INTERNET
permission can use the DNS proxy...)

Change-Id: I8a51924e0ed56c6066f77e6f1b02d39bdadac51e
2011-01-06 11:09:55 -08:00
David 'Digit' Turner 1f2565ca08 rootdir: Fix system emulation startup.
This fixes the goldfish-specific config scripts used by init and ueventd
to properly setup the system under emulation. This fixes a lot of broken-ess
introduced by recent permission changes in the system.

Note that there are still several problems after this patch is applied, but
at least it becomes possible to get an adb connection to the emulated system,

Change-Id: I1e8f5828b4d5cbb3a4338878df875dc718276b38
2011-01-06 14:04:12 +01:00
Ken Sumrall 752923c168 Changes to init to support encrypted filesystems.
These are the changes to init and init.rc necessary to
support booting with and encrypted /data filesystem.
A corresponding change to init.<device>.rc goes along
with this change.

Change-Id: I0c7e2cc39568358014a82e317735c0eae14dd683
2010-12-18 19:03:54 -08:00
Nick Kralevich 333f24bfbd don't run services with gid=0
Ensure that we drop privileges for servicemanager
and drmioserver.  These should not be running with
gid=0.

Bug: 3275526
Testing: Applied change and successfully rebooted
the device.  No obvious bugs.

Change-Id: I782fbda812cb88e0a365788b45b3b32894623177
2010-12-15 11:09:21 -08:00
Jaikumar Ganesh 1612425c50 Remove services for adding SDP records.
This was an inefficient way of doing things and was
temporary. There are now direct calls to Bluez to add reserved
SDP records.

This improves connection time after turning on BT by 6-8 secs.

Change-Id: I8750f44e1de73c9cc935d68710b8964e3f50c3a6
2010-12-13 13:47:27 -08:00
Iliyan Malchev 6388cfe03c Revert "HACK: slow_start for mediaserver to prevent restart race condition"
This reverts commit 9db7945ed2.
2010-12-08 16:19:12 -08:00
Paul Eastham 9db7945ed2 HACK: slow_start for mediaserver to prevent restart race condition
Change-Id: Ia76385612fd127c5f11b3d64205e350f27acfd82
2010-12-04 17:39:30 -08:00
Mike Lockwood d49b4ef51e init.rc: Allow console in userdebug builds
Change-Id: Ib5734c6d3e2bf5a9da3d44721c529971f2345120
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 09:12:27 -05:00
Gloria Wang 4640fc0504 Create directory for DRM plug-ins.
Change-Id: I1bfef96b1949f288852cd88222e0ce2bbb186f40
2010-10-28 13:44:47 -07:00
Brian Swetland a215823fc9 am b7171987: am b4d65399: disable console in user builds 2010-10-27 15:47:16 -07:00
Brian Swetland b717198738 am b4d65399: disable console in user builds 2010-10-27 15:45:26 -07:00
Brian Swetland b4d65399fd disable console in user builds
Also, run console as shell/log instead of root/root.

Change-Id: I6104f1edddfd5e11843ff41d7839d0c296e6a6f9
2010-10-27 15:41:40 -07:00
Brad Fitzpatrick 8c5669f9f9 Let SocketClient users write binary data to clients.
This is a dependency for the DNS proxy CLs.

This CL also adds a new socket for the netd process to inherit which
is owned by the inet group.  (so only apps with the INTERNET
permission can use the DNS proxy...)

Change-Id: Ic3475c697913ba85805b4e49801b65e7a1d59289
2010-10-27 10:27:34 -07:00
Brian Swetland 7ffa661595 am 60afdedc: am 146481b9: add rules to set perms for input device sysfs attributes 2010-10-26 15:44:20 -07:00
Brian Swetland 60afdedc4c am 146481b9: add rules to set perms for input device sysfs attributes 2010-10-26 15:42:10 -07:00
Brian Swetland 146481b946 add rules to set perms for input device sysfs attributes
Change-Id: I28ab7f1ac5cc07ade7830e87f5e70c96464bb686
2010-10-26 15:38:00 -07:00
Brian Swetland 98b1378606 am f3c29f0c: am 5988ea72: add sdcard access permission to ril daemon
Merge commit 'f3c29f0cf287ec3d329b012a2d48808b064632f6'

* commit 'f3c29f0cf287ec3d329b012a2d48808b064632f6':
  add sdcard access permission to ril daemon
2010-10-22 22:48:02 -07:00
Brian Swetland f3c29f0cf2 am 5988ea72: add sdcard access permission to ril daemon
Merge commit '5988ea726e91fbdc69485b729ea2f532fedfa1d6' into gingerbread-plus-aosp

* commit '5988ea726e91fbdc69485b729ea2f532fedfa1d6':
  add sdcard access permission to ril daemon
2010-10-22 22:34:46 -07:00
Brian Swetland 5988ea726e add sdcard access permission to ril daemon
Some RIL daemons write crashdumps to sdcard.

Change-Id: I49a8d2cb342fd7f8bd23dbb1bcc378726e10a579
2010-10-22 22:17:17 -07:00