summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge commit 'goog/master' into merge_masterMathias Agopian2009-07-011-18/+163
|\ \ \ \ | |/ / /
| * | | am ab4748c6: Merge change 5694 into donutAndroid (Google) Code Review2009-07-011-0/+55
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'ab4748c62d106d9cbc27c88ccd3d2bbda8e451bd' * commit 'ab4748c62d106d9cbc27c88ccd3d2bbda8e451bd': Implement persistent enable/disable of the backup manager
| | * | Implement persistent enable/disable of the backup managerChristopher Tate2009-06-291-0/+55
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | am 91717497: Use system properties to track the current transportChristopher Tate2009-06-291-11/+54
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '9171749700853305f3e6abbcdbd9e02f3a71d459' * commit '9171749700853305f3e6abbcdbd9e02f3a71d459': Use system properties to track the current transport
| | * Use system properties to track the current transportChristopher Tate2009-06-261-11/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | am 156411df: Use a long for restore tokenDan Egnor2009-06-291-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '156411df4627336b246db78cddca8248ed615b67' * commit '156411df4627336b246db78cddca8248ed615b67': Use a long for restore token
| | * Use a long for restore tokenDan Egnor2009-06-261-2/+2
| | |
| * | am c73a218c: Add some error reporting & info to bmgr\'s outputChristopher Tate2009-06-291-3/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'c73a218c2663e6ae3ec8a9ab8b9524f95702ade9' * commit 'c73a218c2663e6ae3ec8a9ab8b9524f95702ade9': Add some error reporting & info to bmgr's output
| | * Add some error reporting & info to bmgr's outputChristopher Tate2009-06-261-3/+17
| | |
| * | am 4a64bded: Add some helpful tests scripts for backup and make bmgr restore ↵Joe Onorato2009-06-251-11/+33
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 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.
| | * Add some helpful tests scripts for backup and make bmgr restore wait until ↵Joe Onorato2009-06-251-11/+33
| | | | | | | | | | | | the backup is done.
| * | am 5e8a4b84: Give the bmgr command an IRestoreObserver too.Joe Onorato2009-06-251-2/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '5e8a4b842c20dd47b82e9915f1bd730ee1b0d46d' * commit '5e8a4b842c20dd47b82e9915f1bd730ee1b0d46d': Give the bmgr command an IRestoreObserver too.
| | * Give the bmgr command an IRestoreObserver too.Joe Onorato2009-06-251-2/+13
| | |
* | | merge master in master_glMathias Agopian2009-06-241-2/+17
|\ \ \ | |/ /
| * | am 9c8dd55a: Fix bug 1829561 ("am profile" with bad filename kills process).Dianne Hackborn2009-06-241-2/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '9c8dd55a9d829c29a3feee9469d8c2f27a9f5516' * commit '9c8dd55a9d829c29a3feee9469d8c2f27a9f5516': Fix bug 1829561 ("am profile" with bad filename kills process).
| | * Fix bug 1829561 ("am profile" with bad filename kills process).Dianne Hackborn2009-06-241-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge commit 'goog/master' into merge_masterMathias Agopian2009-06-195-101/+310
|\ \ \ | |/ /
| * | am abce4e87: Use signatures on restoreChristopher Tate2009-06-181-0/+21
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'abce4e8714bed26a2b37b20ad3f02cf619d71c9a' * commit 'abce4e8714bed26a2b37b20ad3f02cf619d71c9a': Use signatures on restore
| | * Use signatures on restoreChristopher Tate2009-06-181-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | am 9fbeb7da: Merge change 4337 into donutAndroid (Google) Code Review2009-06-173-72/+235
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '9fbeb7da1318bf5b65588a759332d74540306c06' * commit '9fbeb7da1318bf5b65588a759332d74540306c06': Change the keystore APIs.
| | * Merge change 4337 into donutAndroid (Google) Code Review2009-06-163-72/+235
| | |\ | | | | | | | | | | | | | | | | * changes: Change the keystore APIs.
| | | * Change the keystore APIs.Chung-yih Wang2009-06-173-72/+235
| | | | | | | | | | | | | | | | | | | | 1. simplify the keypair selection in UI. 2. add the user certificate and key into the keystore for keygen feature.
| * | | am 5f15d151: checkpoint BackupDatAInput / RestoreHelperJoe Onorato2009-06-171-24/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e' * commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e': checkpoint BackupDatAInput / RestoreHelper
| | * | checkpoint BackupDatAInput / RestoreHelperJoe Onorato2009-06-161-24/+5
| | | |
| * | | am febde5fc: Merge change 4389 into donutAndroid (Google) Code Review2009-06-161-5/+49
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'febde5fc290eb422f78b47f393dc451394751d59' * commit 'febde5fc290eb422f78b47f393dc451394751d59': More bmgr work; fix clear-data signalling
| | * | More bmgr work; fix clear-data signallingChristopher Tate2009-06-161-5/+49
| | |/ | | | | | | | | | | | | | | | 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.
* | | Merge commit 'goog/master' into merge_masterMathias Agopian2009-06-169-0/+853
|\ \ \ | |/ /
| * | am 7f148d65: Merge change 4316 into donutAndroid (Google) Code Review2009-06-161-4/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | 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.
| | * Revert "dumpstate: Temporarily disable dumping /proc/slabinfo to avoid ↵Mike Lockwood2009-06-161-4/+0
| | | | | | | | | | | | | | | | | | kernel crash." This reverts commit 666c11d13fbf7b8e0502d44a94ffa00597ce92eb.
| * | am 6297cb2e: Merge change 4287 into donutAndroid (Google) Code Review2009-06-165-0/+379
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '6297cb2eb57c183e202744516a96b2dbbf204a09' * commit '6297cb2eb57c183e202744516a96b2dbbf204a09': Sketch out a 'bmgr' command line tool
| | * Sketch out a 'bmgr' command line toolChristopher Tate2009-06-155-0/+379
| | | | | | | | | | | | | | | Not finished, but eventually will allow adb shell access to the Backup Manager for testing purposes etc.
| * | am 3cf0dd6a: Merge change 3940 into donutAndroid (Google) Code Review2009-06-121-0/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '3cf0dd6ad86e725f5170f6484afa90ba9ea1e4c5' * commit '3cf0dd6ad86e725f5170f6484afa90ba9ea1e4c5': dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash.
| | * Merge change 3940 into donutAndroid (Google) Code Review2009-06-111-0/+4
| | |\ | | | | | | | | | | | | | | | | * changes: dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash.
| | | * dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash.Mike Lockwood2009-06-111-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | am db8a6ae6: Merge change 3709 into donutAndroid (Google) Code Review2009-06-112-20/+27
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'db8a6ae6bbd8cbb17fb79085ffb9d3fc539fe5c2' * commit 'db8a6ae6bbd8cbb17fb79085ffb9d3fc539fe5c2': Provide the Keystore feature in the framework.
| | * | Provide the Keystore feature in the framework.Chung-yih Wang2009-06-112-20/+27
| | |/ | | | | | | | | | | | | -- added the keystore library for Java application. -- changed the marshalling of the keystore function return.
| * | am 54d63246: Merge change 3427 into donutAndroid (Google) Code Review2009-06-094-0/+467
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '54d632468c0cd53087d17420d9d383bc29553d36' * commit '54d632468c0cd53087d17420d9d383bc29553d36': First version of the keystore service.
| | * Merge change 3427 into donutAndroid (Google) Code Review2009-06-094-0/+467
| | |\ | | | | | | | | | | | | | | | | * changes: First version of the keystore service.
| | | * First version of the keystore service.Chung-yih Wang2009-06-084-0/+467
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge commit 'goog/master' into merge_masterMathias Agopian2009-06-052-2/+17
|\ \ \ \ | |/ / /
| * | | am a80cc6eb: Merge change 3184 into donutAndroid (Google) Code Review2009-06-041-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'a80cc6ebe7426792927cddbf191bb7435a06fc5e' * commit 'a80cc6ebe7426792927cddbf191bb7435a06fc5e': The '-D' option for the 'am' command appears to be optional, so reflect that in the usage.
| | * | Merge change 3184 into donutAndroid (Google) Code Review2009-06-041-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * changes: The '-D' option for the 'am' command appears to be optional, so reflect that in the usage.
| | | * | The '-D' option for the 'am' command appears to be optional, so reflect that ↵Marco Nelissen2009-06-041-1/+1
| | | |/ | | | | | | | | | | | | in the usage.
| * | | am 2a318867: Merge change 3203 into donutAndroid (Google) Code Review2009-06-041-1/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '2a3188672ab2b65c0ce7c9c598a463e382c47696' * commit '2a3188672ab2b65c0ce7c9c598a463e382c47696': rename a few files to camel-case, add copyright notices
| | * | rename a few files to camel-case, add copyright noticesMathias Agopian2009-06-041-1/+16
| | |/
* | | Merge commit 'goog/master' into merge_masterMathias Agopian2009-06-011-1/+3
|\ \ \ | |/ /
| * | get rid of utils.hMathias Agopian2009-05-311-1/+3
| | |
* | | Merge commit 'goog/master' into merge_masterMathias Agopian2009-05-274-4/+8
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: include/ui/Rect.h libs/ui/ISurfaceComposer.cpp
| * | Fix sim-eng build.Andy McFadden2009-05-261-1/+1
| | |
| * | am b181118b: Define TARGET_CPU_ABI for finding native code in .apksDianne Hackborn2009-05-221-0/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'b181118b6e58c0014da4e9d52bf38548adc73a8a' * commit 'b181118b6e58c0014da4e9d52bf38548adc73a8a': Define TARGET_CPU_ABI for finding native code in .apks
generated by cgit v1.1 at 2024-09-17 10:55:29 +0000