387 Commits

Author SHA1 Message Date
Andreas Huber
3c16154a33 am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp

* commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
  Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
2010-05-20 11:13:20 -07:00
Andreas Huber
1919e5af3d Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
Change-Id: I5cba02ee85a41e43c2623053de40f26e2cf2efe4
related-to-bug: 2699505
2010-05-20 10:37:06 -07:00
The Android Open Source Project
627356cee4 am d6c0bb0f: merge from open-source master
Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken

* commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
  Removed Calls to deprecated APIs
2010-05-19 08:33:27 -07:00
The Android Open Source Project
d6c0bb0f0f merge from open-source master
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
2010-05-19 08:28:32 -07:00
Guang Zhu
f1f9fcdbe9 add execution permission to "input" script (DO NOT MERGE)
Although when building system image, "input" script will be given execution
permission, adb sync will push a version without x onto device from build
tree. Refer to frameworks/base/cmds/svc/svc, which has execution bit set.

Change-Id: Ie82df2f0d3150c3df9498399f2c446f07ea89ca5
2010-05-18 16:07:16 -07:00
Christian Mehlmauer
746a95ab71 Removed Calls to deprecated APIs
Change-Id: I3f9b6a8d3c8a050156a6cc7ea0eb9de33b82f79a
2010-05-17 21:16:20 +02:00
San Mehat
c65ede9bf1 am bd535646: am 57fff78a: dumpstate: Add blocked process wait-channel info to bugreport
Merge commit 'bd5356468a5e6823fe4dce040ee75fbef66488dc' into kraken

* commit 'bd5356468a5e6823fe4dce040ee75fbef66488dc':
  dumpstate: Add blocked process wait-channel info to bugreport
2010-04-27 11:21:17 -07:00
San Mehat
57fff78a70 dumpstate: Add blocked process wait-channel info to bugreport
Fix for http://b/2630027

Change-Id: I3606d8bf95c58df2b290dbd13f48538d82f16088
Signed-off-by: San Mehat <san@google.com>
2010-04-27 10:53:35 -07:00
Jean-Baptiste Queru
69acb6b746 Unify am startservice commands.
This replaces the implementation with an equivalent one.

Change-Id: I1343ddee9414a67906cd426b8381ddbace873894
2010-04-16 12:55:48 -07:00
Anthony Newnam
d4dd85d532 Allow Am to start services
Change-Id: I31d066ae2c980cc293e55034446a63a0f42088ad
2010-04-14 14:35:11 -05:00
Andreas Huber
d760afc3b5 am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." in
Merge commit '30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken

* commit '30e9c2d4db145e02b5312ce29606b03dd78349d3':
  Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
2010-04-13 12:23:28 -07:00
Andreas Huber
662292ae2d Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
related-to-bug: 2553359
Change-Id: Ic49eb89feb62474d9513bc21571e0e8fe3a15e0b
2010-04-13 12:04:05 -07:00
Andreas Huber
71c27d991a Various fixes to enable recording on passion and nexus1.
Change-Id: I75a461c9882e2449082ad754ee7b231c1ceec039
2010-04-09 13:47:58 -07:00
Suchi Amalapurapu
3e543abbc1 am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Merge commit 'a599469f9095532cac95a8e7600412f156b88f1c' into kraken

* commit 'a599469f9095532cac95a8e7600412f156b88f1c':
  Fix 2579461
2010-04-07 21:32:30 -07:00
Suchi Amalapurapu
40e472521a Fix 2579461
Move install location values to secure settings.
Diable attribute for UI. Set default value to auto.
Add command line interface to set install location via pm.

Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
2010-04-07 20:43:54 -07:00
Christopher Tate
b93107daad am ccb2c6cf: am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo
Merge commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7' into kraken

* commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7':
  Fix 'bmgr restore'
2010-04-06 12:43:23 -07:00
Christopher Tate
1398e27bb0 Fix 'bmgr restore'
Zero means success.  Fixes bug #2573785

Change-Id: I11bd4d85aa2b3a061aa37e085790ee8cd52d50a2
2010-04-06 12:17:46 -07:00
Andreas Huber
e47009aabd am 0f7c543c: am eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo
Merge commit '0f7c543cc48d287591b5638a15bf8ca977e162a2' into kraken

* commit '0f7c543cc48d287591b5638a15bf8ca977e162a2':
  Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
