33186 Commits

Author SHA1 Message Date
Hung-ying Tyan
718e0033e6 Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread 2010-10-04 23:03:26 -07:00
Hung-ying Tyan
1862af57b2 Merge "SipService: supply PendingIntent when open a profile." into gingerbread 2010-10-04 23:02:55 -07:00
Dianne Hackborn
6f7e10ca0a Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread 2010-10-04 23:00:25 -07:00
satok
d87c2594c6 Add utility of enabled InputMethod settings to InputMethodManagerService
- Add setter of enabled InputMethodSubtypes
- Enabled InputMethods are saved as follows:
-- enabled_inputmethod0;enabled_subtype0;enabled_subtype1:enabled_inputmethod1
- TODO: Fix Settings application to parse new Enabled InputMethod string.
-- Currently IMMS doesn't save InputMethodSubtypes so this will not break Settings application.

Change-Id: Icd0f13de396ce286ff6563e8c2775d53bcdacbf3
2010-10-05 14:51:31 +09:00
Hung-ying Tyan
c6548fd9ed SIP: add SERVER_UNREACHABLE error code.
Let SipSession return it when UnknownHostException is caught.
Add DisconnectCause.SERVER_UNREACHABLE in Connection and have SipPhone report
it when receiving SERVER_UNREACHABLE from SipSession.

http://b/issue?id=3061691

Change-Id: I944328ba3ee30c0a9386e89b5c4696d4d9bde000
2010-10-05 13:30:28 +08:00
Neal Nguyen
daa9b8c69a am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Merge commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368' into gingerbread-plus-aosp

* commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368':
  Fixing some flakiness of some DL Manager tests.
2010-10-04 21:09:52 -07:00
Neal Nguyen
95037fb1a6 Merge "Fixing some flakiness of some DL Manager tests." into gingerbread 2010-10-04 21:07:37 -07:00
Jeff Brown
f358cecb9c am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.
Merge commit '79a3981e3885b9144bb3d458682141eed7365939' into gingerbread-plus-aosp

* commit '79a3981e3885b9144bb3d458682141eed7365939':
  Fix Looper leaks in MediaRecorderStressTest.
2010-10-04 21:05:02 -07:00
Jeff Brown
79a3981e38 Fix Looper leaks in MediaRecorderStressTest.
The test was failing periodically due to too many files being open.
This change attempts to resolve the problem on the theory that
signaling pipe file descriptors are being leaked due to the large
number of Looper instances created during the test run.

However, it's still possible there are other leaks elsewhere.

Change-Id: I71f9f12d21605c47c9217c72c51e6c768142ce10
2010-10-04 21:01:29 -07:00
Mathias Agopian
ff04e97faf am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit 'f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp

* commit 'f461930872beb4362998642c115691bdd2e94617':
  fix [2835280] Add support for cancelling buffers to ANativeWindow
2010-10-04 20:21:14 -07:00
Romain Guy
2fe9a8f6f6 Correctly invalidate the drawing cache when an invalidate is requested.
Change-Id: Ic78f85d728a14a9f2e4a1925d46b6db9a204bbb1
2010-10-04 20:19:34 -07:00
Mathias Agopian
722665c5f7 am ef115308: fix build. SurfaceView.setFrame needed to be hidden
Merge commit 'ef11530874f86570aa04a10c16a416b274b3fdf5' into gingerbread-plus-aosp

* commit 'ef11530874f86570aa04a10c16a416b274b3fdf5':
  fix build. SurfaceView.setFrame needed to be hidden
2010-10-04 20:18:51 -07:00
Mathias Agopian
f461930872 Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread 2010-10-04 20:17:25 -07:00
Mathias Agopian
ef11530874 fix build. SurfaceView.setFrame needed to be hidden
Change-Id: I96b0896e24483e9b5db19c938cb6058868f34e48
2010-10-04 20:15:08 -07:00
Mathias Agopian
8ddd2c72ee fix [2835280] Add support for cancelling buffers to ANativeWindow
There is a new ANativeWindow::cancelBuffer() API that can be used to
cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is
returned to the list of availlable buffers. dequeue and cancel are not
mutually thread safe, they must be called from the same thread or
external synchronization must be used.

Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
2010-10-04 20:10:11 -07:00
Mathias Agopian
bba3b8efbe am 19058877: Merge "refactored screenshot code" into gingerbread
Merge commit '19058877df9bf94f197a72855f810f7f6bf8d068' into gingerbread-plus-aosp

