27342 Commits

Author SHA1 Message Date
John Wang
becc9148e3 am 8f5a1211: Merge "Add debug functions." into gingerbread
Merge commit '8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e' into gingerbread-plus-aosp

* commit '8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e':
  Add debug functions.
2010-09-26 13:58:02 -07:00
John Wang
8f5a1211dc Merge "Add debug functions." into gingerbread 2010-09-26 13:53:33 -07:00
John Wang
55bc084bf4 Add debug functions.
Enable more debug in CallManager.

Change-Id: Iaf66e31dc67f7ca9123fe5d8b351a21b1ec8b987
2010-09-26 13:39:55 -07:00
Daisuke Miyakawa
b643cbe558 am e0998604: Add necessary logic removed during backport
Merge commit 'e0998604df4ddfcd5c87ea097dcc0950a9518ed1' into gingerbread-plus-aosp

* commit 'e0998604df4ddfcd5c87ea097dcc0950a9518ed1':
  Add necessary logic removed during backport
2010-09-26 13:12:55 -07:00
Daisuke Miyakawa
e0998604df Add necessary logic removed during backport
Makes importer import contcats into an appropriate group.
Without this logic, all imported contacts are stored in
"Other Groups".

This logic is removed in my previous submit, while
it shouldn't be.

Bug: 3036599
Change-Id: Ic1dc7253d807fbde4352afe2082984c3b7227267
2010-09-26 12:21:33 -07:00
Sonia Serafimova
f023c4dceb am d45a3355: Prevent unhandled exception in NinePatchDrawable
Merge commit 'd45a33554ca6c18ed81e45320998b9e4f4680379' into gingerbread-plus-aosp

* commit 'd45a33554ca6c18ed81e45320998b9e4f4680379':
  Prevent unhandled exception in NinePatchDrawable
2010-09-26 09:33:31 -07:00
Sonia Serafimova
d45a33554c Prevent unhandled exception in NinePatchDrawable
Added null check in computeBitmapSize() to avoid unhandled
exception "java.lang.NullPointerException" at
android.graphics.Rect.<init>(Rect.java:72).

This problem was discovered in the wild.

Change-Id: I9d40629a052f1390e1811288af6209d8cc3f679b
2010-09-26 09:07:02 -07:00
Jean-Baptiste Queru
ca3f968c6f am 7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"
Merge commit '7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564' into gingerbread-plus-aosp

* commit '7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564':
  Prevent unhandled exception in NinePatchDrawable
2010-09-26 08:39:03 -07:00
Jean-Baptiste Queru
74a8df2026 am dcfb271b: Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Merge commit 'dcfb271b7fa364d567ffd7c495b2baa28a755251' into gingerbread-plus-aosp

* commit 'dcfb271b7fa364d567ffd7c495b2baa28a755251':
  Fix if ACTION_DOWN and lost focus time too close, it will become long press.
2010-09-26 08:38:59 -07:00
Jean-Baptiste Queru
7d9c73fb6f Merge "Prevent unhandled exception in NinePatchDrawable" 2010-09-26 08:22:15 -07:00
Jean-Baptiste Queru
dcfb271b7f Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press." 2010-09-26 08:16:26 -07:00
Mathias Agopian
495ad4f220 am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
Merge commit 'beabe75a842d521b005999460d3a6361ab32108e' into gingerbread-plus-aosp

* commit 'beabe75a842d521b005999460d3a6361ab32108e':
  simple test app for screen capture API
  add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:07:41 -07:00
Dianne Hackborn
c388844d50 am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Merge commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp

* commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a':
  DO NOT MERGE.  Fix issue #3000764: API REVIEW: android.R.*
2010-09-24 18:05:14 -07:00
Mathias Agopian
beabe75a84 Merge changes I1f7c4535,I741c68a2 into gingerbread
* changes:
  simple test app for screen capture API
  add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:02:10 -07:00
Dianne Hackborn
234e42df5f DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Not going out in GB.

Change-Id: I9d4f5938ec7d2a54c0f72b8eb5a177ee66f12146
2010-09-24 18:00:47 -07:00
Patrick Dubroy
a9cf44942b am 88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread
Merge commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f' into gingerbread-plus-aosp

* commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f':
  do not merge - Asset update (pass #3)
2010-09-24 17:00:19 -07:00
Patrick Dubroy
88aa072aab Merge "do not merge - Asset update (pass #3)" into gingerbread 2010-09-24 16:57:46 -07:00
Patrick Dubroy
cc7239b008 do not merge - Asset update (pass #3)
- Updated network status icons & unlock screen

Change-Id: I429ea4bb6090acde1949023e82897712d9fdc924
2010-09-24 16:53:18 -07:00
Raphael
cb7c549870 am 91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.
Merge commit '91512f579e7a1bf91d23254471ee47d3a88d342f' into gingerbread-plus-aosp

* commit '91512f579e7a1bf91d23254471ee47d3a88d342f':
  Layoutlib_create: Unittest for ClassHasNativeVisitor.
2010-09-24 16:43:28 -07:00
Jeff Brown
ca25d2c31d am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.
Merge commit '4d94a766c3f7cf32dd3f5d543048fa801ad22813' into gingerbread-plus-aosp

* commit '4d94a766c3f7cf32dd3f5d543048fa801ad22813':
  Fixed some timeout and lock reentrance issues with broadcasts.
2010-09-24 16:07:24 -07:00
Jeff Brown
4d94a766c3 Fixed some timeout and lock reentrance issues with broadcasts.
When starting a broadcast, the ActivityManagerService posts a delayed
BROADCAST_TIMEOUT_MSG to handle timeouts.  If a premature timeout occurs,
we post a new BROADCAST_TIMEOUT_MSG to extend the timeout time for the
current receiver.  However, if the current receiver does timeout, the
message is consumed and no replacement is ever posted.

To fix the dropped timeouts, we track whether we have a pending broadcast
timeout message and setup a new one when we begin working on the next receiver.

As a last resort, performNextBroadcast contains code to detect whether
a broadcast appears to be hung (timeout handling failed).  If so, it
calls broadcastTimeout to cause it to timeout immediately.
However, performNextBroadcast is holding on to the ActivityManagerService
lock while doing this but broadcastTimout expected to be called
while the lock was not held since after updating the broadcast record state,
it calls appNotResponding.

To fix the unintentended lock reentrance, changed broadcastTimeout to
assume the lock is already held (and the callers ensure this) then
added code to perform the ANR asynchronously.

Renamed a few methods to add "Locked" suffixes where appropriate and added
a few comments for tricky areas uncovered during review.

Change-Id: I3cb5b06d6b6a4a338f32c0998db721f6acf3b082
2010-09-24 16:00:25 -07:00
Steve Howard
ffe477263c am e78fc18b: Intent action to launch downloads UI.
Merge commit 'e78fc18b339bfe2915e61aef2013a17f0a9ede33' into gingerbread-plus-aosp

* commit 'e78fc18b339bfe2915e61aef2013a17f0a9ede33':
  Intent action to launch downloads UI.
2010-09-24 15:51:50 -07:00
Steve Howard
e78fc18b33 Intent action to launch downloads UI.
Change-Id: Ifd21b9b916479062d51e60108d16ce3f46b453a5
2010-09-24 15:43:51 -07: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
a7ef18fca5 Merge "Some debugging support." into gingerbread 2010-09-24 15:28:34 -07:00
Hung-ying Tyan
d6d8327918 am 194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp

* commit '194bbcce9ba15634500f542b9ea017b2cf154b45':
  SIP: longer timeout for making call, shorter for cancelling
2010-09-24 15:19:05 -07:00
Hung-ying Tyan
194bbcce9b SIP: longer timeout for making call, shorter for cancelling
http://b/3021865

Change-Id: I354ebcc00f1ac68e4b7b466745c36aeb314f9138
2010-09-25 06:09:00 +08:00
Mathias Agopian
dce21a3e27 simple test app for screen capture API
Change-Id: I1f7c453508ccfd4faaa8b1279968a358ce3f1e5a
2010-09-24 15:01:49 -07:00
Mathias Agopian
ca5edbeba9 add support for [1974164] Be able to take a screen shot on the device
screenshots are taken using ISurfaceComposer::captureScreen() which returns
the size of the screenshot and an IMemoryHeap containing the data.
screenshots have limitations:
- they will always fail if a secure window is up on screen
- require GL_OES_framebuffer_object extension
- in some situation, video planes won't been captured

Change-Id: I741c68a2d2984fb139039301c3349e6780e2cd58
2010-09-24 14:56:39 -07:00
Raphael
91512f579e Layoutlib_create: Unittest for ClassHasNativeVisitor.
Change-Id: Id101bb3fc2644e450847e73c933cb6f616982f24
2010-09-24 14:04:04 -07:00
Eric Laurent
f3ae63eef2 am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit '52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp

* commit '52f58e96a723a56e6619c237c814a07503745de9':
  fix problem in AudioEffect JNI setup.
2010-09-24 13:46:36 -07:00
Eric Laurent
52f58e96a7 Merge "fix problem in AudioEffect JNI setup." into gingerbread 2010-09-24 13:43:54 -07:00
Eric Laurent
2fb43ef8c0 fix problem in AudioEffect JNI setup.
There is a problem in AudioEffect and Visualizer native_setup() methods
that causes a crash in the application after the mediaserver process
has crashed and restarted.
The problem is that the native AudioEffect/Visualizer constructor is
called while the JNI is in critical state after calling
GetPrimitiveArrayCritical(). As the mediaserver process just restarted, the
first call to AudioSystem will cause the binder IAudioflinger interface to
be reteived and a callback send to AudioSystem JNI to clear the mediaserver
error state. This will call env->FindClass() and crash due to the JNI being
in critical state.

Also fixed a similar problem in AudioTrack JNI

Change-Id: I4a9026a3e26c7f78d9b4b4bec1aac90fbee2ab62
2010-09-24 13:18:14 -07:00
Nick Kralevich
6c48f228f1 am 0cd28fdd: Merge "Use the default SecureRandom provider." into gingerbread
Merge commit '0cd28fdd16ac140d024953c7a076ffb3ec82c8b2' into gingerbread-plus-aosp

* commit '0cd28fdd16ac140d024953c7a076ffb3ec82c8b2':
  Use the default SecureRandom provider.
2010-09-24 13:16:19 -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
Nick Kralevich
0cd28fdd16 Merge "Use the default SecureRandom provider." into gingerbread 2010-09-24 13:10:42 -07:00
Nick Kralevich
9bb4ec484b Use the default SecureRandom provider.
Don't be tricky when trying to set the seed for the secure
random number generator.  Setting the seed manually eliminates
the internal randomization the SecureRandom class does automatically,
reducing randomness.  Just use the default seed, which is designed
to be safe.

Change-Id: I5747c2b3a10cf04e33d2202195951ed5cb82b2fe
2010-09-24 11:48:37 -07:00
Patrick Scott
888bcdbeca am 3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a' into gingerbread-plus-aosp

* commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a':
  Add new Alarm provider class for setting an alarm.
2010-09-24 11:36:51 -07:00
Kenny Root
c55f6da728 am 0b606263: Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread
Merge commit '0b60626391ec840cc4a6d58ef77a2d029c2209dd' into gingerbread-plus-aosp

* commit '0b60626391ec840cc4a6d58ef77a2d029c2209dd':
  Revert "Revert "Free created FileMap when uncompressing files""
2010-09-24 11:36:46 -07:00
Kenny Root
3e07c0007b am 74865ef6: Merge "Add locking around ZIP seeking" into gingerbread
Merge commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9' into gingerbread-plus-aosp

* commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9':
  Add locking around ZIP seeking
2010-09-24 11:36:42 -07:00
Patrick Scott
3ae249dc6a Merge "Add new Alarm provider class for setting an alarm." into gingerbread 2010-09-24 11:34:10 -07:00
Kenny Root
0b60626391 Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread 2010-09-24 11:33:35 -07:00
Kenny Root
74865ef660 Merge "Add locking around ZIP seeking" into gingerbread 2010-09-24 11:33:29 -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
Robert Greenwalt
2d457a32a6 am 8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gingerbread
Merge commit '8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp

* commit '8f97fe551e7bd95abf395eed303b975eaa8f0158':
  Move long Connectivity tasks to handler thread.
2010-09-24 11:09:29 -07:00
Eric Fischer
f2af2d924d am 4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '4318ab058629b701e225bb7ead9dd2b229c9354b' into gingerbread-plus-aosp

* commit '4318ab058629b701e225bb7ead9dd2b229c9354b':
  Import revised translations.  DO NOT MERGE
2010-09-24 11:05:07 -07:00
Patrick Scott
a73c4b082c Add new Alarm provider class for setting an alarm.
The new class provides static variables for creating an intent to broadcast to
applications implementing the alarm clock.  A new permission has been added and
applications are recommended to require this permission if accepting the set
alarm broadcast.

Change-Id: I7b1014acdc54371cbda19bcf9b5c395b647aa413
2010-09-24 13:52:14 -04:00
Andreas Huber
6d8fae722c 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 2010-09-24 10:44:01 -07:00
Robert Greenwalt
8f97fe551e Merge "Move long Connectivity tasks to handler thread." into gingerbread 2010-09-24 10:42:46 -07:00
Eric Fischer
4318ab0586 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-24 10:37:04 -07:00