4533 Commits

Author SHA1 Message Date
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
Kenny Root
d6c54d9786 Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb 2011-01-17 13:02:48 -08:00
Kenny Root
a1cbb94dbc Revert "Add the {get,set}PackageObbPaths calls to API"
This reverts commit 5d40fe9c6846ba765072e50ed1254293cb9195e4.

Change-Id: Ie41010c92fb860b19a12bcf63f6fe95ffa68da81
2011-01-17 13:00:47 -08:00
Andy Stadler
c2e16f0cbd am d9bc2b5e: am 2c12c708: Merge "Add internal plumbing to DPM for encryption" into honeycomb
* commit 'd9bc2b5e9ef462c9fa4ac821e9d8d27ecff1dfaf':
  Add internal plumbing to DPM for encryption
2011-01-17 12:56:40 -08:00
Andy Stadler
22dbfda976 Add internal plumbing to DPM for encryption
* Add code to persist per-admin setting
* Add hooks for OS-level tie-in (is supported, get / set status)
* Add 3rd API call to get OS status (irrespective of admin settings)
* Remove "REQUESTED" status, no longer relevant with 3rd API
* Fixed bug that impacted global proxy settings
* Update api/11.xml to match current.xml

Bug: 3346770
Change-Id: I56bdf9a7894f6ca4842402c7b82ddb3caf4b37b9
2011-01-17 12:47:31 -08:00
Kenny Root
e26aa3f78a am 34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API"
* commit '34d2b41e48281d1df2c844e004740f008e699093':
  Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 12:23:43 -08:00
Kenny Root
c05dc09d27 am 898954d7: am d37d6616: Merge "Add OBB size to PackageStats" into honeycomb
* commit '898954d7469260c339eb776d0a3370b7dbcee720':
  Add OBB size to PackageStats
2011-01-17 12:06:35 -08:00
Kenny Root
34d2b41e48 Revert "Add the {get,set}PackageObbPaths calls to API"
This reverts commit 6c4d904851772313930f800ac7c323cf90c709bb.

Going with a different tactic that doesn't dump stuff on
PackageManagerService.

Bug: 3214719
Change-Id: I0bbeccf3c21d264deda4256eb53713d2c98284f4
2011-01-17 11:49:22 -08:00
Kenny Root
bcd6c96e75 Add OBB size to PackageStats
Bug: 3356814
Change-Id: I4f871fb9fd0cb2f3177cc756631f95d928862571
2011-01-17 11:21:52 -08:00
satok
a8ed84c6bc am d039293c: am 5a1473ba: Merge "Implicitly/Explicitly subtypes bug." into honeycomb
* commit 'd039293c172a6d2135c737af39d919ae2c42c919':
  Implicitly/Explicitly subtypes bug.
2011-01-16 23:51:55 -08:00
satok
f6cafb6375 Implicitly/Explicitly subtypes bug.
Change-Id: I6ccc22d4272ee92c0d8ba3f3c724d8f838d51310
2011-01-17 16:29:02 +09:00
David 'Digit' Turner
924e8ae4c4 am 5356487f: am 3612f087: Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb
* commit '5356487f8bf732d7ff4cd89692cf5937b54c1721':
  SystemServer: Do not register null BlueTooth service in the emulator
2011-01-16 23:08:24 -08:00
Jeff Brown
c886ff38c7 am fed9d654: am 5cdf0752: Merge "Support non-rectangular input regions." into honeycomb
* commit 'fed9d654e9f769a2d81682121faff01fee11555f':
  Support non-rectangular input regions.
2011-01-16 23:08:18 -08:00
Kenny Root
a9d5188cc6 am d259468f: am fc28f412: Merge "Put externalSize measurements in PackageStats" into honeycomb
* commit 'd259468fe92b9714b45a134e781ce09681e70217':
  Put externalSize measurements in PackageStats
2011-01-16 23:05:15 -08:00
Irfan Sheriff
3e1dc1c482 am a81851f0: am b2c1a5c3: Merge "Fix WPS to provides immediate feedback" into honeycomb
* commit 'a81851f0743d5c0bf620c72a18b7fdfc42bb7f28':
  Fix WPS to provides immediate feedback
2011-01-16 23:00:15 -08:00
Dianne Hackborn
3b403694be am 64e30643: am c237bb27: Merge "Add manifest API to request a large heap." into honeycomb
* commit '64e306430570fcfb35a1b14e1b333ad114b23829':
  Add manifest API to request a large heap.
2011-01-16 22:59:39 -08:00
David 'Digit' Turner
3612f0870c Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb 2011-01-16 19:25:01 -08:00
Jeff Brown
5cdf075241 Merge "Support non-rectangular input regions." into honeycomb 2011-01-16 19:22:01 -08:00
Jeff Brown
fbf0977321 Support non-rectangular input regions.
This enables the system bar to carve out a region through which
events will be sent to the IME behind it.

