drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,816 Commits 1 Branch 0 Tags
Commit Graph

72 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Mathias Agopian
8ae2335a3c rename a few files to camel-case, add copyright notices 2009-06-04 13:53:57 -07:00
Marco Nelissen
c62a216a2b The '-D' option for the 'am' command appears to be optional, so reflect that in the usage. 2009-06-04 12:04:03 -07:00
Mathias Agopian
3b4062eeb0 get rid of utils.h 2009-05-31 19:13:00 -07:00
Andy McFadden
2e37a0ca87 Fix sim-eng build. 2009-05-26 12:06:31 -07:00
Dianne Hackborn
385bb79ebb am b181118b: Define TARGET_CPU_ABI for finding native code in .apks 
Merge commit 'b181118b6e58c0014da4e9d52bf38548adc73a8a'

* commit 'b181118b6e58c0014da4e9d52bf38548adc73a8a':
  Define TARGET_CPU_ABI for finding native code in .apks
 2009-05-22 18:47:12 -07:00
Dianne Hackborn
b181118b6e Define TARGET_CPU_ABI for finding native code in .apks 2009-05-22 18:45:25 -07:00
Android (Google) Code Review
c518080c11 am 9d892a8e: Merge change 2336 into donut 
Merge commit '9d892a8e3037fd2f6d692137cd5d91acc46ddf5a'

* commit '9d892a8e3037fd2f6d692137cd5d91acc46ddf5a':
  dumpstate: Add to AID_SDCARD_RW group to fix saving bugreports to the SD card.
 2009-05-22 11:32:01 -07:00
Android (Google) Code Review
9db377e3de am 9681a5e0: Merge change 2230 into donut 
Merge commit '9681a5e06badbd817342e8f6be4ffbe9102c1e98'

* commit '9681a5e06badbd817342e8f6be4ffbe9102c1e98':
  runtime: Add CAP_SYS_NICE to the system server capabilities list so it
 2009-05-22 11:26:04 -07:00
Android (Google) Code Review
9d892a8e30 Merge change 2336 into donut 
* changes:
  dumpstate: Add to AID_SDCARD_RW group to fix saving bugreports to the SD card.
 2009-05-22 10:40:48 -07:00
Mike Lockwood
472be48007 dumpstate: Add to AID_SDCARD_RW group to fix saving bugreports to the SD card. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-05-22 13:31:42 -04:00
Android (Google) Code Review
9681a5e06b Merge change 2230 into donut 
* changes:
  runtime: Add CAP_SYS_NICE to the system server capabilities list so it can (eventually) move arbitrary threads into different cgroups
 2009-05-22 08:47:54 -07:00
Mathias Agopian
ac31a3b8b0 this should fix the build 2009-05-21 19:59:24 -07:00
Android (Google) Code Review
e755d64977 am 69a6c3eb: Merge change 2292 into donut 
Merge commit '69a6c3ebd46a8de0e896747757f364322c12608d'

* commit '69a6c3ebd46a8de0e896747757f364322c12608d':
  split boot animation out of SurfaceFlinger
 2009-05-21 19:36:53 -07:00
Mathias Agopian
627e7b50be split boot animation out of SurfaceFlinger 
Conflicts:

	data/etc/platform.xml
 2009-05-21 19:21:59 -07:00
San Mehat
ca63bb72ef runtime: Add CAP_SYS_NICE to the system server capabilities list so it 
can (eventually) move arbitrary threads into different cgroups

Signed-off-by: San Mehat <san@google.com>
 2009-05-21 15:34:56 -07:00
Joe Onorato
57ee738a51 am 5595a937: this might fix the build 
Merge commit '5595a93722cc440cee712a73b268c9f61399d876'

* commit '5595a93722cc440cee712a73b268c9f61399d876':
  this might fix the build
 2009-05-20 14:21:14 -07:00