28304 Commits

Author SHA1 Message Date
John Wang
844a6b3cca Turn off additional debug.
Bug:3038245
Change-Id: If3c894511b4bbfd0d3e95b51aeca299edbbcf55d
2010-10-12 11:32:24 -07:00
Irfan Sheriff
bf844308a2 fix start driver for corner cases DO NOT MERGE
- Force a start when in RUN_STATE_STOPPING since there
could have a stop driver in that state
- When a driver started event is received is received
from the supplicant, force a reconnect since we could
have out of an intermediate stop event that would have
forced the run state to STOPPED

Bug: 3087621
Change-Id: I3652747a267a3da8349a9fd5c4065d3837a0c545
2010-10-12 11:30:22 -07:00
Leon Scroggins
00c50b2e49 am f348502c: Merge "Allow TextView to do its thing." into gingerbread
Merge commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59' into gingerbread-plus-aosp

* commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59':
  Allow TextView to do its thing.
2010-10-12 11:23:12 -07:00
Leon Scroggins
f348502c70 Merge "Allow TextView to do its thing." into gingerbread 2010-10-12 10:24:48 -07:00
Brad Fitzpatrick
4711d21a55 am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
Merge commit '9facd2d0847691ae46108713d6a7dc9f51a62135' into gingerbread-plus-aosp

* commit '9facd2d0847691ae46108713d6a7dc9f51a62135':
  StrictMode: link to designing for responsiveness ANR docs
2010-10-12 08:23:40 -07:00
Brad Fitzpatrick
9facd2d084 Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread 2010-10-12 08:09:55 -07:00
Leon Scroggins
23cb86a47d Allow TextView to do its thing.
Bug:3085639

Call super.onTouchEvent for ACTION_UP and ACTION_CANCEL.
This removes the old selection as appropriate.

Bug:3085587

Make the cursor visible so that the insertion handle
appears when tapping on the field.

Change-Id: If5ea6219de9ca351667021743b2e63edc6c47250
2010-10-12 09:52:56 -04:00
Jeff Brown
4b255a2304 am 03aa28fb: Merge "Improve the input policy handling a bit." into gingerbread
Merge commit '03aa28fb36589a3d601be08e75c08a24c4344d6f' into gingerbread-plus-aosp

* commit '03aa28fb36589a3d601be08e75c08a24c4344d6f':
  Improve the input policy handling a bit.
2010-10-12 01:04:16 -07:00
Jeff Brown
03aa28fb36 Merge "Improve the input policy handling a bit." into gingerbread 2010-10-12 01:01:14 -07:00
Hung-ying Tyan
ebc886c857 Fix SipSessionGroup from throwing ConcurrentModificationException
http://b/issue?id=3087256

Change-Id: I67df64105db7c1295649f1f3ce77f99025ce3d44
2010-10-12 15:41:11 +08:00
Jeff Brown
3122e4488a Improve the input policy handling a bit.
Fixed some issues with Monkeys turning off their own screens.  Ook ook!
Added some more comments to explain what's going on.

Change-Id: Id2bc0466161a642a73ef7ef97725d1c81e984b12
2010-10-12 00:16:14 -07:00
Chung-yih Wang
b99db0c70e am 4367ab00: Set the wifi-only for SIP service as the default config.
Merge commit '4367ab00edb59f95703e4a8a0f9a1a73dbf13551' into gingerbread-plus-aosp

* commit '4367ab00edb59f95703e4a8a0f9a1a73dbf13551':
  Set the wifi-only for SIP service as the default config.
2010-10-11 21:49:26 -07:00
Chung-yih Wang
4367ab00ed Set the wifi-only for SIP service as the default config.
Change-Id: I90d2d14b5d9c953e45f85d3d5128d096ea17b22e
bug-id: http://b/3068006
2010-10-12 12:39:50 +08:00
Hung-ying Tyan
f5b7c855fb am f5201ab7: Keep original phone number in SipConnection.
Merge commit 'f5201ab71ff4d104265ab126e86afc6b81da8011' into gingerbread-plus-aosp

* commit 'f5201ab71ff4d104265ab126e86afc6b81da8011':
  Keep original phone number in SipConnection.
2010-10-11 20:55:56 -07:00
Hung-ying Tyan
f5201ab71f Keep original phone number in SipConnection.
In case it's a PSTN number carried by an Internet call, the phone app can still
get the original phone number from Connection.getAddress() instead of getting a
SIP URI.

