383 Commits

Author SHA1 Message Date
Hung-ying Tyan
2a36a778d3 am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp

* commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
  Move SipService out of SystemServer to phone process.
2010-09-27 16:29:33 -07:00
Hung-ying Tyan
7e54ef71db Move SipService out of SystemServer to phone process.
Companion CL: https://android-git/g/#change,70187
http://b/issue?id=2998069

Change-Id: I90923ac522ef363a4e04292f652d413c5a1526ad
2010-09-28 05:19:35 +08:00
Dianne Hackborn
deaa8ff1b1 am a7ef18fc: Merge "Some debugging support." into gingerbread
Merge commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503' into gingerbread-plus-aosp

* commit 'a7ef18fca50d0db99a161d8c7e2d8979f0445503':
  Some debugging support.
2010-09-24 15:32:51 -07:00
Dianne Hackborn
f123e49bf0 Some debugging support.
- New feature to "am monitor" to have it automatically launch
  gdbserv for you when a crash/ANR happens, and tell you how to
  run the client.

- Update dumpstate to match new location of binder debug logs

- Various commented out logs that are being used to track down
  issues.

Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
2010-09-24 13:11:55 -07:00
Andreas Huber
a1c7b096df am 6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
Merge commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6' into gingerbread-plus-aosp

* commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6':
  Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
2010-09-24 11:09:33 -07:00
Andreas Huber
3ac01190a7 Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
Change-Id: I67b287cf76546191f398939aabe4480d9e79a948
2010-09-24 10:09:00 -07:00
Andreas Huber
19fe783d83 am 37155854: Merge "Proper sync-frame detection for sources that don\'t already provide it." into gingerbread
Merge commit '37155854b4d9ca405e5c41c4ab271006a4716193' into gingerbread-plus-aosp

* commit '37155854b4d9ca405e5c41c4ab271006a4716193':
  Proper sync-frame detection for sources that don't already provide it.
2010-09-24 08:27:33 -07:00
Andreas Huber
37155854b4 Merge "Proper sync-frame detection for sources that don't already provide it." into gingerbread 2010-09-24 08:17:20 -07:00
Dianne Hackborn
8952a4488e am 287952c3: Fix issue #3022508: Crash during media scan
Merge commit '287952c35e148811c106bc0f5036eabf20f71562' into gingerbread-plus-aosp

* commit '287952c35e148811c106bc0f5036eabf20f71562':
  Fix issue #3022508: Crash during media scan
2010-09-23 16:04:23 -07:00
Dianne Hackborn
287952c35e Fix issue #3022508: Crash during media scan
Don't kill processes for excessive wake lock use, even if they
are in the background, as long as they have running services.

Also fix some problems with this, such as not noting the kill
in battery stats.

And add killing of processes for cpu usage as well, along with
some optimizations to computing CPU usage.

And fix BatteryWaster to be better behaving for testing these
cases.

Add new "monitor" command to am to watch as the activity manager
does stuff (so we can catch things at the point of ANR).

Finally some miscellaneous debug output for the stuff here, as
well as in progress debugging of an ANR.

Change-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1
2010-09-23 15:59:28 -07:00
Andreas Huber
b51852709c Proper sync-frame detection for sources that don't already provide it.
Change-Id: Iafeee847b015c5cf6bec6dd5fac22a8d3e8cb78e
2010-09-23 15:03:57 -07:00
James Dong
7e8a16e884 am d3c9fce3: Merge "Allow record to set input color format as a command line option" into gingerbread
Merge commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3' into gingerbread-plus-aosp

* commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3':
  Allow record to set input color format as a command line option
2010-09-21 11:37:20 -07:00
James Dong
2749c177c2 Allow record to set input color format as a command line option
o Only YUV420SP and YUV420P are supported

Change-Id: I425e8b29d9dca8c05066c1cd777f8bdede52964a
2010-09-19 10:39:21 -07:00
Andreas Huber
23c6ad7aed am 549629d3: Merge "Make sure stagefright -o terminates even if we\'re using a raw audio source (such as .wav pcm)" into gingerbread
Merge commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead' into gingerbread-plus-aosp

* commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead':
  Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
2010-09-16 16:02:25 -07:00
Andreas Huber
6bfb397dff Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
Change-Id: Iec809df89e6b75706cf5b1ce21006c2e217e018f
2010-09-16 14:55:48 -07:00
Dianne Hackborn
53686433a9 am 7e9f4eb2: Track client requests through location manager.
Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp

* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
  Track client requests through location manager.
2010-09-13 14:34:22 -07:00
Dianne Hackborn
7e9f4eb260 Track client requests through location manager.
This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like...  say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).

To solve this, we introduce a new class WorkSource representing
the source of some work.  Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.

For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.

This should also be used elsewhere, such as in the GPS provider,
but this is a good start.

Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
2010-09-13 14:20:48 -07:00
Jean-Baptiste Queru
09f1e2b215 resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp
Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617
2010-09-10 09:53:43 -07:00
Kenny Root
000ef46f5b am 25429378: Merge "Allow installd to handle large partitions" into gingerbread
Merge commit '254293782a94652fd601d6b3f04ad447c072f714' into gingerbread-plus-aosp

* commit '254293782a94652fd601d6b3f04ad447c072f714':
  Allow installd to handle large partitions
2010-09-07 15:42:02 -07:00
Kenny Root
3e319a9962 Allow installd to handle large partitions
Use int64_t because we're RPCing over to Java which uses a Long to
represent the filesystem space.

Change-Id: I842b2cf9f2ff8f980ff5895c1c8eb9ebefa1ea31
2010-09-07 14:35:47 -07:00
Nick Kralevich
b4de2f9975 am 05f0382b: When dropping privileges, check return values.
Merge commit '05f0382bcf11d96760ee8cf9110099a1661eed7c' into gingerbread-plus-aosp

* commit '05f0382bcf11d96760ee8cf9110099a1661eed7c':
  When dropping privileges, check return values.
2010-09-01 14:59:52 -07:00
Nick Kralevich
05f0382bcf When dropping privileges, check return values.
setuid() and family can fail.  Check return values to make
sure this doesn't happen unexpectedly.

Also call setgid() to drop root group permissions.

Change-Id: Id06fbe6239e2ed2fe23368695e333514e0581e6d
2010-09-01 14:44:54 -07:00
aimitakeshi
d074e30ce4 Initial contribution from Sony Corporation.
Add DRM Framework to support DRM content playback
  together with StageFright.

  - DRM Framework code is added
     - include/drm
     - drm
  - api/current.xml is updated to include DRM Framework Java APIs
  - cmds/servicemanager/service_manager.c is modified
    to add drmManager and drmIOService.

Change-Id: I6d7bc9c7067362b500e530988a9ce241761866fb
2010-09-01 15:40:00 +09:00
James Dong
aa40b83498 am 6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread
Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp

* commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca':
  Add some encoding parameters for the "record" utility
2010-08-31 13:25:42 -07:00
James Dong
d31c89f45c Add some encoding parameters for the "record" utility
- TODO: remove some of the hard coded values

Change-Id: Ib58bbb8af45fd102176ac49da0a71613a12fa5fc
2010-08-31 11:53:54 -07:00
Jean-Baptiste Queru
18dd95f451 am 05b20c03: Merge "bootanimation: Don\'t open non-existing bootanimation.zip"
Merge commit '05b20c034d5a1ffe64c15d155dd8511b77b8989b' into gingerbread-plus-aosp

* commit '05b20c034d5a1ffe64c15d155dd8511b77b8989b':
  bootanimation: Don't open non-existing bootanimation.zip
2010-08-17 07:48:26 -07:00
Jim Huang
c11f46259a bootanimation: Don't open non-existing bootanimation.zip
While booting from AOSP image, logcat always complains as following:
W/zipro   ( 1001): Unable to open zip '/data/local/bootanimation.zip':
No such file or directory
W/zipro   ( 1001): Unable to open zip '/system/media/bootanimation.zip':
No such file or directory

This patch avoids opening non-existing files.

