Commit Graph

1929 Commits

Author SHA1 Message Date
Brian Carlstrom
435e45e616 Move to KeyChain.bind
Change-Id: Ic12e84bdc2e391c4a08a0f854d0e0f7315fc31a3
2011-05-17 16:22:06 -07:00
Brian Carlstrom
2c1e9c7846 Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (5 of 6)" 2011-05-17 10:37:54 -07:00
Brian Carlstrom
9815429821 Make CertInstaller installed CA certs trusted by applications via default TrustManager (5 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: Ie329aafe88f6ebe108d25382f587c933f3244e55
2011-05-16 18:03:58 -07:00
Gilles Debunne
6019c7dcba Merge "Refactoring in memory storage stats" 2011-05-16 11:14:26 -07:00
Gilles Debunne
5162a23b21 Refactoring in memory storage stats
Removed hard coded NUM_MEDIA_DIRS_TRACKED - 1 in loops and used actual
constants instead to make it less brittle if we add more categories.

Change-Id: I51ce9e7faca1ee55cf369eedf9422628b9501e13
2011-05-13 14:23:52 -07:00
satok
722ea03231 Fix NPE in InputMethodAndLanguageSettings
Bug: 4422368

Change-Id: I495eb8de9928922b18b37c6658bd8fd8b4ee3e1a
2011-05-14 04:56:12 +09:00
Gilles Debunne
e3b5428611 Merge "Fixes in UsageBarPreference" 2011-05-13 11:17:45 -07:00
Jean Chalard
c087e35d7f Enable showing the user dictionary in several locales.
Bug: 3479738
Change-Id: Ic57a5675c44c36ad255f9927da151ad6a2a8c44c
2011-05-11 22:26:32 +09:00
Gilles Debunne
783be0a24f Fixes in UsageBarPreference
The widget layout that was used resulted in a clipped usage bar.
It also had a 6dip left offset inherited from the default layout
which adds margin after the text (even if the text is empty here).
Used a custom layout for the whole preference to fix this issue.

Other fixes in the drawing code to prevent accumulative rounding
issues.

Change-Id: Ief9bf85260345355615c9670624d86f0893eb2d2
2011-05-06 14:12:15 -07:00
Narayan Kamath
934d21dc2a Use the old TTS settings API for now.
Change-Id: I8ca3fcb0aee5572694e573f4ceaa0df261c807c3
2011-05-05 13:41:11 +01:00
Robert Greenwalt
0edf6a79a4 am d65d1adb: am 3c3490c8: Use new RouteInfo class.
* commit 'd65d1adb5613107583f0cf208d7650c822f581e2':
  Use new RouteInfo class.
2011-05-02 13:32:15 -07:00
Robert Greenwalt
d65d1adb56 am 3c3490c8: Use new RouteInfo class.
* commit '3c3490c819a1a6ce72468c1d867429ac0f86def8':
  Use new RouteInfo class.
2011-05-02 13:29:26 -07:00
Robert Greenwalt
3c3490c819 Use new RouteInfo class.
Change-Id: I144ebb87e6d1809f59ebd32e64e186d836a365f8
2011-04-29 17:13:44 -07:00
Jim Miller
5d9782a993 Merge "Fix 3402408: Manage "continue" button in ConfirmPassword screen" 2011-04-26 15:19:03 -07:00
Wink Saville
af3eb5fcba am ac706b98: am 2c3ec092: Remove getCurrentDataConnectionList.
* commit 'ac706b987bad5b46c4f10be0284ae1ed4453261b':
  Remove getCurrentDataConnectionList.
2011-04-20 11:41:26 -07:00
Wink Saville
ac706b987b am 2c3ec092: Remove getCurrentDataConnectionList.
* commit '2c3ec09261bf1503e75328175b5286af5676845e':
  Remove getCurrentDataConnectionList.
2011-04-20 11:32:53 -07:00
Wink Saville
2c3ec09261 Remove getCurrentDataConnectionList.
I'll add another mechanism which will probably use an
asynchronous interface with the DataConnectionTracker.

Change-Id: I71f80bb9fe0496c42ff9b1ddbf4e36a68d3f1592
2011-04-20 10:24:36 -07:00
Dianne Hackborn
6c28e35b82 Fix crash if no external storage.
Change-Id: If5b0386b686d65cf9026a3c00459db371ab81b3a
2011-04-20 10:19:05 -07:00
Bjorn Bringert
df92f2e1e2 Fix TTS engine checkbox click handler
Before, the dialog asking whether to really enable
the engine wasn't shown. Also, the Default engine
list was not refreshed until you left the TTS settings
and came back.

Change-Id: I8cbded0fe9eedbfb05c294d831c91a857349b224
2011-04-19 14:37:49 +01:00
Jim Miller
29c9073595 Fix 3402408: Manage "continue" button in ConfirmPassword screen
This disables the "continue" button until the user has entered at
least one character.

Change-Id: I3192e1789ba89031ac4cc90f388b32b7af19a445
2011-04-18 18:18:13 -07:00
Jim Miller
74b1e0a733 Fix 4283049: Restore continue/cancel buttons in LockScreen Settings
This fixes a bug where the continue/cancel buttons were missing
from LockScreen settings in landscape mode.

The change also includes a minor change to enable using the IME enter
key to proceed to the next step.

Change-Id: I2dca0b40e38a128cc0aa637f573da01e779edb73
2011-04-15 18:52:31 -07:00
Bjorn Bringert
c776297594 Use new TTS engine API in TTS settings
Requires TTS engine API added in
change I7614ff788e11f897e87052f684f1b4938d539fb7

Bug: 4148725
Change-Id: I5f3fa3bbcbf4e62af23bb701bcb6e8e5d8511341
2011-04-15 10:04:32 +01:00
Dianne Hackborn
b28c0c95c2 A few tweaks to the battery history chart.
Change-Id: Id133267592acf7a979a625704d2d922a24f5ff41
2011-04-13 18:22:37 -07:00
Glenn Kasten
dd02c5ba9d am 386185a3: am 315b452c: am 4f4ddaa8: Bug 4167061 remove debug code
* commit '386185a3754535cd75c35091135b2933e39872bd':
  Bug 4167061 remove debug code
2011-04-13 11:56:38 -07:00
Glenn Kasten
386185a375 am 315b452c: am 4f4ddaa8: Bug 4167061 remove debug code
* commit '315b452c322f2eeeeb0ec946e31656ca93b8c0a7':
  Bug 4167061 remove debug code
2011-04-13 11:51:59 -07:00
Glenn Kasten
315b452c32 am 4f4ddaa8: Bug 4167061 remove debug code
* commit '4f4ddaa823bfa7bd2fdff97338ff1839739925dd':
  Bug 4167061 remove debug code
2011-04-13 11:47:46 -07:00
Glenn Kasten
4f4ddaa823 Bug 4167061 remove debug code
Change-Id: I1a05b820030d503b4ae1a82789ad4607e46b43c0
2011-04-13 11:19:58 -07:00
Glenn Kasten
6a523c0816 am fc52971f: am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2
* commit 'fc52971f7e0e4409d4a78686e23a5e330e559fb8':
  HDCP debugging in setting app part 2 of 2
2011-04-11 12:49:00 -07:00
Glenn Kasten
fc52971f7e am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2
* commit 'b72f1b0f45401a3fb8abe8e5e40eb5eab12e2710':
  HDCP debugging in setting app part 2 of 2
2011-04-11 12:46:36 -07:00
Glenn Kasten
b72f1b0f45 am 858fd9a0: HDCP debugging in setting app part 2 of 2
* commit '858fd9a0302c6d34781133137a048a9bf668632a':
  HDCP debugging in setting app part 2 of 2
2011-04-11 12:43:22 -07:00
Glenn Kasten
858fd9a030 HDCP debugging in setting app part 2 of 2
Change-Id: I931c50938526adce521a7bf02301aba75abaacaf
2011-04-11 11:11:56 -07:00
Brian Carlstrom
5298d488b7 Merge "Tolerate missing AccountManager resource, not just missing resource name" 2011-04-08 10:28:37 -07:00
Joe Onorato
cedfdd9d17 Remove the deprecated things from Config.java. These havent been working since before 1.0.
Change-Id: I88ea860fd6edf7c128cf1a201329f09428ab382c
2011-04-07 18:41:13 -07:00
Brian Carlstrom
d26321eecb Tolerate missing AccountManager resource, not just missing resource name
Change-Id: I29ceed33a9cc8e697bfd3226f6ec58291c36daae
2011-04-07 11:58:39 -07:00
Joe Onorato
4c0c2bea9e advanced settings
Change-Id: Ibc3889e2ab0569f851ec46fe4d1cb1b4920ea5be
2011-04-06 18:26:20 -07:00
Kenny Root
5b12490abf am 42f178d1: resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp
* commit '42f178d10bcad0a8c04f20b2dfd2e3c28117a7cf':
  Settings: Improved UX when viewing open source license info.
2011-03-30 16:38:52 -07:00
Kenny Root
42f178d10b resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp
Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58
2011-03-30 09:36:40 -07:00
Kenny Root
70a1ff0357 am 7fceefa7: Merge "Settings: Improved UX when viewing open source license info."
* commit '7fceefa79229ece2efab0446841543a8f8f20a1d':
  Settings: Improved UX when viewing open source license info.
2011-03-29 15:43:38 -07:00
Henrik Carlsson
2cb19ab9e2 Settings: Improved UX when viewing open source license info.
Added spinning progress indicator to the open source license dialog.
The actual file loading is now handled by a separate thread, in
order to provide user feedback and reduce risk for ANR.

Change-Id: Ia12727ecc2fe8114e0d1384769b568142c8a1db6
2011-03-29 15:02:44 -07:00
Jake Hamby
c4d9d80906 am 823a6ee9: am e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1
* commit '823a6ee9ec95e0278ae77b37392c873e86bfe071':
  Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
2011-03-29 13:36:41 -07:00
Jake Hamby
e9fdee0ed0 am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1
* commit '81cb6be834f4604f6b58d8516f2b8e12620a3d16':
  Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
2011-03-29 13:31:54 -07:00
Jake Hamby
f1139aab80 Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
Fix NPE when entering Settings app in the SDK (and for devices without
Bluetooth). Also remove the "Bluetooth settings" item in addition to
the Bluetooth toggle item from Wireless settings when BT is missing.

Bug: 4149307
Change-Id: Iecc5960a193cf88664d3217b4d7bdbc2276dabc0
2011-03-28 20:25:23 -07:00
Amith Yamasani
1dd8c92ccc am ce0976cc: am 2ba97451: am f3b325f5: Debug feature for HDCP compliance testing.
* commit 'ce0976cccd8a283689b15e33ce2cfaf819620bf6':
  Debug feature for HDCP compliance testing.
2011-03-23 16:03:34 -07:00
Amith Yamasani
2ba9745180 am f3b325f5: Debug feature for HDCP compliance testing.
* commit 'f3b325f54dadb482d73111ab17cf6a51784de11a':
  Debug feature for HDCP compliance testing.
2011-03-23 15:47:40 -07:00
Amith Yamasani
f3b325f54d Debug feature for HDCP compliance testing.
Bug: 4149811

Add a setting in Application->Development to change HDCP checking.

Change-Id: I5561b097b3fd7dbfc4eaf1977b80a37fc29572aa
2011-03-23 14:39:43 -07:00
Irfan Sheriff
d69210326d am d6f9c32b: am e2d30184: am 6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1
* commit 'd6f9c32b5691d62c157a30e295211114d401a8d9':
  Fix ANR with bypass proxy regex
2011-03-22 19:36:15 -07:00
Irfan Sheriff
e2d3018428 am 6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1
* commit '6864195aa0195831a0cfbe92cd37f76c09df43b8':
  Fix ANR with bypass proxy regex
2011-03-22 19:33:16 -07:00
Irfan Sheriff
ae3ccfd07e Fix ANR with bypass proxy regex
Bug: 4148297
Change-Id: I5519ed297acabb65e1992c65e4b4110380983bb1
2011-03-22 17:57:44 -07:00
Dianne Hackborn
48147dca83 Update to follow API change.
Change-Id: I4d65d3a8847597cdb390c22f0ee20bd5ce028509
2011-03-18 12:29:41 -07:00
Justin Ho
06fd4b0681 am 7f9f83fc: am dce7719c: am dc4f7ac4: Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1
* commit '7f9f83fc894f46cc55cc1927e33160d3492382bb':
  Flip the icon states for Bluetooth profile auto-connect settings
2011-03-15 23:50:31 -07:00