Commit Graph

34845 Commits

Author SHA1 Message Date
Jeff Sharkey
a80c573c55 Merge "Collect historical network stats." 2011-06-01 17:54:37 -07:00
Adam Powell
b4e8071d29 Merge "Implement bug 4500971 - Collapsable action views" 2011-06-01 17:50:13 -07:00
Fabrice Di Meglio
f830e31a66 Merge "Fix bug #4509967 (layout_gravity not always respected)" 2011-06-01 17:40:11 -07:00
Daniel Lehmann
d08487c2b5 Merge "Enable strict mode as a public api to catch sql injections" 2011-06-01 17:30:50 -07:00
Jeff Sharkey
edb4fc5c07 Merge "Policy and rules work for ConnectivityManager." 2011-06-01 17:18:15 -07:00
Yu Shan Emily Lau
defc0b644f Merge "Convert the video editor performance test suite output from float to int." 2011-06-01 17:13:30 -07:00
Christopher Tate
bb44b1a800 Merge "Filter backup/restore confirmation buttons when obscured" 2011-06-01 16:55:31 -07:00
Brett Chabot
7d172f221b Merge "Move bluetooth tests to their own package." 2011-06-01 16:08:20 -07:00
Andy Stadler
cee14799fb Merge "Use unchecked admin lookup for getStorageEncryption()" 2011-06-01 15:59:58 -07:00
Teng-Hui Zhu
60b8629f91 Merge "Correctly detect when switching back from full screen" 2011-06-01 15:53:18 -07:00
Brian Carlstrom
4173e4e251 Merge "Restore ResponseCodes for use with getLastError" 2011-06-01 15:31:46 -07:00
Glenn Kasten
69b1b54ab8 Merge "Revert "Use AudioTrack::event_type not int in callback"" 2011-06-01 15:22:49 -07:00
Fabrice Di Meglio
a91b1b9a08 Merge "Fix View default horizontal direction" 2011-06-01 15:16:41 -07:00
Christopher Tate
27c791b80b Merge "Restore from a previous full backup's tarfile" 2011-06-01 15:14:36 -07:00
Christopher Tate
15e113033b Restore from a previous full backup's tarfile
Usage:  adb restore [tarfilename]

Restores app data [and installs the apps if necessary from the backup
file] captured in a previous invocation of 'adb backup'.  The user
must explicitly acknowledge the action on-device before it is allowed
to proceed; this prevents any "invisible" pushes of content from the
host to the device.

Known issues:

* The settings databases and wallpaper are saved/restored, but lots
  of other system state is not yet captured in the full backup.  This
  means that for practical purposes this is usable for 3rd party
  apps at present but not for full-system cloning/imaging.

Change-Id: I0c748b645845e7c9178e30bf142857861a64efd3
2011-06-01 15:09:55 -07:00
Romain Guy
0ac00a6a05 Merge "Add support to OpenGLRendere to draw BiDi text. Bug #4350336" 2011-06-01 14:56:19 -07:00
Glenn Kasten
7d760d8890 Merge "Use AudioTrack::event_type not int in callback" 2011-06-01 14:40:45 -07:00
Brian Carlstrom
dd52a45b8f Merge "Integrating keystore with keyguard (Part 1 of 4)" 2011-06-01 14:33:31 -07:00
Brian Carlstrom
0137377289 Integrating keystore with keyguard (Part 1 of 4)
Summary:

frameworks/base
  keystore rewrite
  keyguard integration with keystore on keyguard entry or keyguard change
  KeyStore API simplification

packages/apps/Settings
  Removed com.android.credentials.SET_PASSWORD intent support
  Added keyguard requirement for keystore use

packages/apps/CertInstaller
  Tracking KeyStore API changes
  Fix for NPE in CertInstaller when certificate lacks basic constraints

packages/apps/KeyChain
  Tracking KeyStore API changes

Details:

