3738 Commits

Author SHA1 Message Date
Eric Laurent
2ed7818129 am 44217848: am ae6bdc23: Merge "Fix issue 2952766." into gingerbread
Merge commit '4421784895a58bb7bcf90236a9e443b372b5b80e'

* commit '4421784895a58bb7bcf90236a9e443b372b5b80e':
  Fix issue 2952766.
2010-08-30 15:07:45 -07:00
Eric Laurent
4421784895 am ae6bdc23: Merge "Fix issue 2952766." into gingerbread
Merge commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349' into gingerbread-plus-aosp

* commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349':
  Fix issue 2952766.
2010-08-30 15:04:48 -07:00
Eric Laurent
ae6bdc23bd Merge "Fix issue 2952766." into gingerbread 2010-08-30 15:02:06 -07:00
Imre Sunyi
ec959a7e38 am 1429f465: am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead
Merge commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999'

* commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999':
  Shutdown when capacity is 0% and no charging or when battery is dead
2010-08-30 13:28:16 -07:00
Imre Sunyi
1429f465f4 am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead
Merge commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf' into gingerbread-plus-aosp

* commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf':
  Shutdown when capacity is 0% and no charging or when battery is dead
2010-08-30 10:33:35 -07:00
Daniel Sandler
44af754cf0 am d02bdaab: Remove experimental immersive mode support. DO NOT MERGE
Merge commit 'd02bdaab495641ab50e2123fdfd99a819cc40540' into gingerbread-plus-aosp

* commit 'd02bdaab495641ab50e2123fdfd99a819cc40540':
  Remove experimental immersive mode support. DO NOT MERGE
2010-08-27 20:00:29 -07:00
Daniel Sandler
d02bdaab49 Remove experimental immersive mode support. DO NOT MERGE
Bug: 2949215

Change-Id: I7d998ef571ef7e149bb96261430e92150b80b77d
2010-08-27 22:57:39 -04:00
Kenny Root
818c830c59 am 83285781: am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread
Merge commit '8328578152fbfd23952a6cda4b2e60853d78eb74'

* commit '8328578152fbfd23952a6cda4b2e60853d78eb74':
  Allow native shared libraries in ASEC containers
2010-08-27 18:11:06 -07:00
Brad Fitzpatrick
59e6135480 am d71021cb: am 0c731f99: Merge "Send broadcast intent when configured location providers change." into gingerbread
Merge commit 'd71021cb30bd20dabd6783f4235d5f245a7bd1a3'

* commit 'd71021cb30bd20dabd6783f4235d5f245a7bd1a3':
  Send broadcast intent when configured location providers change.
2010-08-27 18:10:38 -07:00
Robert Greenwalt
fc40701c8b Merge "resolved conflicts for merge of 4ea54f44 to master" 2010-08-27 17:27:02 -07:00
Eric Laurent
b8453f4e0e Fix issue 2952766.
The problem is that the audio policy manager does not handle the input devices
when forced use for telephony is changed.
The problem does not appear in a call over PSTN becasue only teh output devices drives the
routing of in call audio to/from the base band.

The fix consists in modifying AudioPolicyManagerBase::setForceUse() to check for active inputs
and update the input device if needed.

Change-Id: I0d36d1f5eef1cce527929180c29b025439902f10
2010-08-27 17:10:36 -07:00
Kenny Root
8328578152 am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread
Merge commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3' into gingerbread-plus-aosp

* commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3':
  Allow native shared libraries in ASEC containers
2010-08-27 16:45:45 -07:00
Kenny Root
85387d7ba3 Allow native shared libraries in ASEC containers
This change moves the native library handling earlier in the package
installation process so that it may be inserted into ASEC containers
before they are finalized in the DefaultContainerService.

Note that native libraries on SD card requires that vold mount ASEC
containers without the "noexec" flag on the mount point.

Change-Id: Ib34b1886bf6f94b99bb7b3781db6e9b5a58807ba
2010-08-27 16:40:06 -07:00
Brad Fitzpatrick
7f7ce40f90 resolved conflicts for merge of 28130bae to master
Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a
2010-08-27 16:11:27 -07:00
Brad Fitzpatrick
d71021cb30 am 0c731f99: Merge "Send broadcast intent when configured location providers change." into gingerbread
Merge commit '0c731f99b05630e16dce572ac206ab75c90891cd' into gingerbread-plus-aosp

* commit '0c731f99b05630e16dce572ac206ab75c90891cd':
  Send broadcast intent when configured location providers change.
2010-08-27 16:10:06 -07:00
Brad Fitzpatrick
0c5a04014d Send broadcast intent when configured location providers change.
See e.g. http://code.google.com/p/android/issues/detail?id=10042