http://b/issue?id=3085996

Change-Id: Ie6c66100a4b5b2ce3f73baa1b446761cd51d7727
2010-10-12 11:34:01 +08:00
Jeff Brown
b05632aae3 am a28d5aff: Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread
Merge commit 'a28d5aff5466a55149b9e6f9cd908fcc225c25ff' into gingerbread-plus-aosp

* commit 'a28d5aff5466a55149b9e6f9cd908fcc225c25ff':
  Fix a bug synthesizing cancelation events for motions.
2010-10-11 20:24:38 -07:00
Jeff Brown
a28d5aff54 Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread 2010-10-11 20:22:02 -07:00
Hung-ying Tyan
c74d39173e am ece7e11b: Merge "SipService: fix a missing switch-case break." into gingerbread
Merge commit 'ece7e11b3723140b31d28bae6ed6f1ae30e5d802' into gingerbread-plus-aosp

* commit 'ece7e11b3723140b31d28bae6ed6f1ae30e5d802':
  SipService: fix a missing switch-case break.
2010-10-11 20:04:28 -07:00
Hung-ying Tyan
ece7e11b37 Merge "SipService: fix a missing switch-case break." into gingerbread 2010-10-11 20:02:05 -07:00
Hung-ying Tyan
685b61b711 SipService: fix a missing switch-case break.
Change-Id: I638eecd8000293d4cb37b3595c02ca33df4924eb
2010-10-12 10:46:29 +08:00
Dianne Hackborn
a007ab294d am ffbc4b94: Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread
Merge commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83' into gingerbread-plus-aosp

* commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83':
  Fix SD card mounting issues #3074555 and #3072332
2010-10-11 19:17:05 -07:00
Dianne Hackborn
ffbc4b948d Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread 2010-10-11 19:13:33 -07:00
Dianne Hackborn
d39d515b91 Fix SD card mounting issues #3074555 and #3072332
Change-Id: I79572bb4e92d2546abd97512a119ae74f0d72019
3074555: Kill "Shared storage safe to remove" notification
3072332: "blank shared storage" notification doesn't go anywhere
2010-10-11 19:12:21 -07:00
Jeff Brown
a1160a798b Fix a bug synthesizing cancelation events for motions.
Change-Id: I881c0fa16c1d22c4b1b6cca24deb0105405ff5b0
2010-10-11 18:22:53 -07:00
Kenny Root
c30414329c am de846ac6: Merge "Change to new binder implementation for OBB" into gingerbread
Merge commit 'de846ac659e8c14d898a3fa14bd0504b24096057' into gingerbread-plus-aosp

* commit 'de846ac659e8c14d898a3fa14bd0504b24096057':
  Change to new binder implementation for OBB
2010-10-11 17:43:05 -07:00
Kenny Root
de846ac659 Merge "Change to new binder implementation for OBB" into gingerbread 2010-10-11 17:40:53 -07:00
Kenny Root
4a99ed8977 Change to new binder implementation for OBB
Change-Id: I3282df361a11fc37e94bc5ba4bd5860ae62a10e4
2010-10-11 17:38:51 -07:00
Kenny Root
8bb7a1dfbb am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbread
Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp

* commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45':
  OBB: rearrange to be entirely asynchronous
2010-10-11 17:31:06 -07:00
Joe Onorato
0ad4a77cb7 am 1169f420: Merge "Add animation for the status bar going away." into gingerbread
Merge commit '1169f420f6df5cf5254fed883efa7e6780473c08' into gingerbread-plus-aosp

* commit '1169f420f6df5cf5254fed883efa7e6780473c08':
  Add animation for the status bar going away.
2010-10-11 17:26:59 -07:00
Jeff Brown
f2e0681ada am 1da8d4d1: Merge "Fix an event injection bug when the policy is bypassed." into gingerbread
Merge commit '1da8d4d1697cec871dea8c30dad67e90db10bde6' into gingerbread-plus-aosp

* commit '1da8d4d1697cec871dea8c30dad67e90db10bde6':
  Fix an event injection bug when the policy is bypassed.
2010-10-11 17:26:51 -07:00
Joe Onorato
d965724fdc am 44104df1: Merge "Fix status bar flashing after orientation change" into gingerbread
Merge commit '44104df10660c711129fd263364afc2174f40ac2' into gingerbread-plus-aosp

* commit '44104df10660c711129fd263364afc2174f40ac2':
  Fix status bar flashing after orientation change
