Commit graph

2751 commits

Author SHA1 Message Date
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
Jean-Baptiste Queru
98c68bd7c7 am 34df17d0: am 7078f776: Merge "cutils: add popcount/popcountl/popcountll static inline definitions"
* commit '34df17d03289cee83cee176807c9390b084d77b9':
  cutils: add popcount/popcountl/popcountll static inline definitions
2011-05-12 10:49:19 -07:00
Jean-Baptiste Queru
34df17d032 am 7078f776: Merge "cutils: add popcount/popcountl/popcountll static inline definitions"
* commit '7078f776fd658f86ecb249eeffc6e7cb0c4ae66a':
  cutils: add popcount/popcountl/popcountll static inline definitions
2011-05-12 10:44:52 -07:00
Jean-Baptiste Queru
7078f776fd Merge "cutils: add popcount/popcountl/popcountll static inline definitions" 2011-05-12 10:28:08 -07:00
Dima Zavin
4af1cf2bd7 cutils: add popcount/popcountl/popcountll static inline definitions
Just pass them through to their specific GCC builtins. If we find
that the builtins are not performing well or have other issues, we can
pull in existing public implementations and/or write arch-specific
helpers if necessary.

Change-Id: I278e6b73d75fac88808ed4546070d288c06f79e0
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-12 08:41:49 -07:00
Nick Kralevich
57de8b8f27 rename uevent_checked_recv to uevent_kernel_multicast_recv
Change-Id: I1839627490080efcbb7269699709064856312f8b
2011-05-11 14:58:24 -07:00
Nick Kralevich
9b7ee137e0 Merge "NetlinkListener: eliminate duplicate code" 2011-05-11 14:34:52 -07:00
Christopher Tate
574ebc41f8 Merge "Add 'adb backup' for pulling a full backup tarfile to the host" 2011-05-11 12:51:14 -07:00
Omari Stephens
8bbae23915 Add a 1000msec timeout for adb's USB control packets
Includes a version bump to make it possible to determine if a given
binary has this fix or not.

Bug: 4111855
Change-Id: I86d902a7fa0c4b906264141d2467b7bdddb61801
2011-05-09 19:14:24 -07:00
The Android Automerger
d76921e7be merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-05-07 01:33:49 -07:00
Irfan Sheriff
91a9b45215 DO NOT MERGE DHCP changes from master
Pick dhcp changes from master for the renewal fixes

Bug: 3344732
Change-Id: I42596513f3ef936ef7160d954e3bd26bc51662c8
2011-05-06 16:16:51 -07:00
The Android Automerger
387f6904d1 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-05-05 17:04:51 -07:00
The Android Automerger
5f14f4f52a merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-05-05 15:28:53 -07:00
The Android Automerger
69e26b8f30 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-05-04 15:57:22 -07:00
The Android Automerger
16293716e3 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-05-03 13:54:15 -07:00
Iliyan Malchev
0ab886bdab move ANativeWindow and friends under system/core
This patch moves the definition of ANativeWindow from frameworks/base into
system/core.  We move ANativeWindow for two reasons.

Firstly, the native-window interface may need to be used by lower-level code
than the framework.  Such code (such as the camera HAL) is not allowed to use
definitions from frameworks/base, since the latter is stacked on top of the
former.  Thus moving (the interface definition) ANativeWindow under system/core
lowers the level at which we can work with windows.

Secondly, this enables an implementation of ANativeWindow that lies outside of
frameworks, enabling quick initial bringup of graphics.

Change-Id: I851b9bb2834bcec73255b5af82f66411e54bb1a5
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-02 19:19:54 -07:00
Iliyan Malchev
66ea3574b6 move non-HAL definitions to syste/core/include
This patch moves camera- and graphics-related definitions out of the hardware
HAL layer and into system/core.  These definitions are used both by the HAL and
by higher-level code as well.  More functionality (e.g., audio definitions)
will be moved here as well.

Change-Id: I225f12374ce54fa393640dce53738267d0d703e9
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-02 19:18:46 -07:00
Iliyan Malchev
3ffd793a1d native_handle.h: fix declaration
Change-Id: I452a517ee6982995318802eb4bbb23bd79401c4d
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-02 17:27:37 -07:00
Irfan Sheriff
cd28c40841 am c951695e: (-s ours) am 3746be26: DHCP changes from master
* commit 'c951695ede6636955965d358454a23752c554da6':
  DHCP changes from master
2011-05-02 12:20:21 -07:00
Irfan Sheriff
c951695ede am 3746be26: DHCP changes from master
* commit '3746be268c1b70ebbf0dee6ed21b7efb479414c9':
  DHCP changes from master
2011-05-02 12:03:12 -07:00
Irfan Sheriff
3746be268c DHCP changes from master
Pick dhcp changes from master for the renewal fixes

Bug: 3344732
Change-Id: Ie49cd11f74cf89e9edf2d1c788a699ce0996190d
2011-04-30 12:59:51 -07:00
Nick Kralevich
531312e491 NetlinkListener: eliminate duplicate code
The checks in this code duplicate uevent_checked_recv().
Use that instead.

Change-Id: I2c48bcf4372f0975c27a63d929cae73e16422faf
2011-04-29 16:49:22 -07:00
Nick Kralevich
fdbbdc4ecd am 943ae2ce: am fe6bfb12: am a8728ee0: (-s ours) Merge "libsysutils: only accept uevents from the kernel."
* commit '943ae2ceb7260236fd3cbcc0877edcee48bed4a1':
  libsysutils: only accept uevents from the kernel.
2011-04-29 15:11:14 -07:00
The Android Automerger
6e90ecf2d3 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-04-29 15:09:21 -07:00
Nick Kralevich
943ae2ceb7 am fe6bfb12: am a8728ee0: (-s ours) Merge "libsysutils: only accept uevents from the kernel."
* commit 'fe6bfb1285f8c784e0700d03f0f3657ba126e6c4':
  libsysutils: only accept uevents from the kernel.
2011-04-29 14:54:40 -07:00
David 'Digit' Turner
affee0eb10 am 7db617ef: resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp
* commit '7db617efc079ccc1f384ef7939f7e8c444dfff7a':
  ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
2011-04-29 12:58:31 -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
The Android Automerger
2d7a35fb78 merge in honeycomb-mr1-release history after reset to honeycomb-mr1 2011-04-28 16:12:57 -07:00
Erik Gilling
b3d7785217 Merge "add r to eng and userdebug builds" 2011-04-28 15:58:44 -07:00