* commit '19058877df9bf94f197a72855f810f7f6bf8d068':
  refactored screenshot code
2010-10-04 20:06:51 -07:00
Mathias Agopian
9fa7926bea am b9aacfdf: Merge "new screencap command" into gingerbread
Merge commit 'b9aacfdfb014cc0299f7999d2a8940cd60a4cc59' into gingerbread-plus-aosp

* commit 'b9aacfdfb014cc0299f7999d2a8940cd60a4cc59':
  new screencap command
2010-10-04 20:06:47 -07:00
Mathias Agopian
19058877df Merge "refactored screenshot code" into gingerbread 2010-10-04 20:04:42 -07:00
Mathias Agopian
b9aacfdfb0 Merge "new screencap command" into gingerbread 2010-10-04 20:04:37 -07:00
Adam Powell
815b1eb870 am 1c2911a6: Merge "Fix bug 3061769" into gingerbread
Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp

* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
  Fix bug 3061769
2010-10-04 19:59:35 -07:00
Adam Powell
1c2911a648 Merge "Fix bug 3061769" into gingerbread 2010-10-04 19:56:49 -07:00
Brett Chabot
2ad24f944e Failing test cleanup.
Change-Id: I7cabc6ff2ec1fcb80dede5da03b03622a5bae021
2010-10-04 19:55:14 -07:00
Mathias Agopian
b99e81ab4c am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
Merge commit '7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3' into gingerbread-plus-aosp

* commit '7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3':
  fix [3008290] passion GB surface does not send surfaceChanged notification after size change.
2010-10-04 19:52:41 -07:00
Mathias Agopian
7e6064ad7c Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread 2010-10-04 19:50:16 -07:00
Christopher Tate
2347b59e58 Merge "Refinements to drag/drop" 2010-10-04 19:40:28 -07:00
Hung-ying Tyan
323d3671ac SipService: supply PendingIntent when open a profile.
The SipService used to take an action string and broadcasts an intent with
that action string when an incoming call is received. The design is not safe
(as the intent may be sniffed) and inflexible (can only received by
BroadcastReceiver). Now we use PendingIntent to fix all these.

Companion CL: https://android-git.corp.google.com/g/#change,71800

Change-Id: Id12e5c1cf9321edafb171494932cd936eae10b6e
2010-10-05 10:13:25 +08:00
Gil Dobjanschi
3937d3d4f2 Merge "Added mute APIs for MediaVideoItem and AudioTrack" 2010-10-04 19:04:36 -07:00
Gil Dobjanschi
61f9184547 Added mute APIs for MediaVideoItem and AudioTrack
Change-Id: I2e4e8b213a5d19f895d9e3431b7d4f1acad70762
2010-10-04 19:02:28 -07:00
Elliott Hughes
86214276e0 am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
Merge commit '7280f2155c37b00359c3fb050e2b067dcd74db40' into gingerbread-plus-aosp

* commit '7280f2155c37b00359c3fb050e2b067dcd74db40':
  Manually revert a single-line error inserted by OpenJDK.
2010-10-04 18:55:32 -07:00
Elliott Hughes
7280f2155c Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread 2010-10-04 18:51:38 -07:00
Scott Main
d9ec8eba56 resolved conflicts for merge of 7008b7c1 to master
Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e
2010-10-04 18:42:49 -07:00
James Dong
a86a6c4e32 am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54' into gingerbread-plus-aosp

* commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54':
  Fixed an issue where the reserved free space in the file writer was larger than intended
2010-10-04 18:39:52 -07:00
James Dong
6f1c7bda39 Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread 2010-10-04 18:37:48 -07:00
Dianne Hackborn
54e570f78b Make it easier to figure out whether an app can go on sd card.
Change-Id: I9195a0881b2c435b138f39c2ab1505dc820caf10
2010-10-04 18:35:10 -07:00
Christopher Tate
2c095f3677 Refinements to drag/drop
Thumbnail measurement & drawing has been moved out into a delegate
class called View.DragThumbnailBuilder.  This consolidates the
thumbnail-related code as well as ensuring that the drag initiator
does not have to know a priori where to place the thumbnail relative
to the touch point *before* the thumbnail measurement step, as was
previously the case.

