191 Commits

Author SHA1 Message Date
Android (Google) Code Review
84fcd18ecb am 7de4bd9b: Merge change 6045 into donut
Merge commit '7de4bd9b40d80fd68fc746efd645e3df7442acea'

* commit '7de4bd9b40d80fd68fc746efd645e3df7442acea':
  Remove the null-termination for Java string compatibility.
2009-07-03 09:08:36 -07:00
Android (Google) Code Review
7d9e45b223 am d45dcbec: Merge change 5615 into donut
Merge commit 'd45dcbec856710f9478ffc5689e7cdf95d757ab8'

* commit 'd45dcbec856710f9478ffc5689e7cdf95d757ab8':
  Implement the generic mini-keystore for security.
2009-07-03 08:58:31 -07:00
Chung-yih Wang
a734207fd1 Two small checks in keymgmt.
1. Enforce the state check in listkey().
2. Enforce the password length check.
2009-07-03 12:14:36 +08:00
Christopher Tate
d23d7f2d12 Add a 'wipe' operation to Bmgr
"bmgr wipe PACKAGE" now issues the backup transport clearBackupData() operation
for the given package.
2009-07-02 14:37:50 -07:00
Chung-yih Wang
fa927c046a Remove the null-termination for Java string compatibility.
1. Also change the keyname delimiter in CertTool.java.
2. Return NOTFOUND if the result.len==0 in the listKeys().
3. Define the keystore states in the class Keystore.
2009-07-02 23:08:39 +08:00
Android (Google) Code Review
d45dcbec85 Merge change 5615 into donut
* changes:
  Implement the generic mini-keystore for security.
2009-07-02 00:16:21 -07:00
Chung-yih Wang
70246ebb9b Implement the generic mini-keystore for security.
1. We will progressively migrate to this implementation.
2. For richc to have a quick review on the keymgmt part.
3. Add remove_key and make sure all functions are working.
4. Add permission check for get operation.
5. Return the retry count if unlock failed.
6. Add the reset operation for keystore reset.
7. Add the putfile shell command for putting the key value from file.
8. Fix the boundary issue during parsing command.
9. Use the ' ' as delimiter and reset the reply structure for each request.
10. Add change password retry count check.
11. Extract the read_marshal/write_marshal for certtool.h.
12. Remove the old implementation.
2009-07-02 14:08:20 +08:00
Mathias Agopian
dfe983bd79 Merge commit 'goog/master' into merge_master 2009-07-01 18:33:18 -07:00
Android (Google) Code Review
01ecd7bcd1 am ab4748c6: Merge change 5694 into donut
Merge commit 'ab4748c62d106d9cbc27c88ccd3d2bbda8e451bd'

* commit 'ab4748c62d106d9cbc27c88ccd3d2bbda8e451bd':
  Implement persistent enable/disable of the backup manager
2009-07-01 00:07:35 -07:00
Christopher Tate
5e79e32357 am 91717497: Use system properties to track the current transport
Merge commit '9171749700853305f3e6abbcdbd9e02f3a71d459'

* commit '9171749700853305f3e6abbcdbd9e02f3a71d459':
  Use system properties to track the current transport
2009-06-29 20:20:20 -07:00
Dan Egnor
8c3fc63576 am 156411df: Use a long for restore token
Merge commit '156411df4627336b246db78cddca8248ed615b67'

* commit '156411df4627336b246db78cddca8248ed615b67':
  Use a long for restore token
2009-06-29 16:37:02 -07:00
Christopher Tate
c16dee2aaa am c73a218c: Add some error reporting & info to bmgr\'s output
Merge commit 'c73a218c2663e6ae3ec8a9ab8b9524f95702ade9'

* commit 'c73a218c2663e6ae3ec8a9ab8b9524f95702ade9':
  Add some error reporting & info to bmgr's output
2009-06-29 16:36:48 -07:00
Christopher Tate
6ef58a1509 Implement persistent enable/disable of the backup manager
Backup & restore is still enabled by default, but with the expectation that it
will be enabled during the course of the Setup Wizard or some other privileged
entity that has notified the user about the ramifications.  While disabled,
data-changed notices will still be collected, but no backup pass will be
scheduled.  When the backup manager is later enabled, any pending data-changed
notices will then be processed and the apps invoked for backup.
2009-06-29 15:33:27 -07:00
Christopher Tate
9171749700 Use system properties to track the current transport
This change retools the transport selection mechanism a fair bit.  Transports
are now specified by name rather than by numeric ID, and the name of the
currently selected transport is stored in a persistent system property under the
name "persist.service.bkup.trans".

The name -> IBackupTransport translation is now handled by maintaining a map
from the names to the live IBackupTransport objects that correspond.  The Google
transport service observer now registers and unregisters the transport as the
service goes up and down.

