Commit Graph

284 Commits

Author SHA1 Message Date
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
Brad Fitzpatrick d7482b2f4c am 33357f54: am 6490257d: Make netd restart when system server hangs on it.
Merge commit '33357f5477a24cb16bd3dd692fe5ca14755ab033'

* commit '33357f5477a24cb16bd3dd692fe5ca14755ab033':
  Make netd restart when system server hangs on it.
2010-09-21 17:44:45 -07:00
Brad Fitzpatrick 33357f5477 am 6490257d: Make netd restart when system server hangs on it.
Merge commit '6490257d116c35d3da927ee7b91179dde64ef713' into gingerbread-plus-aosp

* commit '6490257d116c35d3da927ee7b91179dde64ef713':
  Make netd restart when system server hangs on it.
2010-09-21 16:27:25 -07:00
Brad Fitzpatrick 6490257d11 Make netd restart when system server hangs on it.
netd has been seen hanging (cause suspected but unconfirmed)
which then brings down the system server which blocks forever
on its main thread trying to connect to netd with its hung
event loop.

This then results in an infinite watchdog runtime restart loop
because the situation never improves:  netd is still borked.

Instead, we should kill netd and give it another chance when
the system server dies.

Bug: 3018996
Bug: 3017876
Change-Id: Ibf9ecf0ffcb78e48c38e5167f21cbeefe0e2a47f
2010-09-21 15:49:06 -07:00
Brian Swetland d06df51bcd resolved conflicts for merge of 3b5214a6 to master
Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4
2010-09-19 04:35:19 -07:00
Brian Swetland 3b5214a67f am 02863b95: add /vendor support
Merge commit '02863b957cfbfc302d3136ed78c0cba86accacd8' into gingerbread-plus-aosp

* commit '02863b957cfbfc302d3136ed78c0cba86accacd8':
  add /vendor support
2010-09-19 03:49:43 -07:00
Brian Swetland 02863b957c add /vendor support
- look in /vendor/firmware/... in addition to /system/etc/firmware/... for firmware loading
- add /vendor/bin to path before /system/bin
- add /vendor/lib to ldpath before /system/lib
- configure appropriate permissions for /system/vendor/bin
- symlink /vendor -> /system/vendor

Change-Id: I0c06ca1e38a44f0c7024cee6cea8907aa93a4532
2010-09-19 03:36:39 -07:00
Jean-Baptiste Queru a5220b24d1 am 26ce6e0e: manual merge from readonly-korg-master
Merge commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1'

* commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1':
  - Add drm and drmio service
2010-09-10 11:30:33 -07:00
Jean-Baptiste Queru 26ce6e0e16 manual merge from readonly-korg-master
Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548
2010-09-10 10:43:36 -07:00
Jean-Baptiste Queru bb130ba799 Merge "- Add drm and drmio service - Add /data/drm directory for storing DRM related data" 2010-09-09 14:13:01 -07:00
Brian Swetland e6d8a5f1df am 8df3a4a5: am 4012c0a4: Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread
Merge commit '8df3a4a554184afba71887995c5f0983ce81196f'

* commit '8df3a4a554184afba71887995c5f0983ce81196f':
  remount / as read-only only on post-fs to allow per-target config of /
2010-09-08 15:51:10 -07:00
Brian Swetland 8df3a4a554 am 4012c0a4: Merge "remount / as read-only only on post-fs to allow per-target config of /" into gingerbread
Merge commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4' into gingerbread-plus-aosp

* commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4':
  remount / as read-only only on post-fs to allow per-target config of /
2010-09-08 15:08:16 -07:00
Brian Swetland 56de7a1263 remount / as read-only only on post-fs to allow per-target config of /
Change-Id: Ia89dd2021e0f960201b4cee573227f0addd48431
2010-09-08 15:06:45 -07:00
Brian Carlstrom 3c659a8d64 am f2af88e8: Tracking merge of dalvik-dev to gingerbread
Merge commit 'f2af88e81af5efb2d585963507f798d5a8b93d67' into gingerbread-plus-aosp

* commit 'f2af88e81af5efb2d585963507f798d5a8b93d67':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:39:18 -07:00
Brian Carlstrom f2af88e81a Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit b99a099c
git cherry-pick --no-commit 9811671e02
git cherry-pick --no-commit d0645bf0cc

Change-Id: Ie70fecaeaba97a25f114cd2717e381b5107533b1
2010-08-04 15:45:52 -07:00
Iliyan Malchev e306a9044a Revert "system/core: add system/audio persmissions for /dev/audio*"
This reverts commit 7e8b01229d.
2010-07-30 19:58:31 -07:00
Iliyan Malchev 7e8b01229d system/core: add system/audio persmissions for /dev/audio*
Change-Id: If214241f8150f5ff6cce8b9a76c6c8e5bad9c35a
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-07-29 17:11:51 -07:00
Jean-Baptiste Queru 30be93c6e2 am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53'

* commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53':
  Userland support for VM interconnection
2010-07-29 15:55:34 -07:00
Jean-Baptiste Queru 60c8f863ca resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
2010-07-29 15:53:16 -07:00
Jean-Baptiste Queru 0fcbdb4147 Merge "Userland support for VM interconnection" 2010-07-29 15:04:57 -07:00
aimitakeshi e572d596b3 - Add drm and drmio service
- Add /data/drm directory for storing DRM related data

Change-Id: Ifd8922a3de109dbf5cd3f9cabbf4e5689b16c1d7
2010-07-27 08:38:35 +09:00
The Android Open Source Project 5687abe6ef am 544e1f86: merge from open-source master
Merge commit '544e1f866edcbe55b3d8f65d50bc831dfb818657'

* commit '544e1f866edcbe55b3d8f65d50bc831dfb818657':
  Fix sdcard mount issue.
2010-07-16 13:24:29 -07:00
The Android Open Source Project 544e1f866e merge from open-source master
Change-Id: I03f6a73a782706a7c77041db4e626c40dffa647a
2010-07-16 13:22:23 -07:00
Kenny Root f848a429dd resolved conflicts for merge of 3cac9cb3 to master
Change-Id: I86b5173ad49522eae082bf2a3d096dbfb5240129
2010-07-15 14:01:01 -07:00
Kenny Root c7858a3dde Add directories for OBB mounting
Change-Id: Ib73e9bca50fb168ab5d147cc260666a770092961
2010-07-15 12:39:53 -07:00
Ravi K Yenduri 2ee12e7a34 Fix sdcard mount issue.
Push vold.fstab on to the emulator, which is now denoted by
TARGET_PRODUCT=full.

Change-Id: I502af9b06903808fa2448c1013ddd8904f6000ca
2010-07-15 09:25:54 -05:00
Dries Harnie 2a743730c7 Userland support for VM interconnection
Change-Id: I699608f3072b39c8da1a7cc313bd0b736e90f225
2010-07-15 13:19:37 +02:00