2010-04-02 14:14:24 -07:00
Andreas Huber
a4357addf6 Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
Change-Id: I90c7db6656a53339c5d454336548c4f00d0d9064
related-to-bug: 2548426
2010-04-02 12:55:31 -07:00
Christopher Tate
4caee4f719 am b3f7fe44: am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Merge commit 'b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c' into kraken

* commit 'b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c':
  Make RestoreSession.getAvailableRestoreSets() asynchronous
2010-03-30 13:17:23 -07:00
Christopher Tate
2d449afe3d Make RestoreSession.getAvailableRestoreSets() asynchronous
This transaction can involve the transport having to query a remote backend
over the wire, so it can take a Long Time(tm).  Make it main-thread-safe by
making it asynchronous, with the results passed as a callback to the invoker's
RestoreObserver.  We also make the IRestoreObserver callback interface
properly oneway.

Bug #2550665
Bug #2549422

Change-Id: If18a233a0a3d54c7b55101715c9e6195b762c5a0
2010-03-30 12:42:35 -07:00
Oscar Montemayor
1f4df90bfa DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
2010-03-29 18:12:24 -07:00
Dianne Hackborn
5ef402baaf Fix issue #2538228: Intents targeting browsers constantly nagging
Some applications are setting the MIME type field for an http:
intent, which is technically wrong because the recipient opening
the URI will get the MIME type from the header.  This was hitting
a bug when we compute the intent filter when setting the
preferred activity, where we have to set both the MIME type and
data URI for the intent filter.  (For file: and content: URIs
only the MIME type is needed, since these can be opened directly
through ContentResolver so everyone is presumed to be able to
handle them.)

Change-Id: Ia7025e6859e9c90997bf56c2c80f225fca7a2007
2010-03-26 17:17:25 -07:00
Christopher Tate
9c3cee9824 API CHANGE: Backup/restore API changes requested by the API Council
* @hide the android.app.backup.RestoreSession class and functionality

* Provide a public method on android.app.backup.BackupManager that apps
  can use to request a restore pass of their last-known-good dataset.
  The new method is called requestRestore().

* Provide the name of the package being restored, not just its ordinal,
  in the RestoreObserver's onUpdate() callback.

Part of bug #2545514

Change-Id: I9689bf8d6e2b808b4ee412424a36a835be0a5ca8
2010-03-26 14:26:44 -07:00
Andreas Huber
1a189a8232 QueryCodecs now returns the names of the software codecs (non-OpenMax) as well.
Change-Id: Ic4cd61f4dd722fb0dda544ffaa5615e87e3a4d40
related-to-bug: 2541647
2010-03-24 13:49:20 -07:00
Suchi Amalapurapu
e99bb5f10b Add new method call back in MountService.
PackageManager invokes this call back when its done handling
the media status update.
Add new uid check for updateExternalMediaStatus
Change killPids method in ActivityManager.
Remove mountsd command in Pm.java We cannot arbitrarily enable/disable
packages in PackageManager now.

Change-Id: I28dcba4afd2b4486f68abdaa1628a31b66544c91
2010-03-22 10:49:49 -07:00
Dmitry Shmidt
19b9e2e839 Merge "Fix bcm4329 FW dump in bugreport for user-debug build" 2010-03-19 16:26:52 -07:00
Dmitry Shmidt
c277f2c43d Fix bcm4329 FW dump in bugreport for user-debug build
Change-Id: I56dfdc700db5704a91015ddcdc2adb0952b097ba
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-03-19 16:22:07 -07:00
Dianne Hackborn
738b758641 Only backup real files.
Fixes hang when backing up droid.

Change-Id: Ie8b5c9f76c39c2e6c2cdf1e3b03f56ae37912bad
2010-03-18 17:45:15 -07:00
Suchi Amalapurapu
d3dd518baf Merge "Add new install flag to install on internal flash only Change default install location policy for new flag. New error code for media unavailable." 2010-03-17 18:50:29 -07:00
Suchi Amalapurapu
14b6abda13 Add new install flag to install on internal flash only
Change default install location policy for new flag.
New error code for media unavailable.

