4314 Commits

Author SHA1 Message Date
Mike Lockwood
b6e5fa895c GPS: Do not call sGpsInterface->init() multiple times
Change-Id: I5f2b55959bd67864168690c1fe619e55edc18268
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-09 20:14:33 -04:00
Kenny Root
682d143dec am 6ed0cfd3: am 5919ac6b: OBB: track binder death observers
Merge commit '6ed0cfd3e798e3014c9f1099631249463d25140c'

* commit '6ed0cfd3e798e3014c9f1099631249463d25140c':
  OBB: track binder death observers
2010-10-08 17:58:15 -07:00
Kenny Root
06f89ca9b1 am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread
Merge commit '36455d03256024981b1bf21557722a010b5e092a'

* commit '36455d03256024981b1bf21557722a010b5e092a':
  Add MountService tests and fix a bug it found
2010-10-08 17:57:55 -07:00
Dianne Hackborn
fa9921e4bc am e89bf502: am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
Merge commit 'e89bf50261902bf263887923bf95595ec8eae069'

* commit 'e89bf50261902bf263887923bf95595ec8eae069':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
2010-10-08 17:57:35 -07:00
Jason Chen
39b4867d48 Revert "Merge "Allow notifications to not specify a contentIntent.""
This reverts commit 8885321046622d6a8c0a4214af98dc27eecd48a0, reversing
changes made to 61b8aaadd742f0be708cd37971d2c9e822bf778a.
2010-10-08 16:22:53 -07:00
Dianne Hackborn
681f327e83 am 62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread
Merge commit '62d8874eb74045b37140857ea3b31f198f0adffa' into gingerbread-plus-aosp

* commit '62d8874eb74045b37140857ea3b31f198f0adffa':
  Fix retaining of granted permissions when updating of system app.
2010-10-08 15:24:30 -07:00
Dianne Hackborn
62d8874eb7 Merge "Fix retaining of granted permissions when updating of system app." into gingerbread 2010-10-08 15:21:49 -07:00
Joe Onorato
8885321046 Merge "Allow notifications to not specify a contentIntent." 2010-10-08 15:16:14 -07:00
Dianne Hackborn
c58e9bff10 am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread
Merge commit 'db56b9bd39e739474684987b83f386f50596aa5d' into gingerbread-plus-aosp

* commit 'db56b9bd39e739474684987b83f386f50596aa5d':
  Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
2010-10-08 15:12:55 -07:00
Dianne Hackborn
2fe979fc61 Fix retaining of granted permissions when updating of system app.
Was broken when the app is using a shared user ID.

Change-Id: I088334f6540889969ee4367fa502807ce3f94f6a
2010-10-08 15:07:17 -07:00
Joe Onorato
80a752c537 Allow notifications to not specify a contentIntent.
If they don't, the click events will be passed through to the individual
views in the notification view, which may have their own PendingIntents
attached.

Previously, it was against the UX spec to allow this, but now we are
changing that and will have buttons in there.

Change-Id: Ie3b2e96c6a1c4449fa86ed571f3ad0f047320d31
2010-10-08 17:57:18 -04:00
Dianne Hackborn
ecfd7f7d95 Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
WifiService needs to keep the calling identity cleared while
it is doing all of its internal work.

Change-Id: I2bd720e26efcf5ad5839693307d61e51f0658ace
2010-10-08 14:28:02 -07:00
Mathias Agopian
118c8490da Merge "fix a bug where timeouts would only be handled when a message was delivered" 2010-10-08 13:46:07 -07:00
Mathias Agopian
fe0ed4575e Merge "Fix a null dereference" 2010-10-08 12:44:19 -07:00
Mike Lockwood
98e1f3840f am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread
Merge commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21' into gingerbread-plus-aosp

* commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21':
  Remove races in Geocoder/LocationProvider Proxy
2010-10-08 11:20:33 -07:00
Mike Lockwood
aecab79b4e Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread 2010-10-08 11:17:17 -07:00
Dianne Hackborn
a1b0d6966e resolved conflicts for merge of efa4f7f8 to master
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
2010-10-08 11:09:38 -07:00
satok
0ff647b030 Add a cancel button to InputMethodPicker and InputMethodSubtypePicker
Change-Id: Ia64b9716c18da5a541c7fc04a507541d2ab952da
2010-10-08 13:49:28 +09:00
Dianne Hackborn
b77455ee29 am 78d68836: Implement tracking of package install times.
Merge commit '78d688369a2240009d3bbe4126996a973b2e2fe2' into gingerbread-plus-aosp

