51237 Commits

Author SHA1 Message Date
Guang Zhu
97499df874 change how test sets timeout for webkit dump
there are cases where webkit dump timed out, but a RuntimeException
was not thrown (as it should have) after the timeout limit was
reached. It's probably because the Looper message to invoke time
out is obtained after the message to dump webview. This change
adjusts the order of obtaining the message so hopefully it can make
the timeout work for real.

Change-Id: I4197699f5aad765c88dc81123d052e4c49d7c53d
2011-05-16 11:06:53 -07:00
Dianne Hackborn
2a20583a5f am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
* commit '700ab1c75862babba90f54e02bdc877becd4f4fc':
  DO NOT MERGE.  Integrate from master: Improve activity manager debug dumps.
2011-05-16 11:06:28 -07:00
Dirk Dougherty
4bfc1cc0a9 am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit '8b8bfc5d28d9746bf30b2de45f879d9481b07d6f':
  Doc change: typo fix
2011-05-16 11:03:56 -07:00
Scott Main
81dd428d70 am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist
* commit '582c1361e8a6443812a97f18094be1f8279645a0':
  docs: update featured videos and increase the max results for each playlist
2011-05-16 11:03:53 -07:00
Dianne Hackborn
700ab1c758 Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 2011-05-16 11:02:29 -07:00
Dirk Dougherty
8b8bfc5d28 am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit 'babf844f4606f07de0e3349b5847faa2f8f208cc':
  Doc change: typo fix
2011-05-16 11:01:44 -07:00
Scott Main
582c1361e8 am 5eba0e98: docs: update featured videos and increase the max results for each playlist
* commit '5eba0e98d1f7ed8f9d04a44adb8d8a37ef7f4659':
  docs: update featured videos and increase the max results for each playlist
2011-05-16 11:01:42 -07:00
Fabrice Di Meglio
35844a3a4e Merge "Fix bug #4415576 Gmail text looks broken" 2011-05-16 11:00:02 -07:00
Dirk Dougherty
babf844f46 Merge "Doc change: typo fix" into honeycomb-mr1 2011-05-16 10:59:00 -07:00
Scott Main
5eba0e98d1 docs: update featured videos and increase the max results for each playlist
Change-Id: I8d7a547960ed5bae4ea2eec9e8bac14c421d3746
2011-05-16 10:56:26 -07:00
Andreas Huber
9f4b95b92e Merge "Fix module tags on stagefright software decoders." 2011-05-16 10:47:50 -07:00
James Dong
637ca640ad Merge "Support platform and camera dependent recording start time offset" 2011-05-16 10:46:33 -07:00
Dirk Dougherty
58610ba382 Doc change: typo fix
Change-Id: I078cb313c02b37571b573f4fb4e68e11c45cc271
2011-05-16 10:41:34 -07:00
Scott Main
a987eddc51 am 8e3fdf81: am fa5a08be: am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel
* commit '8e3fdf812b7684727d69b7326a02d7fdf8472e3f':
  docs: add oem driver for alcatel
2011-05-16 10:40:56 -07:00
Scott Main
8e3fdf812b am fa5a08be: am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel
* commit 'fa5a08beed19f05b1946db55bd3ff9c13600f9f4':
  docs: add oem driver for alcatel
2011-05-16 10:37:33 -07:00
Scott Main
fa5a08beed am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel
* commit '1ff0131e77e625af3100720a3552dc1f4064421d':
  docs: add oem driver for alcatel
2011-05-16 10:24:28 -07:00
Scott Main
1ff0131e77 am fc0ea7ea: docs: add oem driver for alcatel
* commit 'fc0ea7ea5de429d9eea7f13bca42b98081d38dc5':
  docs: add oem driver for alcatel
2011-05-16 10:20:59 -07:00
Scott Main
fc0ea7ea5d docs: add oem driver for alcatel
Change-Id: I429583a3f2f4f91a6ffa21367b474f537ad28c96
2011-05-16 09:52:45 -07:00
Andreas Huber
6521ec7b91 Fix module tags on stagefright software decoders.
Change-Id: I8b3f60760e1e8eaa0f66eb6c7ce3df8e425638fb
related-to-bug: 4427361
2011-05-16 09:41:06 -07:00
Ben Murdoch
f4fea9a903 Merge WebKit at r75993: Update Makefiles
Update BrowserPlugin makefile post WebKit source code
move.

Change-Id: I5c8e1f4db80fc066171e6ddd74b0a5e61beadb3d
2011-05-16 11:58:21 +01:00
Wink Saville
7b06e3516c am 7a2a87d6: am a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
* commit '7a2a87d6457885c5d3d4dbf335be101aa9c5c3ab':
  Support for Vendor RIL dump of baseband logs
2011-05-15 14:47:45 -07:00
Wink Saville
32ebca5ba2 am 58779700: am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
* commit '58779700df18d52edf1102c6fcb3731f28d37a94':
  Telephony: Handle Icc Status Changed Event.
2011-05-15 14:47:42 -07:00
Wink Saville
7a2a87d645 am a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
* commit 'a1c29d30f342c2d3dbf7022f1b130934c2519b81':
  Support for Vendor RIL dump of baseband logs
2011-05-15 14:43:52 -07:00
Wink Saville
58779700df am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
* commit '92cc1d20ae0e3dc7e0618027967145e26c1cb6e2':
  Telephony: Handle Icc Status Changed Event.
