Commit Graph

2578 Commits

Author SHA1 Message Date
Mike Lockwood 2c4d5dc415 init: Add support for writing system property value to a file in init.rc
The write command will write a property value if the value starts with a "$'

For example:
    write /sys/class/android_usb/iSerial $ro.serialno

Use double leading '$' if you need to write a string that starts with '$':

    write /data/foo $$hello

to write "$hello" to /data/foo

Change-Id: I55431ac7715a5347bb95c3a15aee97c575444dde
2011-06-09 15:42:31 -07:00
David 'Digit' Turner b36f136738 am c324ee6a: am 06fcf938: Merge "run-as: Bump the size of the internal packages list buffer."
* commit 'c324ee6a838e4d87362de6af8d741a85efa8dd39':
  run-as: Bump the size of the internal packages list buffer.
2011-06-08 14:56:58 -07:00
David 'Digit' Turner c324ee6a83 am 06fcf938: Merge "run-as: Bump the size of the internal packages list buffer."
* commit '06fcf938feaf02aa3cbf99e1ee08fe8e8335cb1c':
  run-as: Bump the size of the internal packages list buffer.
2011-06-07 13:25:19 -07:00
David 'Digit' Turner 06fcf938fe Merge "run-as: Bump the size of the internal packages list buffer." 2011-06-06 12:35:30 -07:00
David 'Digit' Turner 93d81ef7a1 run-as: Bump the size of the internal packages list buffer.
This patch increases the size of the internal buffer used by run-as
to store the content of /data/system/packages.list from 8KB to 64KB.

It has been reported that, on some systems, 8KB was too small. This
resulted in a truncated file being loaded, and the inability to debug
native applications properly (either because the application was not
found in the list, or because the tool reported a 'corrupted
installation' due to BAD_FORMAT issues when parsing the truncated
file).

See http://code.google.com/p/android/issues/detail?id=16391

Change-Id: I0c35a61b163c4abc6f1a2681adc0ef0d76493171
2011-06-06 12:43:01 +02:00
Christopher Tate c9cd3b9761 Make 'adb backup' -f handling more bulletproof and more flexible
* "adb backup" as the entire command line no longer crashes

* The "-f filename" option can now appear anywhere in the command line.
  A trailing "-f" at EOL prompts an error message and usage summary.

Change-Id: I040ed73c2ca3687e265e35600eb3ab2b3c879695
2011-06-01 17:56:23 -07:00
Ken Sumrall 211ce13432 Merge "Teach the mount command in init to not consider a wiped partition to be encrypted." 2011-05-27 16:13:43 -07:00
Eric Laurent 3142a203b3 Merge "Config utils improvement" 2011-05-27 10:20:00 -07:00
Eric Laurent 38d14f7604 Merge "Added PCM formats to audio.h" 2011-05-27 10:19:43 -07: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
Ken Sumrall 7bc6e9ebe4 Teach the mount command in init to not consider a wiped partition to be encrypted.
Change-Id: I3e989f0b81ec35084baddc04e014406f4d90ce04
2011-05-26 20:01:39 -07:00
Ken Sumrall e555f54965 Merge "Crypto changes for devices that don't write ext4 fs on wipe" 2011-05-26 20:01:19 -07:00
Ken Sumrall b05b0b5d3b Crypto changes for devices that don't write ext4 fs on wipe
This adds a new function to libcutils, partition_wiped().
This is used to determine if a partition is wiped.

Change-Id: Ibb388976c6b5bd3923b62d8f79b2b97748abf6c1
2011-05-26 19:42:32 -07:00
Eric Laurent c3cf1a8278 Config utils improvement
Added a function to free resources allocated by config node tree.

Change-Id: I2ee8ae642899ec4501fa6e490c5be7efaa2d738e
2011-05-26 13:57:03 -07:00
Eric Laurent 9714b27bb4 Added PCM formats to audio.h
Added formats for 32 bit PCM audio to allow direct use of
common audio formats defined in audio.h by audio effect
API defined in audio_effect.h

