4247 Commits

Author SHA1 Message Date
Christopher Tate
8c39fc1484 am bab84e85: am 6458202a: Merge "Suppress orientation changes during drag operations" into honeycomb
* commit 'bab84e85860234bf491edd2e64fdf42eb3d57a0a':
  Suppress orientation changes during drag operations
2011-01-13 14:24:43 -08:00
Christopher Tate
6458202abe Merge "Suppress orientation changes during drag operations" into honeycomb 2011-01-13 14:20:48 -08:00
Fabrice Di Meglio
242d8a78f8 am aa45d43f: am 27ac243e: Merge "Print currentDestinationString() for each backup transport" into honeycomb
* commit 'aa45d43fcb16684b93e0fad3248ce90ac130f120':
  Print currentDestinationString() for each backup transport
2011-01-13 12:49:00 -08:00
Fabrice Di Meglio
27ac243e2d Merge "Print currentDestinationString() for each backup transport" into honeycomb 2011-01-13 12:45:27 -08:00
Fabrice Di Meglio
8aac3ee086 Print currentDestinationString() for each backup transport
when doing a "adb shell dumpsys backup"

Change-Id: I9a7d080ad50b715f693f3e16cae3d6e5b1189d47
2011-01-13 12:37:44 -08:00
Jason parks
8c3dc00a7d am 4a534fa8: am a3cdaa53: Revert "Remove the APIs for the old encryption scheme."
* commit '4a534fa899e0101e26e5b670383aa357c10483b8':
  Revert "Remove the APIs for the old encryption scheme."
2011-01-13 12:21:10 -08:00
Jason parks
a3cdaa5337 Revert "Remove the APIs for the old encryption scheme."
This reverts commit 1125d780a8b61703b8eb28c5c77dac5f3f0022dd.
2011-01-13 14:15:43 -06:00
Robert Greenwalt
255362b604 am 4b43f944: am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '4b43f94499b6d0c4a34961d48b97d5e48a039f65':
  Turn off DUN connection after tethering.
2011-01-13 10:25:25 -08:00
Robert Greenwalt
495056ab67 Merge "Turn off DUN connection after tethering." into honeycomb 2011-01-13 10:02:29 -08:00
Jason parks
02f9acbdb4 am da6f7dbf: am ca6777b2: Merge "Remove the APIs for the old encryption scheme." into honeycomb
* commit 'da6f7dbf9f8bf90c84147dbc57b885b3ece03e81':
  Remove the APIs for the old encryption scheme.
2011-01-13 07:44:36 -08:00
Jason parks
21f62b9e46 Merge "Add a method enable encryption." into honeycomb 2011-01-13 07:41:53 -08:00
Jason parks
ca6777b23b Merge "Remove the APIs for the old encryption scheme." into honeycomb 2011-01-13 07:40:46 -08:00
Wink Saville
49167d749f am a8aa5fb4: am 5bf6cc01: Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb
* commit 'a8aa5fb4ad3b784034cd4972adf127f5e8f86b13':
  Initialize mOtaspMode to OTASP_UNKNOWN.
2011-01-13 06:29:06 -08:00
Wink Saville
5bf6cc0126 Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb 2011-01-13 06:24:09 -08:00
Andy Stadler
328526c975 am 199ae7dc: am 7b0f8f08: API changes to support encryption in DPM
* commit '199ae7dce11badac71c27b1d973e24387dd5f924':
  API changes to support encryption in DPM
2011-01-12 21:18:48 -08:00
Andy Stadler
7b0f8f08ac API changes to support encryption in DPM
* New uses-policies value
* Definitions for storage domain and encryption status
* API to get and set encryption status
* Intent to launch encryption changes
* Both new calls bottom out in the DPM service and are suitable for
  a device that does not support encryption.

NOTE: Nobody should use ACTION_START_ENCRYPTION yet.  It needs a receiver
  to be built in Settings (different CL).

Change-Id: I2ae193bedbec59f6ba46c0ec7de12ecf321e5803
2011-01-12 21:11:32 -08:00
Christopher Tate
b7e7bc42f1 am 3186e0da: am 44a94bb5: Merge "Turn off debugging logspam for release" into honeycomb
* commit '3186e0da33256400b52024b268c9e6e048caee6c':
  Turn off debugging logspam for release
2011-01-12 20:27:21 -08:00
Christopher Tate
994ef9296a Turn off debugging logspam for release
Fixes bug 2679101

