Commit graph

794 commits

Author SHA1 Message Date
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