Change-Id: I5a5d0828b067692b2b94a15a2bcc7534f796c1a2
2010-03-17 18:43:31 -07:00
San Mehat
9e3f8c631e dumpstate: Remove df from bugreport and add vold system dump
Change-Id: Ib5a7611019c13bae04f6bf099c4c598f1662890a
Signed-off-by: San Mehat <san@google.com>
2010-03-17 09:50:25 -07:00
Chia-chi Yeh
0df3c165b5 keystore: rephrase the comment to make the usage more clear.
Change-Id: I529ca7ed443060089c95fe96dd230288be4b6c96
2010-03-17 16:31:20 +08:00
Suchi Amalapurapu
8a9ab24a5c Do storage checks before initiating a move.
Add new remote method to check for insufficient error conditions.
Some fixes in MountService when updating media status on PackageManagerService
Fix size calculation condition in installd.

Add new error code if media is unavailable.
New tests for testing error codes.
Some additional debugging statements in MountService.

Change-Id: Ibfe90d5ed6c71d57f9c1c67806f38b5ae9ecdfbf
2010-03-16 16:36:26 -07:00
Andreas Huber
d73a81c28b Properly use a long long literal to avoid under/overflow during fps computation.
Change-Id: I04730c86d43d6192ded3e779631effda9dd06e63
2010-03-16 14:34:17 -07:00
Andreas Huber
1af34becb1 HTTPDataSource must be connected before it is usable. Fix this in the stagefright tool.
Change-Id: I5313b2cb7839233d51b2d37a03b6598b0760c2e0
2010-03-16 09:05:38 -07:00
Dianne Hackborn
e4bfb78ae3 The return of rawbu. For other nefarious purposes.
Change-Id: I3e9c892cb6ee79e85bc4d9b817f4ad9942a73b4e
2010-03-11 21:43:34 -08:00
Suchi Amalapurapu
5e1573601b Merge "Dont include code size for apps on sdcard. Use constants defined in PackageHelper for user preferences to install auto, internal, external. Set default install location to external. Update settings db version number" 2010-03-10 16:15:35 -08:00
Suchi Amalapurapu
089262dc02 Dont include code size for apps on sdcard.
Use constants defined in PackageHelper for user preferences
to install auto, internal, external.
Set default install location to external.
Update settings db version number

Change-Id: Ib5110c9377990e20a48cee923e55898dfddfd1e6
2010-03-10 16:08:51 -08:00
Andreas Huber
e38cd3926d Merge "Extend stagefright tool to extract either album art or video frame." 2010-03-10 13:33:51 -08:00
Andreas Huber
edfeb1a3f5 Extend stagefright tool to extract either album art or video frame.
Change-Id: Iab50924e37a1aad057470a349c8f1a81858424e9
2010-03-10 11:07:12 -08:00
Glenn Kasten
d951d88c17 Use proper config to enable LVMX.
Change-Id: Ic8792e2b48110b2e91903e2e407b828a97d6e531
2010-03-09 18:38:25 -08:00
Glenn Kasten
871c16cec8 Initial version of LifeVibes integration.
Also changed tabs to spaces in other audioflinger files.
2010-03-09 14:16:01 -08:00
Dan Egnor
ca14320fa2 Merge "More consistent and clear traces.txt reporting." 2010-03-08 19:23:01 -08:00
Dan Egnor
efd1393801 More consistent and clear traces.txt reporting.
Print ANR traces.txt even if it's old.
Print more detailed error messages about VM trace dumps.

Change-Id: I067c90b8f3b3647b6136528eff3120e6cfea5715
2010-03-08 19:21:32 -08:00
Chia-chi Yeh
3eeffc1857 Merge "keystore: add AID_ROOT into the user table." 2010-03-08 17:50:56 -08:00
Chia-chi Yeh
4165dd2159 keystore: add AID_ROOT into the user table.
Change-Id: I4b9cf24d75ca79583d7913bbb2c33745a2316cde
2010-03-09 09:44:07 +08:00
San Mehat
54aa577ea2 dumpstate: Add secure container + mounted filesystems to bugreport
Change-Id: I0cb465da86976f5cce3594c4bb846aa6510c52d6
Signed-off-by: San Mehat <san@google.com>
2010-03-08 08:58:03 -08:00
Chia-chi Yeh
61b09cbc02 keystore: allow '\0's in keys and add guards for cplusplus.
Change-Id: I0af6ed7c5d51ce4ca39cb837e475942800cf6e2d
2010-03-08 17:21:35 +08:00
Christopher Tate
4528186e0d Refactor android.backup => android.app.backup
Change-Id: I0b21316ff890d7f3c7d4b82837bb60670724c2e8
2010-03-05 16:27:15 -08:00