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

265 Commits

Author SHA1 Message Date
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
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
5fbcaf9a90 Merge commit 'goog/master' into merge_master 2009-06-01 14:30:08 -07:00
Mathias Agopian
3b4062eeb0 get rid of utils.h 2009-05-31 19:13:00 -07:00
Mathias Agopian
2da99bdaa1 Merge commit 'goog/master' into merge_master 
Conflicts:
	include/ui/Rect.h
	libs/ui/ISurfaceComposer.cpp
 2009-05-27 14:34:50 -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
947f4f4d38 merge master to master_gl 2009-05-22 02:16:08 -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
Joe Onorato
5595a93722 this might fix the build 2009-05-20 14:18:11 -07:00
Mathias Agopian
0795272aa2 move libbinder's header files under includes/binder 2009-05-20 12:55:03 -07:00
Mathias Agopian
25ba5b6564 checkpoint: split libutils into libutils + libbinder 2009-05-20 12:55:02 -07:00
Joe Onorato
d2110dbce0 Hook up the backup data writer, and add a utility to read the backup data files. 2009-05-20 11:24:20 -07:00
Dianne Hackborn
95fc68f24a Fix issue where apps could prevent the user from going home. 
Now we have a 5-second time after home is pressed, during which
only the home app (and the status bar) can switch to another app.
After that time, any start activity requests that occurred will
be executed, to allow things like alarms to be displayed.  Also
if during that time the user launches another app, the pending
starts will be executed without resuming their activities and
the one they started placed at the top and executed.
 2009-05-19 18:46:53 -07:00
Dan Egnor
abc25e3679 Add intent for gservices override, and handle empty arguments properly 
in the "am" utility.
 2009-05-15 11:59:31 -07:00
Dianne Hackborn
ade3ecad94 Implement issue #1783881 (manifest option for adb-install-only apps) 
You can now use android:testOnly="true" to not allow your .apk to be installed
as a normal app.  The only way to do so is with the pm command and giving the
-t option, which sets a new INSTALL_ALLOW_TEST flag when installing.

I also used this to clean up the install API...  actually, mostly to hide
it, since it is not accessible to apps so shouldn't be in the SDK.  We
will be doing some more work on it, so this will prevent adding yet
another backwards-compatibility-for-no-reason version.
 2009-05-12 16:09:43 -07:00