startDrag() no longer needs to be told where the current touch point
is at the time the drag is launched.

Drag events are now dispatched only to VISIBLE views.

Dispatch shouldn't double-recycle events any more when the target
window is local to the system process.

Change-Id: I49419103765a0cad2e18ddfcdd6dacb94daf1ff1
2010-10-04 18:29:09 -07:00
Elliott Hughes
388c14c294 Manually revert a single-line error inserted by OpenJDK.
Introduced by:
  https://android-git.corp.google.com/g/71675

Change-Id: I37722a8cc6bd247fe45651c2b680c2f399ccc5ac
2010-10-04 18:29:05 -07:00
Nick Pelly
c7bfb13fd9 am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit '15f107b151deff1f25f1255bdbcb630ed576ac8d' into gingerbread-plus-aosp

* commit '15f107b151deff1f25f1255bdbcb630ed576ac8d':
  New API stubs: NdefMessage and NdefRecord.
2010-10-04 18:27:27 -07:00
Patrick Dubroy
629e26bbef am 242fa52b: am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
Merge commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270'

* commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270':
  Fix 2-pixel offset unlock jog tab
2010-10-04 18:23:44 -07:00
Nick Pelly
15f107b151 Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread 2010-10-04 18:21:57 -07:00
Gilles Debunne
e9e9467688 am 52810607: Revert "Restored ic_dialog_menu_generic asset."
Merge commit '528106070b6622e82fd22783007f6dbc29b96701' into gingerbread-plus-aosp

* commit '528106070b6622e82fd22783007f6dbc29b96701':
  Revert "Restored ic_dialog_menu_generic asset."
2010-10-04 18:13:34 -07:00
Vasu Nori
060e25bf12 don't print informational messages from sqlite in log
right now, all messages from sqlite are printed in the logfile.
if the error code = 0, then sqlite message is just an informational
message that usually has no meaning to the developers
and ends up confusing the developers.
discard such messages

Change-Id: I961f1b33a745d5e9b20c85ee8a0071c92c253d96
2010-10-04 18:10:51 -07:00
Nick Pelly
dc993791fc New API stubs: NdefMessage and NdefRecord.
NDEF Messages and NDEF Record data classes.

Change-Id: I9b7114773281b0eb9680f595c95ac79943d2903b
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-04 17:56:23 -07:00
Gilles Debunne
1153629cd6 am e91398d1: Revert for 68833 and 68483 which introduced new assets instead of just updating.
Merge commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88' into gingerbread-plus-aosp

* commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88':
  Revert for 68833 and 68483 which introduced new assets instead of just updating.
2010-10-04 17:53:55 -07:00
Gilles Debunne
528106070b Revert "Restored ic_dialog_menu_generic asset."
This reverts commit c37eac249719a8f930cb2b9d3c5bdee591018cc5.
2010-10-04 17:53:01 -07:00
Gil Dobjanschi
f124ce7394 Merge "Save AudioTrack to XML" 2010-10-04 17:52:43 -07:00
Adam Powell
82cf90173f Fix bug 3061769
Change-Id: I58a7fd4f8b488fc025c911e11072dd53db5ad4d5
2010-10-04 17:48:49 -07:00
Mathias Agopian
597c7f67b5 refactored screenshot code
the core screenshot function now can capture the screen at any lower resolution
performing bilinear filtering.

we also now have some client code to interface with the screenshot service.

it's now possible to request a screenshot at a lower resolution.

Change-Id: I33689bba98507ab928d0898b21596d0d2fe4b953
2010-10-04 17:36:17 -07:00
Mathias Agopian
541d942000 new screencap command
this captures the framebuffer via surfaceflinger APIs and outputs
it to stdout. this is intended to be used by adbd.

Change-Id: I057e331d28dd92bd45a2c7037ab93e220bbd65f3
2010-10-04 17:35:34 -07:00
Gilles Debunne
e91398d134 Revert for 68833 and 68483 which introduced new assets instead of just updating.
Change-Id: Ib37c0a61c5a2b061e4e70268db6d02a9adde10c2
2010-10-04 17:25:29 -07:00
Romain Guy
28d891409c Merge "Remove logs to reduce logcat spam." 2010-10-04 17:24:21 -07:00