frameworks/base

   Move keystore from C to C++ while rewriting password
   implementation. Removed global variables. Added many comments.

	cmds/keystore/Android.mk
	cmds/keystore/keystore.h
	cmds/keystore/keystore.c => cmds/keystore/keystore.cpp
	cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp

   Changed saveLockPattern and saveLockPassword to notify the keystore
   on changes so that the keystore master key can be reencrypted when
   the keyguard changes.

	core/java/com/android/internal/widget/LockPatternUtils.java

   Changed unlock screens to pass values for keystore unlock or initialization

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java

   KeyStore API changes
   - renamed test() to state(), which now return a State enum
   - made APIs with byte[] key arguments private
   - added new KeyStore.isEmpty used to determine if a keyguard is required

	keystore/java/android/security/KeyStore.java

   In addition to tracking KeyStore API changes, added new testIsEmpty
   and improved some existing tests to validate expect values.

	keystore/tests/src/android/security/KeyStoreTest.java

packages/apps/Settings

    Removing com.android.credentials.SET_PASSWORD intent with the
    removal of the ability to set an explicit keystore password now
    that the keyguard value is used. Changed to ensure keyguard is
    enabled for keystore install or unlock. Cleaned up interwoven
    dialog handing into discrete dialog helper classes.

	AndroidManifest.xml
	src/com/android/settings/CredentialStorage.java

    Remove layout for entering new password

	res/layout/credentials_dialog.xml

    Remove enable credentials checkbox

	res/xml/security_settings_misc.xml
	src/com/android/settings/SecuritySettings.java

    Added ability to specify minimum quality key to ChooseLockGeneric
    Activity. Used by CredentialStorage, but could also be used by
    CryptKeeperSettings. Changed ChooseLockGeneric to understand
    minimum quality for keystore in addition to DPM and device
    encryption.

	src/com/android/settings/ChooseLockGeneric.java

    Changed to use getActivePasswordQuality from
    getKeyguardStoredPasswordQuality based on experience in
    CredentialStorage. Removed bogus class javadoc.

	src/com/android/settings/CryptKeeperSettings.java

    Tracking KeyStore API changes

	src/com/android/settings/vpn/VpnSettings.java
	src/com/android/settings/wifi/WifiSettings.java

   Removing now unused string resources

	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-bg/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-in/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-ms/strings.xml
	res/values-nb/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-rm/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
	res/values/strings.xml

packages/apps/CertInstaller

  Tracking KeyStore API changes
	src/com/android/certinstaller/CertInstaller.java

  Fix for NPE in CertInstaller when certificate lacks basic constraints
	src/com/android/certinstaller/CredentialHelper.java

packages/apps/KeyChain

  Tracking KeyStore API changes
	src/com/android/keychain/KeyChainActivity.java
	src/com/android/keychain/KeyChainService.java
	support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
	support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
	tests/src/com/android/keychain/tests/KeyChainServiceTest.java

Change-Id: Ic141fb5d4b43d12fe62cb1e29c7cbd891b4be35d
2011-06-01 14:29:59 -07:00
Shimeng (Simon) Wang
f005b6c9c9 Merge "Fix overview scale setting for mobile sites." 2011-06-01 14:28:54 -07:00
Amith Yamasani
07f259dea9 Merge "Keep track of USER_QUERY to pass to the intent." 2011-06-01 14:15:09 -07:00
Jean-Michel Trivi
c507859dd8 Merge "Use channel mask instead of channel count for track creation" 2011-06-01 11:04:15 -07:00
Gilles Debunne
416a702589 Merge "Select all for text shown as an icon on smaller screens" 2011-06-01 10:13:42 -07:00
Gilles Debunne
817161087d Merge "ActionBar makes room for icons when no title is provided" 2011-06-01 10:12:11 -07:00
Wink Saville
0286454af0 am 7f9d3210: am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE
* commit '7f9d3210cbef5c5e797f78fd3a2f836979de32e3':
  Remove or disable some verbose debugging.
