4674 Commits

Author SHA1 Message Date
Tadashi G. Takaoka
2ee0635d46 am 6c51e1fc: am 90fcb2ad: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
* commit '6c51e1fc9dd61bf5c269590305b3276f9e38c1ef':
  Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
2011-01-20 05:21:18 -08:00
Tadashi G. Takaoka
90fcb2ad93 Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb 2011-01-20 05:17:51 -08:00
Tadashi G. Takaoka
f49688fa17 Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
Change-Id: I27c318777355991ae4ad72d0b2480e93c8c5044e
2011-01-20 22:02:56 +09:00
Hung-ying Tyan
3ed8dcfc42 am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb
* commit '9e0357b96bd5c84e39c3084625d58b21f9bad74c':
  Make VpnService synchronous API.
2011-01-19 22:46:32 -08:00
Hung-ying Tyan
6b818de29a Make VpnService synchronous API.
This eases VpnSettings on dealing with multiple-activity-instance problem
(i.e., SettingsActivity and VpnSettingsActivity).

+ Most of the code is moved from the VpnServices package to vpn/java/.
+ VpnManager and VpnServiceBinder are revised to provide synchronous API.
+ Add a new method isIdle() to IVpnService.aidl.

Related bug: 3293236 (need to deal with multiple-activity-instance problem)

Change-Id: I03afa3b3af85d7b4ef800683cd075c356a9266c4
2011-01-20 12:51:43 +08:00
Christopher Tate
ee97fb6c33 am 55573d92: am 5ea769dc: Merge "Make the drag input window fullscreen touchable again" into honeycomb
* commit '55573d926a1ce6a0a65f06b22b02d92789c05edf':
  Make the drag input window fullscreen touchable again
2011-01-19 17:34:14 -08:00
Christopher Tate
a159579778 Make the drag input window fullscreen touchable again
Having it non-touchable was making it possible to e.g.
touch buttons and launch new activities out from under
an in-flight drag operation.

Bug 3370698

Change-Id: I46fe70a8fe8fbaa5cca48f6bb478ed7ded1f1cc3
2011-01-19 17:26:50 -08:00
Christopher Tate
ef3f7bd356 am 67265808: am 28f0a53a: Merge "Fail more gracefully when window state changes during drags" into honeycomb
* commit '67265808c10e53f305f59a65911d7bfcd82151a6':
  Fail more gracefully when window state changes during drags
2011-01-19 16:45:48 -08:00
Christopher Tate
28f0a53a88 Merge "Fail more gracefully when window state changes during drags" into honeycomb 2011-01-19 16:41:14 -08:00
Christopher Tate
f01af7551b Fail more gracefully when window state changes during drags
In particular, if a new window was created out from under the drag,
the drag-move event dispatch logic would wind up blithly assuming
that it would find a valid touch-dispatchable window under the
finger.  When this was untrue, it would NPE, but the NPE was caught
and discarded safely by higher-level guard code.

With this change, we now avoid the NPE entirely and report the
spurious condition as part of the debugging log stream.