2010-10-11 17:26:38 -07:00
Kenny Root
1c67b7af01 am a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbread
Merge commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e' into gingerbread-plus-aosp

* commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e':
  Grant URI permissions to the MCS
2010-10-11 17:26:07 -07:00
Kenny Root
b4de3dca96 Merge "OBB: rearrange to be entirely asynchronous" into gingerbread 2010-10-11 17:24:54 -07:00
Kenny Root
af9d667ccf OBB: rearrange to be entirely asynchronous
Rearrange structure of MountService handling of OBBs to be entirely
asynchronous so we don't rely on locking as much. We still need the
locking to support dumpsys which has been improved to output all the
data structures for OBBs.

Added more tests to cover more of the error return codes.

Oh and fix a logic inversion bug.

Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
2010-10-11 17:22:03 -07:00
Joe Onorato
1169f420f6 Merge "Add animation for the status bar going away." into gingerbread 2010-10-11 16:37:41 -07:00
Joe Onorato
bb60d1e36b Add animation for the status bar going away.
Bug: 3077525
Change-Id: I0c166fc161f8febe963e667259517173b9ac609b
2010-10-11 16:35:48 -07:00
Jeff Brown
1da8d4d169 Merge "Fix an event injection bug when the policy is bypassed." into gingerbread 2010-10-11 16:27:36 -07:00
Joe Onorato
44104df106 Merge "Fix status bar flashing after orientation change" into gingerbread 2010-10-11 16:26:36 -07:00
Jeff Brown
b931a1b418 Fix an event injection bug when the policy is bypassed.
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.

Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
2010-10-11 16:26:13 -07:00
Joe Onorato
0d7349bd92 Fix status bar flashing after orientation change
hand merge 43a87c5c874f1b8fbf582ff522f10051a6434906
and add some more fixes

Change-Id: Iea608bfba37e2e4c6a3430c13f683e54b0eff64b
2010-10-11 16:24:50 -07:00
Kenny Root
a4e95dfea4 Merge "Grant URI permissions to the MCS" into gingerbread 2010-10-11 15:49:30 -07:00
Jean-Baptiste Queru
cf88cf878b am 15f7ff3c: Merge "Fix compile errors in telephony tests"
Merge commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f' into gingerbread-plus-aosp

* commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f':
  Fix compile errors in telephony tests
2010-10-11 15:32:12 -07:00
Joe Onorato
14854820ea am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp

* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
  Add a configuration option to turn on the screen when you unplug the device.
2010-10-11 15:22:30 -07:00
Joe Onorato
c0ad216c8e Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread 2010-10-11 15:19:47 -07:00
Joe Onorato
6d74765662 Add a configuration option to turn on the screen when you unplug the device.
Bug: 3068624
Change-Id: I7366ece2528b31feee920f4600a475e81a0f3709
2010-10-11 15:16:28 -07:00
Scott Main
ad9a559c61 am 3d90d11a: am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
Merge commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0' into gingerbread-plus-aosp

* commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0':
  Revert "docs: new web apps dev guides" Do not merge.
2010-10-11 15:15:09 -07:00
Jean-Baptiste Queru
15f7ff3c5a Merge "Fix compile errors in telephony tests" 2010-10-11 15:11:59 -07:00
Kenny Root
1112857632 Grant URI permissions to the MCS
When the PackageManagerService is asked to install from a URI, it might
be explicitly granted the permission to read from the URI content
provider. We need to pass along these permissions to the
MediaContainerService (DefaultContainerService) to ensure the MCS can
read from the content provider.

Change-Id: Ie7ddaeb638af82b60792a4c3f8c99e1e8eef1916
2010-10-11 15:11:12 -07:00
Scott Main
3d90d11a7b am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
Merge commit '3fd40ee692ed1d4bca40e184119b0d1368671037' into gingerbread

* commit '3fd40ee692ed1d4bca40e184119b0d1368671037':
  Revert "docs: new web apps dev guides" Do not merge.
2010-10-11 15:04:20 -07:00
Chris Tate
a75803e950 am 0a789236: Merge "Temporarily turn on backup/restore debug logs" into gingerbread
Merge commit '0a7892367f46e3653e9857195ec19356f848b7f8' into gingerbread-plus-aosp

* commit '0a7892367f46e3653e9857195ec19356f848b7f8':
  Temporarily turn on backup/restore debug logs
2010-10-11 14:45:22 -07:00