* commit '78d688369a2240009d3bbe4126996a973b2e2fe2':
  Implement tracking of package install times.
2010-10-07 20:13:24 -07:00
Mathias Agopian
ad8d48a6b6 fix a bug where timeouts would only be handled when a message was delivered
Change-Id: Id3127b21c1a1a1afab32911a8edbb202360d7c9b
2010-10-07 19:59:06 -07:00
satok
26b29d1b87 Merge "Show "more" button in the dialog of InputMethodSubtypePicker" 2010-10-07 19:48:43 -07:00
Dianne Hackborn
78d688369a Implement tracking of package install times.
Provides information about the time at which the package was
first installed and the time it was last updated.

Change-Id: Icb43f77b5b669a1ce685e8913046b8be386b6175
2010-10-07 18:48:22 -07:00
Kenny Root
0689b60b86 am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread
Merge commit '54e01e0f980cfb78153d5481f7e67cef90416174' into gingerbread-plus-aosp

* commit '54e01e0f980cfb78153d5481f7e67cef90416174':
  Symlink application lib directory when on SD card
2010-10-07 17:41:05 -07:00
Kenny Root
6a6b007c77 Symlink application lib directory when on SD card
This will help legacy games that use dlopen() to directly access the
/data/data/<app>/lib directory before the
ApplicationInfo.nativeLibraryDir was part of the API.

Change-Id: Ie9f3e7239b6334708b5d086ffafe66a507f6d9da
2010-10-07 17:20:26 -07:00
Robert Greenwalt
df255c2283 Stop using unauthorized dns
We were using somebody elses dns without permission - rude.  Switch to using
secondary google public dns.

bug:3045768
Change-Id: I042262bb96d3efed4c0265dc7ff6ac418e4d4f1e
2010-10-07 15:32:08 -07:00
Mathias Agopian
3e1a18ac6d Fix a null dereference
Change-Id: I3df446b90c1607782778749de7ba0f8c00698c33
2010-10-07 14:57:04 -07:00
Kenny Root
c0c2076e9a am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread
Merge commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9' into gingerbread-plus-aosp

* commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9':
  Eliminate MCS_GIVE_UP state
2010-10-07 14:01:55 -07:00
Kenny Root
c296f22e71 am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID"
Merge commit '0145e36cad1472acafb492b3f009ca6eba9593ea' into gingerbread-plus-aosp

* commit '0145e36cad1472acafb492b3f009ca6eba9593ea':
  Revert "Only allow 8 OBBs to be mounted by a UID"
2010-10-07 14:01:23 -07:00
Eric Laurent
786c57150c am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
Merge commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3'

* commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3':
  Fixed AudioFlinger not always pausing tracks
2010-10-07 12:23:39 -07:00
Joe Onorato
2cddeb4b82 am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread
Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba'

* commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba':
  PowerManagerService needs yet another flag...
2010-10-07 12:22:03 -07:00
Kenny Root
c5610a4c13 am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'

* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
  Remove lingering system app native libs in /data
2010-10-07 12:21:22 -07:00
Kenny Root
13297fddcb am f2cc2e52: am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread
Merge commit 'f2cc2e522177683145b2daa0de0ed898b865824d'

* commit 'f2cc2e522177683145b2daa0de0ed898b865824d':
  Get correct native library path on reinstall
2010-10-07 12:20:25 -07:00
Mike Lockwood
058ad782e6 Merge "resolved conflicts for merge of 6327a9fe to master" 2010-10-07 10:57:08 -07:00
Mike Lockwood
22f41918fa resolved conflicts for merge of 6327a9fe to master
Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64
2010-10-07 13:55:25 -04:00
Kenny Root
480afe70fa Eliminate MCS_GIVE_UP state
It's basically a duplicate of MCS_UNBIND state, so just get rid of it
which simplifies the state transitions.

Bug: 3067076
Change-Id: I34111be88dd727af8ad59c9f49debd54ede827ea
2010-10-07 10:53:01 -07:00
Joe Onorato
7d56e3d3cb Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached." 2010-10-07 10:52:30 -07:00
Kenny Root
0145e36cad Revert "Only allow 8 OBBs to be mounted by a UID"
This reverts commit 27358a69b33eaa268ee75ef778ec824c8085adcc.