(Also add the local-state object to DragEvent.toString()'s output.)

Change-Id: Idfa5f45d049e48415ee59c8b0ffb5b0ed4098ce3
2011-01-19 16:25:22 -08:00
Brad Fitzpatrick
28d5206519 am bd80a12c: resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp
* commit 'bd80a12cba480a0dbb2e9073f35c758d8b396b94':
  StrictMode: class instance limits (track object "leaks")
2011-01-19 15:24:02 -08:00
Brad Fitzpatrick
9240f16d77 Merge "StrictMode: class instance limits (track object "leaks")" into honeycomb 2011-01-19 14:53:24 -08:00
Brad Fitzpatrick
bfbe577110 StrictMode: class instance limits (track object "leaks")
Change-Id: I2db5a19060c2013078feb88a91caf655469b2f98
2011-01-19 14:52:08 -08:00
Christopher Tate
22da4dd48e am 714066d8: am 5383d077: Merge "Fix a couple of drag & drop crashes" into honeycomb
* commit '714066d873b70098c09c2c094d374781b12d65a2':
  Fix a couple of drag & drop crashes
2011-01-19 13:55:55 -08:00
Christopher Tate
1fc014fd00 Fix a couple of drag & drop crashes
1. ViewGroups being removed from the layout during a drag would wind up
crashing the app with an NPE at drag-ended time, due to blind dereference
of now-cleared object pointers.

2. Passing a 'null' ClipData to startDrag() would crash the system
process with an NPE.  Should this even be valid?  I'm inclined to say
yes, though it means that apps will need to guard against it.

Fixes bug 3369542

Change-Id: I168fc1284d6fd4403999946609725414cf254df0
2011-01-19 13:02:24 -08:00
Robert Greenwalt
b57da00b81 Merge "Fix Tethering's handling of a system restart." 2011-01-19 09:33:48 -08:00
Winson Chung
875777d0b8 am adce48cc: am 7f447de2: Merge "Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets." into honeycomb
* commit 'adce48ccba909e5d9c5595aef97460afd9d62834':
  Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets.
2011-01-19 01:03:00 -08:00
Winson Chung
32cf193412 Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets.
Change-Id: Iee53d4930dc4007df4298a282cdd5101876215a1
2011-01-19 00:52:34 -08:00
Winson Chung
a726143937 am caedec76: am aac19783: Merge "Refactoring app widgets to address security/performance issues." into honeycomb
* commit 'caedec768bf22acc38e526b9cec655ea8f9eede0':
  Refactoring app widgets to address security/performance issues.
2011-01-18 23:08:11 -08:00
Winson Chung
81f39eb6e7 Refactoring app widgets to address security/performance issues.
- Moving the service binding to AppWidgetService to prevent arbitrary apps from binding to widget services
- Requiring RemoteViewsServices to require android.permission.BIND_REMOTEVIEWS permission

Change-Id: Id135bafba998299eb278067712b8a5d8487cfd04
2011-01-18 22:57:09 -08:00
Dianne Hackborn
375d008522 am a4605b72: am e6413270: Merge "Just a little \'ol activity manager permission change." into honeycomb
* commit 'a4605b72c278be829b28bfa218cdba461c1667a7':
  Just a little 'ol activity manager permission change.
2011-01-18 22:00:28 -08:00
Jeff Brown
7cca7e0b28 am 761a6b7f: am f4368c95: Merge "Filter virtual keys after touches." into honeycomb
* commit '761a6b7fdbe2bcc6db4306af9705dcb22b036068':
  Filter virtual keys after touches.
2011-01-18 21:56:31 -08:00
Kenny Root
3f56e4a53b am 67f23166: am 11ebdd6a: Merge "Erase OBB files when removing packages" into honeycomb
* commit '67f23166d00d0b965d5b913bcc0cfb442c0e9506':
  Erase OBB files when removing packages
2011-01-18 21:53:21 -08:00
Brad Fitzpatrick
6b2b053b5a am 597fa828: Merge "Watchdog can get deadlocked on activity manager" into gingerbread
* commit '597fa828fa2b3cba053f0afeeac877b1ee2d24b7':
  Watchdog can get deadlocked on activity manager
2011-01-18 18:54:25 -08:00
Dianne Hackborn
6c2c5fc993 Just a little 'ol activity manager permission change.
We no longer enforce permissions for applications that are accessing
their own components.  This allows an application to require a permission
on one of its components that it does not itself have.  This is useful
for example with the new advanced widgets, which require a system-only
permission on the implementing service to ensure the app's data stays
private but it is nice to allow the application to still touch its own
widget service.

Change-Id: I5d61930a083816919545870039ad191314ed48c6
2011-01-18 17:02:33 -08:00
Robert Greenwalt
547e4e757b Fix Tethering's handling of a system restart.
A crash of the system server leaves us out of sync with the kernel network setup.
Try to recover.

bug:3241213
Change-Id: I70c0daa0d54ecee6e203bcba2460e8d069305a89
2011-01-18 16:52:16 -08:00
Brad Fitzpatrick
0971a1367f Watchdog can get deadlocked on activity manager
Bug: 3351719
Change-Id: Idf3907709340062849a09dd094137e86256ed739
2011-01-18 16:42:20 -08:00
Jeff Brown
f4368c959f Merge "Filter virtual keys after touches." into honeycomb 2011-01-18 15:26:15 -08:00
Jeff Brown
fe50892af3 Filter virtual keys after touches.
Adds a new virtualKeyQuietTimeMillis configuration resource that sets
the duration for which virtual keys will be dropped after recent touches
on screen.  The default value is 0; it is intended to be overridden
per device using a resource overlay.

This change is designed to help in two cases:

1. Swipes from touchscreen into virtual key area.
2. Accidental taps in virtual key area while using on-screen keyboard.

Bug: 3089163
Change-Id: Ib912d4f8a4df9966a39cd537d3ec7c24afab7225
2011-01-18 15:10:45 -08:00
Irfan Sheriff
ef76b8306f am 4170b463: Merge "Do not add unsolicited events to queue" into gingerbread
* commit '4170b46329ed91e81cf22dba82e2dadc326b3e3d':
  Do not add unsolicited events to queue
2011-01-18 14:43:04 -08:00
Irfan Sheriff
4170b46329 Merge "Do not add unsolicited events to queue" into gingerbread 2011-01-18 14:40:18 -08:00
Jeff Brown
b26c516c03 am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
* commit '41395459e676cf9ab4059e08446656f145662c2d':
  Filter virtual keys after touches.  (DO NOT MERGE)
2011-01-18 14:38:27 -08:00
Jeff Brown
41395459e6 Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread 2011-01-18 14:31:31 -08:00
Kenny Root
300c13a481 Erase OBB files when removing packages
OBB files on USB storage or SD card should be removed when an
application is removed.

Bug: 3356804
Change-Id: Ifbbf043368b125fcd47fd74e5cd2e5167a8deb00
2011-01-18 13:55:42 -08:00
Dianne Hackborn
2e1469a13d am f6759102: am 3aa959b9: Merge "Fix issue #3362666 Activities launched from ongoing notifications don\'t animate" into honeycomb
* commit 'f67591025debf040695e9ed0d0edeff5ef0c5db2':
  Fix issue #3362666 Activities launched from ongoing notifications don't animate
2011-01-18 12:10:36 -08:00
David Turner
760e91cd85 am adec2de2: am 6195eb13: Merge "Prevent Dropbox from crashing system server pre-boot." into honeycomb
* commit 'adec2de2e35f3dab186d1abbbeb7497921a35c2c':
  Prevent Dropbox from crashing system server pre-boot.
2011-01-18 12:10:17 -08:00
Dianne Hackborn
3aa959b9ce Merge "Fix issue #3362666 Activities launched from ongoing notifications don't animate" into honeycomb 2011-01-18 11:14:46 -08:00
Dianne Hackborn
08121bca5b Fix issue #3362666 Activities launched from ongoing notifications don't animate
The phone-oriented code for turning off animations when the screen is entirely
covered by the status bar was not appropriate for the tablet.

Change-Id: Ica3e0db989f16b9187eacd6ecf4ac3d17661dd6d
2011-01-18 11:08:40 -08:00
Brad Fitzpatrick
34165c6967 Prevent Dropbox from crashing system server pre-boot.
Bug: 3362748
Change-Id: I3f94f22798eb4a6ef14dd9a418fd3c054637e16b
2011-01-18 10:52:42 -08:00
satok
c93e7f4d35 am a639ea5c: am ca0f49ed: Merge "Fix the algorithm to get current input method subtype considering explicitly and implicitly enabled subtypes." into honeycomb
* commit 'a639ea5c92dd9c63270d7d81427937fc3990954d':
  Fix the algorithm to get current input method subtype considering explicitly and implicitly enabled subtypes.
2011-01-18 08:48:49 -08:00
Dianne Hackborn
3c3a7f55bb am 2d6dae2f: am 80ad0b0a: Merge "Fix a bunch of API review bugs." into honeycomb
* commit '2d6dae2f4d2ce98adcb6fe83bcaa91a506805859':
  Fix a bunch of API review bugs.
2011-01-17 23:32:02 -08:00
satok
ca0f49ed6e Merge "Fix the algorithm to get current input method subtype considering explicitly and implicitly enabled subtypes." into honeycomb 2011-01-17 21:14:46 -08:00
satok
d871343dbb Fix the algorithm to get current input method subtype considering explicitly and implicitly enabled subtypes.
Change-Id: I2e6d9ae36a1335f67b6db7659244cdfb2bfe3068
2011-01-18 13:28:23 +09:00
Dianne Hackborn
327fbd2c8f Fix a bunch of API review bugs.
3362464 API REVIEW: android.content potpourri
3362445 API REVIEW: Fragment transaction stuff
3362428 API REVIEW: Fragment stuff
3362418 API REVIEW: Loader stuff
3362414 API REVIEW: android.content.pm.ActivityInfo

Change-Id: I6475421a4735759b458acb67df4380cc6234f147
2011-01-17 16:23:42 -08:00
Irfan Sheriff
ff017477f8 am fc6ef518: am 326feb89: Merge "Pick an upstream interface with valid IP config" into honeycomb
* commit 'fc6ef518e0696ca45608ca07803aa50081f9f72f':
  Pick an upstream interface with valid IP config
2011-01-17 14:47:41 -08:00
Irfan Sheriff
326feb8965 Merge "Pick an upstream interface with valid IP config" into honeycomb 2011-01-17 14:14:07 -08:00
Irfan Sheriff
29552095e1 Pick an upstream interface with valid IP config
As a work around for the issue of picking
the wrong interface, add a check for selecting
an upstream interface that has a valid IP configuration

Bug: 3362306
Change-Id: I01084517cff756c97660b2cfbfa8e9bf26673148
2011-01-17 13:50:48 -08:00
David 'Digit' Turner
a881c44e77 am 0e8280cc: am fed70229: Merge "UsbService: Remove stack-trace message during boot." into honeycomb
* commit '0e8280cc6e5d553066d5f09892c12c2a8a846791':
  UsbService: Remove stack-trace message during boot.
2011-01-17 13:30:21 -08:00
David 'Digit' Turner
49db853513 UsbService: Remove stack-trace message during boot.
This removes a stack trace message during the boot under emulation.

The observers tried to access a null reference when no USB configuration
is supported by the emulated device. So do not start them in this case.

+ Change a Slog.w into a Slog.i since this is an acceptable condition.

Change-Id: I126b7f05c9648e39a060eb0974cc6f4ac7533791
2011-01-17 22:09:10 +01:00
Kenny Root
9b4320f9db am a33dd09b: am d6c54d97: Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb
* commit 'a33dd09b5cc62b50afc3a15cd8b67b5344756f1e':
  Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 13:07:47 -08:00