The bmgr command has been expanded to include real transport interrogation and
selection by name, and some documentation has been written for it.
2009-06-26 21:14:41 -07:00
Dan Egnor
156411df46 Use a long for restore token 2009-06-26 13:25:27 -07:00
Christopher Tate
c73a218c26 Add some error reporting & info to bmgr's output 2009-06-26 12:20:10 -07:00
Joe Onorato
0da0ee6f5f am 4a64bded: Add some helpful tests scripts for backup and make bmgr restore wait until the backup is done.
Merge commit '4a64bded06a0299785c295a975e2818308eb53e2'

* commit '4a64bded06a0299785c295a975e2818308eb53e2':
  Add some helpful tests scripts for backup and make bmgr restore wait until the backup is done.
2009-06-25 20:56:00 -07:00
Joe Onorato
4a64bded06 Add some helpful tests scripts for backup and make bmgr restore wait until the backup is done. 2009-06-25 23:53:29 -04:00
Joe Onorato
848358f680 am 5e8a4b84: Give the bmgr command an IRestoreObserver too.
Merge commit '5e8a4b842c20dd47b82e9915f1bd730ee1b0d46d'

* commit '5e8a4b842c20dd47b82e9915f1bd730ee1b0d46d':
  Give the bmgr command an IRestoreObserver too.
2009-06-25 18:36:54 -07:00
Joe Onorato
5e8a4b842c Give the bmgr command an IRestoreObserver too. 2009-06-25 21:34:49 -04:00
Mathias Agopian
f31868e59f merge master in master_gl 2009-06-24 18:31:21 -07:00
Dianne Hackborn
afed82bca9 am 9c8dd55a: Fix bug 1829561 ("am profile" with bad filename kills process).
Merge commit '9c8dd55a9d829c29a3feee9469d8c2f27a9f5516'

* commit '9c8dd55a9d829c29a3feee9469d8c2f27a9f5516':
  Fix bug 1829561 ("am profile" with bad filename kills process).
2009-06-24 16:25:26 -07:00
Dianne Hackborn
9c8dd55a9d Fix bug 1829561 ("am profile" with bad filename kills process).
The am command is now the one that takes care of opening the target file,
handling the opened file descriptor to the process that will be profiled.
This allows you to send profile data to anywhere the shell can access, and
avoids any problems coming up from the target process trying to open the
file.
2009-06-24 16:23:14 -07:00
Mathias Agopian
f73bbd0423 Merge commit 'goog/master' into merge_master 2009-06-19 17:41:14 -07:00
Christopher Tate
610a0af4e3 am abce4e87: Use signatures on restore
Merge commit 'abce4e8714bed26a2b37b20ad3f02cf619d71c9a'

* commit 'abce4e8714bed26a2b37b20ad3f02cf619d71c9a':
  Use signatures on restore
2009-06-18 18:42:02 -07:00
Christopher Tate
abce4e8714 Use signatures on restore
On restore now, the backup manager gets the signature blocks corresponding to
the restore set from the transport.  It then validates those signatures against
the on-device app signatures, and refuses to restore data to an app whose
on-device sig block does not match the backup image's.

Also actually implement 'bmgr transport N' so that we can select the local
transport easily during runtime.
2009-06-18 18:38:02 -07:00
Android (Google) Code Review
97b5660c97 am 9fbeb7da: Merge change 4337 into donut
Merge commit '9fbeb7da1318bf5b65588a759332d74540306c06'

* commit '9fbeb7da1318bf5b65588a759332d74540306c06':
  Change the keystore APIs.
2009-06-17 15:38:33 -07:00
Joe Onorato
251c89c0a7 am 5f15d151: checkpoint BackupDatAInput / RestoreHelper
Merge commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e'

* commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e':
  checkpoint BackupDatAInput / RestoreHelper
2009-06-17 15:38:08 -07:00
Android (Google) Code Review
9fbeb7da13 Merge change 4337 into donut
* changes:
  Change the keystore APIs.
2009-06-16 23:35:57 -07:00
Chung-yih Wang
6d531bf051 Change the keystore APIs.
1. simplify the keypair selection in UI.
2. add the user certificate and key into the keystore for keygen feature.
2009-06-17 14:32:05 +08:00
Joe Onorato
5f15d151b5 checkpoint BackupDatAInput / RestoreHelper 2009-06-16 18:46:50 -07:00
Android (Google) Code Review
714000456b am febde5fc: Merge change 4389 into donut
Merge commit 'febde5fc290eb422f78b47f393dc451394751d59'

* commit 'febde5fc290eb422f78b47f393dc451394751d59':
  More bmgr work; fix clear-data signalling