2011-05-31 23:41:32 -07:00
Dianne Hackborn
855e7ba0cf Merge "resolved conflicts for merge of 590ec479 to master" 2011-05-31 23:34:46 -07:00
Dianne Hackborn
02027de4e1 resolved conflicts for merge of 590ec479 to master
Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0
2011-05-31 23:11:16 -07:00
Svetoslav Ganov
03d9b10224 Merge "Removed unused service declaration from core tests." 2011-05-31 18:13:16 -07:00
Matthew Xie
0a393ae020 Merge "Add public api BluetoothSocket.isConnected." 2011-05-31 18:04:36 -07:00
Mike Lockwood
1010ae4f61 Merge "UsbService: Refactor USB host and device support into two separate classes" 2011-05-31 17:54:05 -07:00
James Dong
ff2168ef32 Merge "Send estimated bandwidth value as informational event when cache fetcher pauses" 2011-05-31 17:25:47 -07:00
Fabrice Di Meglio
54cac5acae Merge "Fix TextView potential NPE in isLayoutRtl()" 2011-05-31 16:57:55 -07:00
RoboErik
302415abe2 Merge "Work on changing syncx to cal_syncx" 2011-05-31 16:44:04 -07:00
Mike Lockwood
b23b6c06fe Merge "Move stringToFile utility from ConnectivityService to FileUtils" 2011-05-31 16:14:08 -07:00
Jeff Brown
677d3e912f am 3f5b95b0: am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
* commit '3f5b95b05efcf7ab2e8f193649b841dc1786f2ef':
  Touch pad UX improvements.
2011-05-31 16:03:07 -07:00
Jeff Brown
49c3905913 am fd86ab8a: (-s ours) am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
* commit 'fd86ab8a0f15bb15a8c274b8ea61743216f39532':
  Fix deadlock in dispatcher. (DO NOT MERGE)
2011-05-31 16:02:54 -07:00
Adam Powell
fb6cda5443 am 31caa0e6: am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
* commit '31caa0e6e5c83cb03518ffe423ea5e37e452c8ae':
  Updated popup dialog 9 patches (light)
2011-05-31 16:02:41 -07:00
Joe Onorato
b75391f190 am 7f818d0a: am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2
* commit '7f818d0a97ecd7793811ff5549a4b67521d93f49':
  Move status bar icons to sw600.
2011-05-31 16:02:26 -07:00
Jeff Hamilton
e4f9791b73 am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
* commit '7c324a3f7dde4be26b7a996b485a92ba25de3251':
  Swap Mifare for MIFARE.
2011-05-31 16:00:46 -07:00
Joe Onorato
8397b385ec Merge "Merge commit 'fce12613' into HEAD" 2011-05-31 15:35:11 -07:00
James Dong
ac5e31087b Merge "Add some comment to MediaRecorder.stop() about the stop() failure (-1007)" 2011-05-31 14:33:20 -07:00
Chet Haase
dfe375583e Merge "Fixes for AnimationDrawable" 2011-05-31 14:24:22 -07:00
Joe Onorato
d53f2fa6c5 Merge commit 'fce12613' into HEAD
Conflicts:
	core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
	core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout/status_bar_latest_event_content_large_icon.xml

Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d
2011-05-31 14:11:58 -07:00
Daniel Sandler
39d48eaeb8 Merge "Turn off navbar by default...again." 2011-05-31 13:22:30 -07:00
Daniel Sandler
3093cd234e Merge "Move navigation bar to right-hand-side of seascape." 2011-05-31 13:17:33 -07:00
Svetoslav Ganov
8c66904cf0 Merge "Updating the API since I forgot after rebase" 2011-05-31 12:53:12 -07:00
Joe Onorato
bc0cd9353e Merge "Reduce log spew." 2011-05-31 12:44:13 -07:00
Svetoslav Ganov
ec13f01572 Merge "Accessibility serviceconfiguration via meta-data" 2011-05-31 12:05:54 -07:00
Fabrice Di Meglio
89bc8a6e02 Merge "Fix default for getAbsoluteGravity()" 2011-05-31 11:56:59 -07:00
Gilles Debunne
3cd8eebc37 Merge "Fix for bug 4499752 - Detect nulled layouts in HandleViews" 2011-05-31 10:41:58 -07:00