This is also needed by the power control widget, which has no reliable
way otherwise of staying in-sync.

Change-Id: I8f2b6b79b1843329bae952a25ea56f15e3cf92aa
2010-08-27 14:01:23 -07:00
Brad Fitzpatrick
28130baefb resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp
Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
2010-08-27 12:08:40 -07:00
Dianne Hackborn
41bfa37cb2 resolved conflicts for merge of 409b7120 to master
Change-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538
2010-08-27 12:04:26 -07:00
Dianne Hackborn
1040dc465c Improve clipboard API.
- Rename ClippedData to ClipData.
- Introudce ClipDescription subclass.
- Add convenience APIs for creating a ClipData.
- Add ClipboardManager API to get just the ClipDescription.
- Define MIME types associated with a clip.

Change-Id: If97ef91aa99a4dd0ec74ccaea504345c9ef12b5c
2010-08-27 11:06:01 -07:00
Robert Greenwalt
585ac0fc8d resolved conflicts for merge of 4ea54f44 to master
Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56
2010-08-27 11:05:11 -07:00
Brad Fitzpatrick
333b8cba99 SharedPreferences$Editor.startCommit()
Adds a fire-and-forget save method (startCommit) to the
SharedPreferences.Editor, which is the way most people use it anyway.

This commit adds the implementation.  The previous commit added the
interface and docs:

   previous change: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
        git commit: edf32d01316bd3432c023f17747461b08ae36375

In addition, this change:

-- adds a generic "runPendingWorkFinishers" mechanism to
   ActivityThread to wait on async operations that are still
   in flight and use it for this.

-- ties runPendingWorkFinishers into Activity.onPause,
   BroadcastReceiver, and Service.

-- makes sSharedPreferences keyed on name, not File, to avoid
   unnnecessary allocations

-- documents and guarantees what thread
   OnSharedPreferenceChangeListener callbacks run on

-- makes a few things in frameworks/base use startCommit(), notably
   Preference.java (which was ignoring the return value anyway)

Change-Id: I1c8db60ad45643226fe6d246d3e513eeb7bd0ebd
2010-08-27 09:10:11 -07:00
Joe Onorato
1578bf1090 am 03b3de0f: am 00d1772d: am 797e688b: Continue trying to make the turn off quickly after call feature work.
Merge commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37'

* commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37':
  Continue trying to make the turn off quickly after call feature work.
2010-08-26 15:52:13 -07:00
Joe Onorato
267f4d6a22 am 8f0f1b1e: am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread
Merge commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d'

* commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d':
  Just disable widgets that come from apps on sd cards, because they don't work anyway.
2010-08-26 15:52:07 -07:00
Joe Onorato
0add80b454 am 32982c70: am cc45381e: Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread
Merge commit '32982c701cee6f73262200468419b80343a0bea7'

* commit '32982c701cee6f73262200468419b80343a0bea7':
  Fix typo that makes apps on sd work better with app widgets.
2010-08-26 15:52:01 -07:00
Dianne Hackborn
409b71201a am 02486b13: Hide heavy-weight API.
Merge commit '02486b1327e3007c62d253dd89ba9db1852b87f8' into gingerbread-plus-aosp

* commit '02486b1327e3007c62d253dd89ba9db1852b87f8':
  Hide heavy-weight API.
2010-08-26 14:46:43 -07:00
Dianne Hackborn
02486b1327 Hide heavy-weight API.
And give it a better name, for when it is later un-hidden.

Change-Id: Iae0d3054d44f873b9f953bc41d175a47802a185e
2010-08-26 14:41:58 -07:00
Ben Dodson
4e8620f868 Updated documentation for upcoming fix for @code tags
Change-Id: Id7b163179132b9cf180afecb4e9e10ee39bcd415
2010-08-26 14:02:20 -07:00
Joe Onorato
03b3de0faf am 00d1772d: am 797e688b: Continue trying to make the turn off quickly after call feature work.
Merge commit '00d1772d8cfb94066b757034055ac38897d161da' into gingerbread-plus-aosp

* commit '00d1772d8cfb94066b757034055ac38897d161da':
  Continue trying to make the turn off quickly after call feature work.
2010-08-26 12:05:54 -07:00
Joe Onorato
00d1772d8c am 797e688b: Continue trying to make the turn off quickly after call feature work.
Merge commit '797e688b3bebbf1f50a8ad08528740b064f79153' into gingerbread

* commit '797e688b3bebbf1f50a8ad08528740b064f79153':
  Continue trying to make the turn off quickly after call feature work.
2010-08-26 12:02:51 -07:00
Joe Onorato
8f0f1b1e9d am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread
Merge commit '274ad9824a20b61dfbb785621567fd0414a965a4' into gingerbread-plus-aosp