Conflicts:

	services/java/com/android/server/MountService.java

Change-Id: Ia14be97b4f22e95daba0d191cfc62adf3d1469cd
2010-10-07 10:14:09 -07:00
satok
7f35c8cc88 Show "more" button in the dialog of InputMethodSubtypePicker
- Handle subtypes correctly in InputMethodPicker

Change-Id: I0ff9baec46724ca9dee2a7943fee69d4b204589e
2010-10-07 23:59:18 +09:00
Kenny Root
6ed0cfd3e7 am 5919ac6b: OBB: track binder death observers
Merge commit '5919ac6b4188285324646772501ef4b97b353cf4' into gingerbread-plus-aosp

* commit '5919ac6b4188285324646772501ef4b97b353cf4':
  OBB: track binder death observers
2010-10-07 07:16:18 -07:00
Kenny Root
36455d0325 am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread
Merge commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp

* commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed':
  Add MountService tests and fix a bug it found
2010-10-07 07:16:08 -07:00
Dianne Hackborn
e89bf50261 am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
Merge commit 'ef083ec008a3ec69180340912e7f0137472c97d9' into gingerbread-plus-aosp

* commit 'ef083ec008a3ec69180340912e7f0137472c97d9':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
2010-10-07 07:15:57 -07:00
Tony Wu
43a87c5c87 Fix sometimes mExpandedView will appear while screen transforming.
While watching YouTube and receiving a call, after hang up the call,
mExpandedView may flash when screen transform from Phone to YouTube.

Change-Id: Ib25a0cd1086c278b91a2b34e21744a3c432a8f35
2010-10-07 17:53:43 +08:00
satok
47a44916e2 Add InputMethodEnabler for enabling input methods and subtypes
- Copyed functionarity from LanguageSettings.java

TODO: Save enabled InputMethodSubtypes

Change-Id: I7b4fb1a79cb8b3229f88773d261430e23ba7aae2
2010-10-07 14:43:16 +09:00
Christopher Tate
5ada6cb059 More drag/drop adjustments:
* Make View.onDragEvent() public instead of protected.
* No longer @hide View.startDrag()
* Properly manage the boundaries of DRAG_STARTED / DRAG_ENDED notifications
  to windows (and as a result don't send bogus empty DRAG_STARTED events or
  double-recycle pooled DragEvents)

Change-Id: Ib75f5c1417640c82a5b043c555e02d6e6f4b4d9c
2010-10-06 17:33:10 -07:00
Dianne Hackborn
72b526a13c am cb9f1e4d: am 6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Merge commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0'

* commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0':
  Make it easier to figure out whether an app can go on sd card.
2010-10-06 17:08:15 -07:00
Kenny Root
5919ac6b41 OBB: track binder death observers
An incorrect assumption about how death observers were tracked lead to
an IllegalArgumentException in some cases. Make sure the linking and
unlinking of the Binder to its ObbState death observer is symmetric to
avoid this problem.

Bug: 3062360
Change-Id: Idd016db12551c80cd74d00f11cf6569bd3b4ce21
2010-10-06 17:00:00 -07:00
Kenny Root
a3ee5c0351 Merge "Add MountService tests and fix a bug it found" into gingerbread 2010-10-06 16:59:23 -07:00
Kenny Root
17eb6fb07c Add MountService tests and fix a bug it found
Add some MountService tests that are based partially on some stuff done
in PackageManagerTests. This allows us to test the OBB changes in an
easy way.

Also, it found some bugs in the DefaultContainerService connection state
machine, so fix those while we're at it.

Change-Id: I18f38593be754eb32fb6e842f88eec47e2beefce
2010-10-06 15:39:28 -07:00
Dianne Hackborn
043fcd9847 Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Exposes an Intent I need (okay it fixes an unrelated thing in the power widget),
and fixes some dump output.

Change-Id: I51d6c93a6ac879bab64e9d5aa21129e2bbcd461b
2010-10-06 14:27:34 -07:00
Irfan Sheriff
ed5d7d17c9 Add LinkAddress
LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
2010-10-06 11:04:05 -07:00