Change-Id: I54cc03f125a5e16dbc930515bd2e43c623b63f8f
2010-08-10 03:12:15 +08:00
Kenny Root
508715259c Add more debugging to installd
If a command to installd fails, it would be nice to know exactly why.
Log failures and the errno associated with the failures.

Change-Id: Ia3122675f243037c556d3a49d06da7e03b8c59f6
2010-08-04 13:15:12 -07:00
Mathias Agopian
6d6b749b24 move native services under services/
moved surfaceflinger, audioflinger, cameraservice

all native services should now reside in this location.

Change-Id: Icd7336f7289db35df9c8c1857a5122bb8a6f1c86
2010-07-22 15:28:19 -07:00
Andreas Huber
81046c8c42 Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread 2010-07-22 13:47:41 -07:00
Andreas Huber
4e4173b0af Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
Change-Id: I110e19d5ce33e597add3ffbd3e3ff3815862396d
2010-07-22 09:21:05 -07:00
Mathias Agopian
e476452135 Merge "new SensorService" into gingerbread 2010-07-21 16:06:46 -07:00
Andreas Huber
5850a48238 Add a seek test to the stagefright commandline tool.
Change-Id: Ibf3517afa288fc4c7e2184c11bc7a63594f321df
2010-07-21 10:40:07 -07:00
Mathias Agopian
1bf797857e new SensorService
remove old sensor service and implement SensorManager
on top of the new (native) SensorManger API.

Change-Id: Iddb77d498755da3e11646473a44d651f12f40281
2010-07-19 17:57:29 -07:00
Mathias Agopian
24651682ed added BinderService<> template to help creating native binder services
Change-Id: Id980899d2647b56479f8a27c89eaa949f9209dfe
2010-07-14 18:43:19 -07:00
Mathias Agopian
08e83bb3b7 move native services under services/
moved surfaceflinger, audioflinger, cameraservice

all native services should now reside in this location.

Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8
2010-07-14 17:59:35 -07:00
Andreas Huber
45bac57aa0 Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Change-Id: I972324a8fc9757e6e8116b0270ec0882106f8733
2010-07-01 09:08:38 -07:00
Andreas Huber
8d65dd2653 Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce
related-to-bug: 2370115
2010-06-23 16:40:57 -07:00
Andreas Huber
8a42f8817d Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread 2010-06-22 10:11:04 -07:00
Andreas Huber
14e5758bc3 Make sure sine: is supported again in stagefright commandline tool.
Change-Id: I703f1a8b7556543ef71b141dc8e38d8b82d8c6dc
2010-06-21 13:53:36 -07:00
Brad Fitzpatrick
27b3a7a759 Start of work on passing around StrictMode policy over Binder calls.
This is (intendend to be) a no-op change.

At this stage, Binder RPCs just have an additional uint32 passed around
in the header, right before the interface name.  But nothing is actually
done with them yet.  That value should right now always be 0.

This now boots and seems to work.

Change-Id: I135b7c84f07575e6b9717fef2424d301a450df7b
2010-06-21 12:56:35 -07:00
Andreas Huber
c0668843d3 Simplify the code in the stagefright commandline utility.
Change-Id: Ia222b25ef12af34f6434421fd96b67eca800d1ab
2010-06-10 11:27:06 -07:00
Christopher Tate
7e76ff1c40 Fail gracefully if the user fails to supply necessary args to bmgr
Fixes bug #2755355

Change-Id: I4690756bb5077a6b4bbbfb232cd852cad43cef77
2010-06-09 12:21:31 -07:00
Mathias Agopian
770492cb2b more clean-up in preparation of bigger changes
the most important change here is the renaming of
ISurfaceFlingerClient to ISurfaceComposerClient

Change-Id: I94e18b0417f50e06f21377446639c61f65f959b3
2010-05-28 17:19:16 -07:00
Andreas Huber
4979601f88 Make the -o option actually terminate.
Change-Id: I91b70ee5c3e1fc9b8bb645e219af296867692e65
2010-05-20 16:32:29 -07:00
Andreas Huber
c6a1632732 am 3c16154a: 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 '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken

* commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
  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:14:37 -07:00
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