* commit '274ad9824a20b61dfbb785621567fd0414a965a4':
  Just disable widgets that come from apps on sd cards, because they don't work anyway.
2010-08-26 11:55:10 -07:00
Joe Onorato
32982c701c am cc45381e: Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread
Merge commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6' into gingerbread-plus-aosp

* commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6':
  Fix typo that makes apps on sd work better with app widgets.
2010-08-26 11:54:59 -07:00
Joe Onorato
274ad9824a Merge "Just disable widgets that come from apps on sd cards, because they don't work anyway." into gingerbread 2010-08-26 11:50:31 -07:00
Joe Onorato
cc45381e59 Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread 2010-08-26 11:50:28 -07:00
Joe Onorato
797e688b3b Continue trying to make the turn off quickly after call feature work.
The previous implementation worked if the set timeout is short enough, which mine was.  This one
carries the remaining amount of timeout override forward through all of the countdown steps.

Bug: 2844990
Change-Id: I040df22f9f9ddf98c355ac6845b7624e95f84f33
2010-08-26 14:48:56 -04:00
Robert Greenwalt
4ea54f442e Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-26 08:29:10 -07:00
satok
15edaceb2d am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Merge commit '913a8925c07e854a80bf5df87561f290d3a56d61' into gingerbread-plus-aosp

* commit '913a8925c07e854a80bf5df87561f290d3a56d61':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
2010-08-26 07:01:28 -07:00
satok
913a8925c0 DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Change-Id: Ied15b4f2f447ee3e3b858d4ca65c21c30dfa4eba
2010-08-26 22:53:07 +09:00
Imre Sunyi
fd04143a47 Shutdown when capacity is 0% and no charging or when battery is dead
Android framework does not shutdown when battery capacity is 0% and a
charger is attached (USB or AC). This handling is incomplete since a
charger might very well be attached but charging has stopped because
USB suspended or the charging algorithm has stopped because of
battery safety handling. Also shutdown when battery is reported 'dead'.
This might happen although charging is present.

Change-Id: If328260ebf4d38f912e4d2fad204431cbb19c993
2010-08-26 09:23:42 +02:00
Dianne Hackborn
c8f8497b9c resolved conflicts for merge of 66d633d2 to master
Change-Id: I6c38d7c4d127954dfca17082215c587a3cd4a586
2010-08-25 23:14:44 -07:00
Dianne Hackborn
66d633d208 am 3003a017: Merge "Don\'t retain global ref to last inflated context." into gingerbread
Merge commit '3003a017d312a55e3804d6cf4a80044b1f1d7993' into gingerbread-plus-aosp

* commit '3003a017d312a55e3804d6cf4a80044b1f1d7993':
  Don't retain global ref to last inflated context.
2010-08-25 22:02:18 -07:00
Dianne Hackborn
3003a017d3 Merge "Don't retain global ref to last inflated context." into gingerbread 2010-08-25 22:00:28 -07:00
Dianne Hackborn
7e269644fc Don't retain global ref to last inflated context.
Also rework URI permission granting to support upcoming
clipboard use.

Change-Id: I9842920350955531c5a511c2ecc5215e8c783343
2010-08-25 21:50:54 -07:00
Chung-yih Wang
6d92e3c9ad am 5e0d8337: am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread
Merge commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a'

* commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a':
  Add dynamic uid info for tracking the sip service usage.
2010-08-25 19:28:45 -07:00
Chung-yih Wang
5e0d833710 am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread
Merge commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe' into gingerbread-plus-aosp

* commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe':
  Add dynamic uid info for tracking the sip service usage.
2010-08-25 19:26:31 -07:00
Chung-yih Wang
ea52d35e56 Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread 2010-08-25 19:25:02 -07:00
Chung-yih Wang
5424c8dcac Add dynamic uid info for tracking the sip service usage.
Change-Id: Ibc340401b63799326b08aee6eba602a3e753b13f
2010-08-26 10:12:05 +08:00
Robert Greenwalt
b21b62327c resolved conflicts for merge of b998f311 to gingerbread-plus-aosp
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
2010-08-25 17:48:47 -07:00
Konstantin Lopyrev
261d509270 am 5a54e980: am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread
Merge commit '5a54e98022d640900f94102c077d8dff447f3c76'

* commit '5a54e98022d640900f94102c077d8dff447f3c76':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
2010-08-25 17:41:02 -07:00
Konstantin Lopyrev
5a54e98022 am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread
Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp

* commit '6947cc594276df899a0c4662224455f40846bd0a':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
2010-08-25 17:37:45 -07:00
Konstantin Lopyrev
6947cc5942 Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 2010-08-25 17:35:50 -07:00