Bug: 3238092
Change-Id: I69b855a8d9b5b3ee525266c0861826e53e5b5028
2011-01-16 18:58:49 -08:00
Kenny Root
366949c2d9 Put externalSize measurements in PackageStats
When measuring a package's usage, put the external size in the
PackageStats as well. This will allow programs using a lot of space on
the external card to be held accountable.

Bug: 3308791
Change-Id: If2df07bdbf6ffb31577074fad8f4a87ca4e89086
2011-01-16 16:21:15 -08:00
David 'Digit' Turner
e2a5e86c9f SystemServer: Do not register null BlueTooth service in the emulator
Because registering a null service generates an exception. See bug 3356000

Change-Id: Id7b4af815942e498d750c1b7a412d5ee26b61ad4
2011-01-17 01:10:21 +01:00
Irfan Sheriff
1cd94ef957 Do not add unsolicited events to queue
Adding unsolicited events to response queue
results in doCommand() returning the wrong
result.

Pulling this change from master.

Bug: 3258529
Change-Id: I2a4b0bd8bb30b31682d7d61ee94a0d246bf10de2
2011-01-16 14:31:55 -08:00
Irfan Sheriff
b2c1a5c388 Merge "Fix WPS to provides immediate feedback" into honeycomb 2011-01-16 13:02:57 -08:00
Dianne Hackborn
3b81bc18bb Add manifest API to request a large heap.
You can now do android:largeHeap="true" on an application.

Doesn't yet do anything, waiting for Dalvik API.

Also tweak package parsing so that the SDK API level is set in the
configuration, allowing manifest resource value selection based on
that.

Change-Id: I6e035f9702a97b055416743b88f83a22ba4a9584
2011-01-16 12:08:38 -08:00
Jeff Brown
db10a638fd am 12116af5: am c8276990: Merge "Add volume down as a safe mode key for Stingray." into honeycomb
* commit '12116af5c422608d609ec884939ee8ceba3279b9':
  Add volume down as a safe mode key for Stingray.
2011-01-16 10:40:20 -08:00
Jeff Brown
c8276990df Merge "Add volume down as a safe mode key for Stingray." into honeycomb 2011-01-14 17:22:53 -08:00
satok
37d997f766 am fb77a336: am 604363dc: Merge "switchToLastInputMethod returns a implicitly enabled subtype in the history" into honeycomb
* commit 'fb77a336af46ceb5a718c5ee7fc34da4b4a06f2a':
  switchToLastInputMethod returns a implicitly enabled subtype in the history
2011-01-14 15:40:26 -08:00
satok
df31ae6a30 switchToLastInputMethod returns a implicitly enabled subtype in the history
Bug: 3353363

Change-Id: Id5f8a62017880330401ebd3e77d943eb7817e555
2011-01-15 08:34:39 +09:00
Jeff Brown
53183aeb35 am 9781071a: am e76820bf: Merge "Use holo style mouse pointer." into honeycomb
* commit '9781071ae704c9370901e248f1f5bc79fcefc3c7':
  Use holo style mouse pointer.
2011-01-14 13:13:03 -08:00
Kenny Root
8470165e6e am 014ef618: am bd392c53: Check for null in PackageSetting constructor
* commit '014ef61842dd877b60cb16d433ecff9165944fd8':
  Check for null in PackageSetting constructor
2011-01-14 13:12:54 -08:00
Kenny Root
b220d62bf3 am ea6bf362: Deep clone settings for system package update DO NOT MERGE
* commit 'ea6bf3628140283df24f2652b686d083b0d31ed9':
  Deep clone settings for system package update DO NOT MERGE
2011-01-14 13:05:53 -08:00
Jeff Brown
909733cdeb Use holo style mouse pointer.
Change-Id: I17df431075c8ffec3ade151c6c85ec34ad8397dd
2011-01-14 13:02:40 -08:00
Kenny Root
bd392c5397 Check for null in PackageSetting constructor
Should bring honeycomb into parity with gingerbread changes.

Change-Id: Ieb48a0e420d4c2981130f268aba9b24f4fe25b84
2011-01-14 12:58:12 -08:00
Brad Fitzpatrick
39f35f0a62 am 9dde087d: am 1e8d23f6: Merge "Watchdog can get deadlocked on activity manager" into honeycomb
* commit '9dde087dcb94341bd2b66e186534dc44e660a2ce':
  Watchdog can get deadlocked on activity manager
2011-01-14 12:51:57 -08:00
Brad Fitzpatrick
1e8d23f6b0 Merge "Watchdog can get deadlocked on activity manager" into honeycomb 2011-01-14 12:48:08 -08:00
Kenny Root
27b775a62d am d9fa11b4: am 312206b9: Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
* commit 'd9fa11b446da5dbc92776518c20bab1f04e55537':
  Add the {get,set}PackageObbPaths calls to API
2011-01-14 12:46:34 -08:00