Change-Id: I94cf1b1d0b732b2030008118eff3534f0e0608f7
2011-01-12 20:06:07 -08:00
Christopher Tate
ccd24de8a9 Suppress orientation changes during drag operations
Fixes bug 3322455

Change-Id: I21d4dbc3aaf6c8ba7afcb73a823d6443c61a4d1b
2011-01-12 17:52:31 -08:00
Robert Greenwalt
19b9ab46a9 Turn off DUN connection after tethering.
Use matching feature type when turning tethering off or the request is ignored.

Also, turn on DUN apn right away so that we don't fail aggressive test cases.

Also don't report connections for enabled apn's that we're no longer connected to.

bug:3332880
bug:3338033
Change-Id: I7db2dfd4879f03465bc9f6d39488c078570dcaf3
2011-01-12 15:52:10 -08:00
Dianne Hackborn
ea8c3baf36 am 7ca0b1c5: am a353581c: Merge "Fix issue #3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb
* commit '7ca0b1c58623ad1adfb3324df235d4172e44c83a':
  Fix issue #3344089: runtime restart due to java.lang.StackOverflowError...
2011-01-12 14:36:03 -08:00
Jason parks
56aa5321fe Add a method enable encryption.
This is for testing and needs to be cleaned up.

Change-Id: I29958f2a95c7773744e61bbd23a302b752614f87
2011-01-12 16:00:23 -06:00
Wink Saville
c9330ddcf4 Initialize mOtaspMode to OTASP_UNKNOWN.
Without the explicit initialized the default value was 0 which
is OTASP_UNINITIALIZED instead it should be OTASP_UNKNOWN.

Change-Id: I44ffc60618c0b1d49e07ccbce408c4e9921d8130
2011-01-12 13:37:38 -08:00
Dianne Hackborn
2e7ffa54c1 Fix issue #3344089: runtime restart due to java.lang.StackOverflowError...
...in WindowManager after app force closed a few times

Change-Id: I9d5ff16b01d14030150ba0904a47635f9c7a158f
2011-01-12 13:21:28 -08:00
Jason parks
1125d780a8 Remove the APIs for the old encryption scheme.
Change-Id: I55116a5b29b10dfd50015805ec019b485257f68b
2011-01-12 15:01:34 -06:00
Kenny Root
090093592e am c669559d: am b5a4b5d3: Merge "Allow updated system apps to retain priority" into honeycomb
* commit 'c669559dc3c1d348145d902c623166a9d874b5a8':
  Allow updated system apps to retain priority
2011-01-12 12:02:04 -08:00
Kenny Root
502e9a47c6 Allow updated system apps to retain priority
Previously any updated system apps would not be able to have a greater
than 0 priority on an activity intent filter. Moving the priority check
later in the package scanning allows it to apply to updated system
packages as well.

Cherry-pick from gingerbread branch

Bug: 2572398
Change-Id: I95d8b6360bf7a3f39cd7a1ff09e1ee57e11583d8
2011-01-12 11:57:23 -08:00
Robert Greenwalt
8403cbf100 am 1ea7e5df: am a78e9f05: Merge "Fix any_connection reporting." into honeycomb
* commit '1ea7e5df91f023d03fa7c87c534e6024795abaaa':
  Fix any_connection reporting.
2011-01-12 07:21:32 -08:00
Robert Greenwalt
a78e9f0558 Merge "Fix any_connection reporting." into honeycomb 2011-01-12 07:16:56 -08:00
satok
41514d740b am 52b18265: am 31d9d895: Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
* commit '52b18265680073c02b0b0a1ff9c3d4d95a6779be':
  Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".
2011-01-12 01:21:59 -08:00
satok
31d9d895d7 Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb 2011-01-12 01:17:58 -08:00
satok
3da922367c Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".
Bug:  3329578

Change-Id: Ib45ca20560c96faa6e2798242f3d1c3fe5156457
2011-01-12 16:17:46 +09:00
Christopher Tate
00ac23f104 am 771fcc5e: am 28514f8f: Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
* commit '771fcc5e3d87f81663fe91149f3b680beec65f4a':
  API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
2011-01-11 20:06:19 -08:00
Robert Greenwalt
f21ef7db77 Fix any_connection reporting.
A recent change caused us to think there was no other connection available
when transitioning from 3g to wifi.

bug:3335074
Change-Id: I1f55df8a0eb5b27131572b111fbaac8f1ebbc0d3
2011-01-11 18:32:17 -08:00
Christopher Tate
02d2b3ba9b API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
There will be, in the future, a flag (View.DRAG_FLAG_GLOBAL) that means
for the drag to be cross-application.  For now that flag constant is @hide
and furthermore the server-side implementation strips it, enforcing
local-only drags.