2009-06-16 16:43:17 -07:00
Christopher Tate
f68eb500f9 More bmgr work; fix clear-data signalling
The 'list sets' and 'restore token#' commands from bmgr now do what they are
supposed to.  At this point we see the restore target's data being cleared
properly and its agent being launched and invoked for restore.
2009-06-16 13:58:17 -07:00
Mathias Agopian
69f066c8fc Merge commit 'goog/master' into merge_master 2009-06-16 12:38:55 -07:00
Android (Google) Code Review
7942359005 am 7f148d65: Merge change 4316 into donut
Merge commit '7f148d65051e577cc4a002183ec55d625b51de85'

* commit '7f148d65051e577cc4a002183ec55d625b51de85':
  Revert "dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash."
  Enable more debug message to debug the Camera startPreview bug.
2009-06-16 08:37:35 -07:00
Android (Google) Code Review
22a9f7a52e am 6297cb2e: Merge change 4287 into donut
Merge commit '6297cb2eb57c183e202744516a96b2dbbf204a09'

* commit '6297cb2eb57c183e202744516a96b2dbbf204a09':
  Sketch out a 'bmgr' command line tool
2009-06-16 08:37:18 -07:00
Mike Lockwood
8cae2daf98 Revert "dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash."
This reverts commit 666c11d13fbf7b8e0502d44a94ffa00597ce92eb.
2009-06-16 05:50:46 -04:00
Christopher Tate
ace7f094bf Sketch out a 'bmgr' command line tool
Not finished, but eventually will allow adb shell access to the Backup Manager
for testing purposes etc.
2009-06-15 18:07:25 -07:00
Android (Google) Code Review
d10a2dec1e am 3cf0dd6a: Merge change 3940 into donut
Merge commit '3cf0dd6ad86e725f5170f6484afa90ba9ea1e4c5'

* commit '3cf0dd6ad86e725f5170f6484afa90ba9ea1e4c5':
  dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash.
2009-06-12 04:59:38 -07:00
Android (Google) Code Review
3cf0dd6ad8 Merge change 3940 into donut
* changes:
  dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash.
2009-06-11 14:09:11 -07:00
Mike Lockwood
666c11d13f dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-11 17:06:56 -04:00
Android (Google) Code Review
ec167e672d am db8a6ae6: Merge change 3709 into donut
Merge commit 'db8a6ae6bbd8cbb17fb79085ffb9d3fc539fe5c2'

* commit 'db8a6ae6bbd8cbb17fb79085ffb9d3fc539fe5c2':
  Provide the Keystore feature in the framework.
2009-06-11 07:57:37 -07:00
Chung-yih Wang
10e371f182 Provide the Keystore feature in the framework.
-- added the keystore library for Java application.
-- changed the marshalling of the keystore function return.
2009-06-11 17:28:40 +08:00
Android (Google) Code Review
ec721b2f1e am 54d63246: Merge change 3427 into donut
Merge commit '54d632468c0cd53087d17420d9d383bc29553d36'

* commit '54d632468c0cd53087d17420d9d383bc29553d36':
  First version of the keystore service.
2009-06-09 19:12:37 -07:00
Android (Google) Code Review
54d632468c Merge change 3427 into donut
* changes:
  First version of the keystore service.
2009-06-09 19:10:42 -07:00
Chung-yih Wang
8229048cff First version of the keystore service.
The keystore service is protected by the user 'keystore'. Only keystore
user/group can access the key content. All users are able to do the
following commands from shell as well:
  listcerts
  listuserkeys
  installcert
  removecert
  installuserkey
  removeuserkey
2009-06-08 16:34:54 +08:00
Mathias Agopian
51c8a3e00e Merge commit 'goog/master' into merge_master 2009-06-05 15:45:39 -07:00
Android (Google) Code Review
488e8aaca2 am a80cc6eb: Merge change 3184 into donut
Merge commit 'a80cc6ebe7426792927cddbf191bb7435a06fc5e'

* commit 'a80cc6ebe7426792927cddbf191bb7435a06fc5e':
  The '-D' option for the 'am' command appears to be optional, so reflect that in the usage.
2009-06-04 23:48:17 -07:00
Android (Google) Code Review
1b6aee1515 am 2a318867: Merge change 3203 into donut
Merge commit '2a3188672ab2b65c0ce7c9c598a463e382c47696'

* commit '2a3188672ab2b65c0ce7c9c598a463e382c47696':
  rename a few files to camel-case, add copyright notices
2009-06-04 22:44:18 -07:00
Android (Google) Code Review
a80cc6ebe7 Merge change 3184 into donut
* changes:
  The '-D' option for the 'am' command appears to be optional, so reflect that in the usage.
2009-06-04 15:05:48 -07:00