Change-Id: I5d58c2db8325ca625ab6d2b10cc0d422ba119ca5
2011-05-26 13:52:47 -07:00
Nick Kralevich 7956d759be Merge "rename uevent_checked_recv to uevent_kernel_multicast_recv" 2011-05-26 10:55:09 -07:00
Robert Greenwalt b6b48ae47a Revert some of change 109925 to fix connectivity
bug:4476009
Change-Id: I93c492eebe24d9744b8ef79378c73301d167f5a3
2011-05-25 21:22:56 -07:00
tedbo 1ffdb38213 Fix broken comment on closing #endif in window.h
The closing #endif comment is missing the comment delimiters. This
change adds them and fixes a compile warning about extra tokens after
endif.

Change-Id: If8295aa6fbb2b21c2b56fe57a467dcde79c65de3
2011-05-24 00:55:33 -07:00
Joe Bass 2bc503e6a9 am 0efe2f2f: am b27c682e: am f5144d34: Add Gigabyte\'s USB vendor ID to adb.
* commit '0efe2f2f11d79060962f35a3fb4db525d3f12e9e':
  Add Gigabyte's USB vendor ID to adb.
2011-05-21 21:35:49 -07:00
Joe Bass 0efe2f2f11 am b27c682e: am f5144d34: Add Gigabyte\'s USB vendor ID to adb.
* commit 'b27c682e28a01b18f7506a9b35222453058107ad':
  Add Gigabyte's USB vendor ID to adb.
2011-05-20 16:14:13 -07:00
Christopher Tate 5526ee0831 Merge "Add 'adb restore' to parallel 'adb backup'" 2011-05-20 15:36:55 -07:00
Joe Bass b27c682e28 am f5144d34: Add Gigabyte\'s USB vendor ID to adb.
* commit 'f5144d34fac074b134722b1fdb6149eb11eff420':
  Add Gigabyte's USB vendor ID to adb.
2011-05-20 15:06:56 -07:00
The Android Open Source Project ac54557b76 Reconcile with gingerbread-release honeycomb-release honeycomb-mr1-release
Change-Id: I673f0a6cc6425eadd0be9ba977be8d499f50ffda
2011-05-20 14:19:44 -07:00
Joe Bass f5144d34fa Add Gigabyte's USB vendor ID to adb.
Bug #4452872

Change-Id: Ib97548d121d40e96ccc519323a335fc90f3b32b9
2011-05-19 11:40:23 -07:00
Xavier Ducrohet aff5d7870e am 44c336bf: am 830fc9af: am 30d916c3: Add Funai\'s USB vendor ID to adb.
* commit '44c336bfe9bbd400461b9b28a449a67145eaeeb8':
  Add Funai's USB vendor ID to adb.
2011-05-19 08:57:55 -07:00
Robert Greenwalt ab86504f58 am 61e33b33: am aded02cb: Merge "Add v4/v6 route add/removal support" into honeycomb-LTE
* commit '61e33b338cbb90c34cb3e07fe55edcc08c6ce3b8':
  Add v4/v6 route add/removal support
2011-05-19 07:21:22 -07:00
Xavier Ducrohet 44c336bfe9 am 830fc9af: am 30d916c3: Add Funai\'s USB vendor ID to adb.
* commit '830fc9afbe3e83b3b39278d67a9680bb2068098a':
  Add Funai's USB vendor ID to adb.
2011-05-18 17:41:21 -07:00
Xavier Ducrohet 830fc9afbe am 30d916c3: Add Funai\'s USB vendor ID to adb.
* commit '30d916c360d4d49658b9b305b17568b37fcb1029':
  Add Funai's USB vendor ID to adb.
2011-05-18 17:37:27 -07:00
Jamie Gennis aef403e917 Merge "fix a comment typo in system/graphics.h" 2011-05-18 17:11:51 -07:00
Xavier Ducrohet 30d916c360 Add Funai's USB vendor ID to adb.
Change-Id: Idc2974d4437ab1c79cfea5aade98b599a877aad3
2011-05-18 16:57:26 -07:00
Robert Greenwalt 61e33b338c am aded02cb: Merge "Add v4/v6 route add/removal support" into honeycomb-LTE
* commit 'aded02cbd04320a200b0dd47f92b467a211a0234':
  Add v4/v6 route add/removal support