2011-05-15 14:43:49 -07:00
Wink Saville
a1c29d30f3 Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE 2011-05-15 14:39:16 -07:00
Wink Saville
92cc1d20ae Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE 2011-05-15 14:38:59 -07:00
Robert Greenwalt
859b72bb18 am a71a81b6: am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
* commit 'a71a81b69a6e5757ff29f083783a4b704b6a9ae9':
  Fix bevhavior of fetchDunApn.
2011-05-15 08:14:17 -07:00
Robert Greenwalt
a71a81b69a am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
* commit '9713e3c60def9d755ae828d389fced4793a3c86a':
  Fix bevhavior of fetchDunApn.
2011-05-15 08:03:46 -07:00
Robert Greenwalt
9713e3c60d Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE 2011-05-15 07:53:50 -07:00
Brian Carlstrom
2627d53f65 Make CertInstaller installed CA certs trusted by applications via default TrustManager (1 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 directroy for system.
    Added support for removeing 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 algortims 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

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: I2e4b169cbb35d32d97f5d6a00d988fa389eadcb2
2011-05-14 23:45:16 -07:00
John Michelau
71bbe7a87c Support for Vendor RIL dump of baseband logs
Added hook for Vendor RIL to provide a dump of the underlying
baseband's logs.  The Vendor RIL must implement the actual executable
that does the capture.

Change-Id: I40fdf2ccc4bb14a9cef92b7866fad19684502524
2011-05-14 18:54:47 -07:00
Ramesh Sudini
3ce5de7fe2 Telephony: Handle Icc Status Changed Event.
Change-Id: I8203d3b863ea9a27251823d3fed209673c45206c
2011-05-14 18:36:11 -07:00
Robert Greenwalt
2b5a3ec757 Fix bevhavior of fetchDunApn.
If nothing secure is set let us fall back to use general APN db entries.

Change-Id: Ic6908dd301c432c11a6f773e06dd6e207d45a037
2011-05-14 12:07:50 -07:00
Wink Saville
444889838c am d0903e14: am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
* commit 'd0903e1478c7ba2fb8087f1bae1fba69791039ba':
  TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
2011-05-14 07:50:40 -07:00
Wink Saville
d0903e1478 am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
* commit '6e41b32dd08a866cb7158b387646e96c9105831b':
  TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
2011-05-14 07:43:00 -07:00
Wink Saville
6e41b32dd0 Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE 2011-05-14 07:35:21 -07:00
James Dong
13a33169b7 Support platform and camera dependent recording start time offset
related-to-bug: 4390777

Change-Id: Icb52973ad4ac716f04fb103ef527915a966d06d5
2011-05-14 07:18:43 -07:00
Wink Saville
71f6cb1324 TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
The use of FLAG_RECEIVER_REPLACE_PENDING is an optimization to reduce
redundant messages. For some calls this is fine, such as
broadcastSignalStrengthChanged. For others it can cause problems, such
as broadcastDataConnectionStateChanged where the MobileDataStateTracker
will not be able to properly track the state if messages are dropped.
This changes removes the optimization from all methods in
TelephonyRegistry except broadcastSignalStrengthChanged.

bug: 4427303
Change-Id: Ia9c0dd0ce66b8b3dcda770f5ab2c63cf08f3ebfc
2011-05-14 06:51:21 -07:00
Scott Main
bbdc834a56 am ebb7d863: am 3cd61e2b: am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit 'ebb7d8630cc9a13563fe7fc36a6f00a8924085b8':
  docs: update homepage I/O announcement
2011-05-13 20:37:02 -07:00
Scott Main
ebb7d8630c am 3cd61e2b: am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '3cd61e2bca2df05a9ad3679c7456b077f2d04f2b':
  docs: update homepage I/O announcement
2011-05-13 20:34:11 -07:00
Scott Main
3cd61e2bca am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '084d3490a5283088426058d3c15532b176367926':
  docs: update homepage I/O announcement
2011-05-13 20:32:32 -07:00
Scott Main
084d3490a5 am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit 'f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
  docs: update homepage I/O announcement
2011-05-13 20:29:45 -07:00
Scott Main
f73dcad35d Merge "docs: update homepage I/O announcement" into honeycomb-mr1 2011-05-13 20:26:56 -07:00
Fabrice Di Meglio
8fb507171f Fix bug #4415576 Gmail text looks broken
- pass correct "contextCount" when needed

Change-Id: I56ebd9486e99e6ca5a3973ec403cf1ced874b4c3
2011-05-13 18:58:59 -07:00
Jeff Sharkey
262c177b1b Merge "Add Socket tagging for granular data accounting." 2011-05-13 18:51:36 -07:00
Dianne Hackborn
510f9eb242 am 24df0757: (-s ours) am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
* commit '24df0757f86851569b65dadd0dfa139521748b9c':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:43:14 -07:00
Dianne Hackborn
24df0757f8 am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
* commit 'ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:41:04 -07:00
Dianne Hackborn
ed9321ab5d am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
* commit 'f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:39:01 -07:00
Dianne Hackborn
9a84983a9f DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem.  Also lots of general cleanup of the am
dump output.

Change-Id: I99447b87f77a701af52aeca984d93dfe931f065d
2011-05-13 18:38:19 -07:00
Dianne Hackborn
f9dd34f4d3 DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
And clean up some documentation.

Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
2011-05-13 18:31:04 -07:00