Change-Id: I8db840480ab90e18a5b8ecf29d62b4e6eafd405e
2011-01-11 18:30:23 -08:00
Svetoslav Ganov
4d8939f50a am 8aba7513: am 147f7df3: Merge "IAE: Service not registered: com.android.server.AccessibilityManagerService" into honeycomb
* commit '8aba7513481594611c22d444dde6e666fefd1fc0':
  IAE: Service not registered: com.android.server.AccessibilityManagerService
2011-01-11 17:58:41 -08:00
Svetoslav Ganov
147f7df35c Merge "IAE: Service not registered: com.android.server.AccessibilityManagerService" into honeycomb 2011-01-11 17:53:15 -08:00
Irfan Sheriff
7f338c460f am f537bbdd: am 7ac190d6: Merge "default wifi sleep policy change" into honeycomb
* commit 'f537bbdda0e0b7bd8052d278b8970d59477cd6c1':
  default wifi sleep policy change
2011-01-11 17:31:12 -08:00
Irfan Sheriff
7ac190d60d Merge "default wifi sleep policy change" into honeycomb 2011-01-11 17:26:18 -08:00
Irfan Sheriff
96b10d669e default wifi sleep policy change
Keep wifi sleep policy as never when charged as long as
user has not changed the settings

Bug: 3038345
Change-Id: I0598af41fe0144f2dfddc5bd331bd91d91e0ffea
2011-01-11 15:40:35 -08:00
Svetoslav Ganov
6f089b877e IAE: Service not registered: com.android.server.AccessibilityManagerService
bug:3331645

1. Let the binder the AccessibilityManagerService has obtained while connecting
   to an accessibility services be garbage collected since when binding we will
   will get in the on #onServiceConnected callback and it can be potentially
   another instance.

Change-Id: I87aa5e5f741e2e54c72d3d0d396ac00eda5aeb5c
2011-01-11 15:04:49 -08:00
Kenny Root
9b35ac3f05 am 1c258707: am 2275cd48: Merge "Copy user info from PackageSetting as well" into honeycomb
* commit '1c2587071d8a7ad44967e4c4baf66c6ae01e31b5':
  Copy user info from PackageSetting as well
2011-01-11 12:34:53 -08:00
Kenny Root
2275cd48a2 Merge "Copy user info from PackageSetting as well" into honeycomb 2011-01-11 11:46:19 -08:00
Kenny Root
97ef63ba1e Copy user info from PackageSetting as well
In order not to clobber the internal system's settings, we duplicate it
before putting it back into mPackages, but the PackageSetting has a
couple extra pieces of information that weren't being copied.

Bug: 3339279
Change-Id: Ic9b64117f287d53f2c0cebb924c775405690938e
2011-01-11 11:15:35 -08:00
Svetoslav Ganov
3e6129684f am 4bcfdef3: am 52b13678: Merge "IOBE while diabling accessibility with some enabled accessibility services." into honeycomb
* commit '4bcfdef3d676d846f3c7209aaf26c849c0239cba':
  IOBE while diabling accessibility with some enabled accessibility services.
2011-01-11 10:05:42 -08:00
Svetoslav Ganov
52b136783c Merge "IOBE while diabling accessibility with some enabled accessibility services." into honeycomb 2011-01-11 10:01:00 -08:00
Jeff Brown
f9e6df6ded am 57e120cc: am f527a1d9: Merge "Prevent events from getting backlogged." into honeycomb
* commit '57e120ccc4c64f52686c062058fa50c89d81cdf6':
  Prevent events from getting backlogged.
2011-01-10 20:22:04 -08:00
Jeff Brown
f527a1d936 Merge "Prevent events from getting backlogged." into honeycomb 2011-01-10 20:17:28 -08:00
Joe Onorato
72da9fe86a am a72f59a2: am 94d7eef3: Merge "Make AppWidgetService handle components enabling and disabling." into honeycomb
* commit 'a72f59a23105a7da3ac7e758d57706eee66406d5':
  Make AppWidgetService handle components enabling and disabling.
2011-01-10 18:06:32 -08:00
Joe Onorato
d070e89396 Make AppWidgetService handle components enabling and disabling.
Change-Id: Ie6b75cb90be38bbce694ccf2d5a342d7f0172fa4
2011-01-10 17:26:39 -08:00