2011-05-18 16:29:59 -07:00
Robert Greenwalt aded02cbd0 Merge "Add v4/v6 route add/removal support" into honeycomb-LTE 2011-05-18 15:29:35 -07:00
Jamie Gennis da1a1f629b fix a comment typo in system/graphics.h
Change-Id: Ia6471a1c005cdc13833e6b0444e758add5a990e0
2011-05-18 14:42:46 -07:00
Christopher Tate 702967afb1 Add 'adb restore' to parallel 'adb backup'
It won't actually do anything until the 'bu' tool and framework are
updated to respond properly, but this is the adb side of the
necessary infrastructure: we copy the tarfile into the socket pointed
at the device, using the existing mechanisms.

Change-Id: Ic3b5779ade256bd1ad989a94b0685f7b1a7d59d2
2011-05-17 15:52:54 -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
Christopher Tate 024447c3c3 Use the new 'bu' syntax for backup vs restore operation
Change-Id: Ib007705ee562a41869f8add3408101b3a53aa2d7
2011-05-16 16:28:59 -07:00
Omari Stephens 35e6a003ca Merge "Add a 1000msec timeout for adb's USB control packets" 2011-05-16 15:42:26 -07:00
Chia-chi Yeh ef1e9bf9db Merge "Update the device permission of /dev/tun." 2011-05-16 09:41:56 -07:00
Robert Greenwalt 021d0a2e7c Add v4/v6 route add/removal support
Change-Id: I259a3be4fe473dff75336139c9584d2c5ab27b2d
2011-05-15 10:48:08 -07:00
Jean-Baptiste Queru 7c0ece0531 am 860f98af: am 327b2b70: Merge "move core audio definitions under system/core"
* commit '860f98afe175667d2f72f7a5e8b1bf58bfdf96ea':
  move core audio definitions under system/core
2011-05-13 15:22:08 -07:00
The Android Automerger 76dd724717 merge in gingerbread-release history after reset to gingerbread 2011-05-13 14:27:34 -07:00
Jean-Baptiste Queru 860f98afe1 am 327b2b70: Merge "move core audio definitions under system/core"
* commit '327b2b709f1c9ed119b2d87cd95d4a5367fe0338':
  move core audio definitions under system/core
2011-05-13 10:47:38 -07:00
Jean-Baptiste Queru 327b2b709f Merge "move core audio definitions under system/core" 2011-05-13 10:11:17 -07:00
Dima Zavin 253b598dc0 move core audio definitions under system/core
Change-Id: I58b7324edff834b3afa4d9c86452e66f8c29c63b
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-13 08:46:13 -07:00
Irfan Sheriff 0913936a57 am 37737d83: (-s ours) am d4f87e71: am 91a9b452: DO NOT MERGE DHCP changes from master
* commit '37737d8386a8f4349dd6ce9a06a3ed95fcde8b9e':
  DO NOT MERGE DHCP changes from master
2011-05-12 17:42:04 -07:00
Irfan Sheriff 37737d8386 am d4f87e71: am 91a9b452: DO NOT MERGE DHCP changes from master
* commit 'd4f87e718d2b72c302bf641c5ed7fa7b7f3ca951':
  DO NOT MERGE DHCP changes from master
2011-05-12 17:39:15 -07:00
Irfan Sheriff d4f87e718d am 91a9b452: DO NOT MERGE DHCP changes from master
* commit '91a9b452152f3c147f5356f0d2f503a664bd2a46':
  DO NOT MERGE DHCP changes from master
2011-05-12 17:35:18 -07:00
Chia-chi Yeh 69f43c90cb Update the device permission of /dev/tun.
Change-Id: Ie8ad60047fc7160997100bd28a0abb439406806a
2011-05-12 13:43:34 -07:00
Dima Zavin e8e4be57aa move core audio definitions under system/core
Change-Id: I58b7324edff834b3afa4d9c86452e66f8c29c63b
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-12 11:58:48 -07:00