Commit Graph

3464 Commits

Author SHA1 Message Date
Robert Greenwalt
993f85f319 am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread
Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp

* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
  DO NOT MERGE Always set/remove default routes.
2010-08-13 16:03:29 -07:00
Dianne Hackborn
66b0343e9e am a8d9291d: Merge "Various battery info things:" into gingerbread
Merge commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177' into gingerbread-plus-aosp

* commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177':
  Various battery info things:
2010-08-13 16:00:44 -07:00
Robert Greenwalt
e300b8c10c Merge "DO NOT MERGE Always set/remove default routes." into gingerbread 2010-08-13 15:59:53 -07:00
Robert Greenwalt
b738fb9938 DO NOT MERGE Always set/remove default routes.
Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on teh same interface.

Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.

bug:2865974
Change-Id: Ifdf49080fa0413a4d826813706c809975a562dfa
2010-08-13 15:53:13 -07:00
Dianne Hackborn
9adb9c3b10 Various battery info things:
- Now track wake locks in battery history.
- Now track sensors in battery history.
- Some filtering of sensory data.
- Fixes to some data that wasn't cleared when resetting battery stats.
- Print amount discharged since last charge.

And the big part -- keep track of wake locks held per process,
and kill processes that hold wake locks too much while they are in
the background.  This includes information in the battery stats
about the process being killed, which will be available to the
developer if the app is reported.

Change-Id: I97202e94d00aafe0526ba2db74a03212e7539c54
2010-08-13 15:17:49 -07:00
Irfan Sheriff
c983960a92 Merge "Asynchronous API" 2010-08-12 07:58:46 -07:00
Irfan Sheriff
e04653cbd0 Asynchronous API
Add asynchronous API for simplified connect, save
and remove.

Add a SUPPLICANT_CONFIG_CHANGED_ACTION broadcast to
notifiy a supplicant configuration change.

Change-Id: I69ae116246094de4a469cb2af5baf37e5ad4d6dd
2010-08-12 07:57:36 -07:00
Dianne Hackborn
5caaf378d8 am 9185e26a: am fb86ce93: Add watermark support.
Merge commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e'

* commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e':
  Add watermark support.
2010-08-11 22:10:07 -07:00
Dianne Hackborn
9185e26a8f am fb86ce93: Add watermark support.
Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp

* commit 'fb86ce93079db4465a61489275c65bcf8ce4669e':
  Add watermark support.
2010-08-11 22:04:27 -07:00
Dianne Hackborn
fb86ce9307 Add watermark support.
Use these system properties:

ro.watermark.text
ro.watermark.height
ro.watermark.x
ro.watermark.y
ro.watermark.color
ro.watermark.shadow.radius
ro.watermark.shadow.dx
ro.watermark.shadow.dy
ro.watermark.shadow.color

If ro.watermark.text is not set, no watermark will be shown.  All others
have reasonable defaults if they are not set.

Change-Id: Ibe4a01e6f1c576494ae2462e2688cdfaa8c62cb8
2010-08-11 18:15:29 -07:00
Jeff Brown
b219a83ff6 am f66f8a58: am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread
Merge commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58'

* commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58':
  Add support for the PointerLocation overlay.
2010-08-11 16:22:47 -07:00
Jeff Brown
f66f8a58cc am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread
Merge commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066' into gingerbread-plus-aosp

* commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066':
  Add support for the PointerLocation overlay.
2010-08-11 16:18:36 -07:00
Jeff Brown
95af0c14a6 Merge "Add support for the PointerLocation overlay." into gingerbread 2010-08-11 16:15:48 -07:00
Dianne Hackborn
ed6075943f am 2d8b9fe0: am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
Merge commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984'

* commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984':
  New system property "sys.boot_completed" set to 1 when boot completed.
2010-08-11 15:25:42 -07:00
Dianne Hackborn
2d8b9fe0f9 am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
Merge commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07' into gingerbread-plus-aosp

* commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07':
  New system property "sys.boot_completed" set to 1 when boot completed.
2010-08-11 15:20:34 -07:00
Dianne Hackborn
bd1c082cf9 Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread 2010-08-11 15:16:01 -07:00
Jeff Brown
a41ca77fab Add support for the PointerLocation overlay.
This change involves adding a new method to IWindowManager,
monitorInput() that returns an InputChannel to receive a copy of all
input that is dispatched to applications.  The caller must have
the READ_INPUT_STATE permission to make this request (similar to
other window manager methods such as getKeycodeState).

Change-Id: Icd14d810174a5b2928671ef16de73af88302aea0
2010-08-11 14:46:32 -07:00
Kenny Root
bf0cb26a1c am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread
Merge commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798'

* commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798':
  Move OBB file reading to DefaultContainerService
2010-08-11 14:15:10 -07:00
Kenny Root
f5ee5358c1 am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread
Merge commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e' into gingerbread-plus-aosp

* commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e':
  Move OBB file reading to DefaultContainerService
2010-08-11 14:10:18 -07:00
Dianne Hackborn
f4c454bac9 New system property "sys.boot_completed" set to 1 when boot completed.
Change-Id: Ie3fc0b1efdfb637b0c780064a71e8c1575e15ca3
2010-08-11 12:47:41 -07:00
Vairavan Srinivasan
5320b326a4 am 79cb9a5d: am f2e67a57: InputMethodService: Fix ignore case in showInputMethodPickerFromClient
Merge commit '79cb9a5d2d455af22c56b8cee045962c61668422'

* commit '79cb9a5d2d455af22c56b8cee045962c61668422':
  InputMethodService: Fix ignore case in showInputMethodPickerFromClient
2010-08-11 12:39:24 -07:00
Jean-Baptiste Queru
dc15e5b903 am 44e43d1f: resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp
Merge commit '44e43d1f6593ae912b3818692058196233cd4ac9'

* commit '44e43d1f6593ae912b3818692058196233cd4ac9':
  InputMethodManagerService: Fix acore crash on boot up
2010-08-11 12:35:30 -07:00
Vairavan Srinivasan
79cb9a5d2d am f2e67a57: InputMethodService: Fix ignore case in showInputMethodPickerFromClient
Merge commit 'f2e67a5779d404b4791c6ab5b0d30dfb2c463514' into gingerbread-plus-aosp

* commit 'f2e67a5779d404b4791c6ab5b0d30dfb2c463514':
  InputMethodService: Fix ignore case in showInputMethodPickerFromClient
2010-08-11 12:07:56 -07:00
Jean-Baptiste Queru
1ca94798cc Fix build: HistoryRecord is now ActivityRecord
Change-Id: I5f402e76fbff58ec59ea26b6765e7455801a6cd0
2010-08-11 11:56:21 -07:00
Jean-Baptiste Queru
44e43d1f65 resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp
Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5
2010-08-11 11:51:31 -07:00
Vairavan Srinivasan
f2e67a5779 InputMethodService: Fix ignore case in showInputMethodPickerFromClient
Fix to avoid posting MSG_SHOW_IM_PICKER in
showInputMethodPickerFromClient when ignoring the request from the
client.

Change-Id: Iff8a0809aea892b4493d5cffbb91adba2d74414e
2010-08-11 11:24:45 -07:00
Kenny Root
a02b8b05dd Move OBB file reading to DefaultContainerService
The system_server shouldn't touch files on the SD card. This change
moves the things that touch the SD card out to the
DefaultContainerService so that it will get killed if the SD card goes
away instead of the system_server.

Change-Id: I0aefa085be4b194768527195532ee6dddc801cfc
2010-08-11 11:20:53 -07:00
Srilakshmi Punuru
efcac2ffba InputMethodManagerService: Fix acore crash on boot up
At bootup, while starting the service, if the default Input Method is not set,
it is trying to disable the icon even before the statusbar variable and the input
method icon are initialized. Hence, initializing them before building the input method list.

Change-Id: Ibde2ca3bd379d6620d84b75662ffad1a95a24fc6
2010-08-11 11:17:31 -07:00
Danica Chang
f8d0573200 fixed bug in stringToIpAddr, which was returning the ip address in reverse
Change-Id: Ia1872636fb928a4076fe18ba50c6d1ea85f16dd9
2010-08-11 11:15:05 -07:00
Jean-Baptiste Queru
4c2d70d4e7 am a6c28cb0: am 2ffe74de: Merge "Fix isUsbMassStorageConnected() will always return true"
Merge commit 'a6c28cb014c32b9522c41385075c9db77296f6e7'

* commit 'a6c28cb014c32b9522c41385075c9db77296f6e7':
  Fix isUsbMassStorageConnected() will always return true
2010-08-11 10:44:06 -07:00
Jean-Baptiste Queru
a6c28cb014 am 2ffe74de: Merge "Fix isUsbMassStorageConnected() will always return true"
Merge commit '2ffe74ded51ee73ae1b412861f5d6ec58c835390' into gingerbread-plus-aosp

* commit '2ffe74ded51ee73ae1b412861f5d6ec58c835390':
  Fix isUsbMassStorageConnected() will always return true
2010-08-11 10:40:39 -07:00
Jean-Baptiste Queru
2ffe74ded5 Merge "Fix isUsbMassStorageConnected() will always return true" 2010-08-11 10:27:17 -07:00
Irfan Sheriff
9f3c5da382 Merge "Split WifiStateMachine from WifiStateTracker" 2010-08-11 07:53:51 -07:00
Kenny Root
ffc29498f2 am a27484f0: am 6061af11: Merge "Sort the IME list before showing to user"
Merge commit 'a27484f068047453af6345f2c2c58fcc1db899a5'

* commit 'a27484f068047453af6345f2c2c58fcc1db899a5':
  Sort the IME list before showing to user
2010-08-10 15:47:27 -07:00
Kenny Root
a27484f068 am 6061af11: Merge "Sort the IME list before showing to user"
Merge commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7' into gingerbread-plus-aosp

* commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7':
  Sort the IME list before showing to user
2010-08-10 15:38:41 -07:00
Kenny Root
6061af11cb Merge "Sort the IME list before showing to user" 2010-08-10 15:22:13 -07:00
Irfan Sheriff
0d25534fed Split WifiStateMachine from WifiStateTracker
Notifications handled in WifiService. WifiStateTracker tracks
state for connectivity service

Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053
2010-08-10 15:18:25 -07:00
Konstantin Lopyrev
ebd2f0ae82 am 8cdf4d92: am 6c6d57c6: Merge "Fix focus notification" into gingerbread
Merge commit '8cdf4d92ec93b7ba1ea6d7aaf3540283edfc6925'

* commit '8cdf4d92ec93b7ba1ea6d7aaf3540283edfc6925':
  Fix focus notification
2010-08-09 20:00:48 -07:00
Konstantin Lopyrev
8cdf4d92ec am 6c6d57c6: Merge "Fix focus notification" into gingerbread
Merge commit '6c6d57c6a04eed154de1f7d9b544c2cb34a83dac' into gingerbread-plus-aosp

* commit '6c6d57c6a04eed154de1f7d9b544c2cb34a83dac':
  Fix focus notification
2010-08-09 19:53:48 -07:00
Tony Wu
fc71125104 Fix isUsbMassStorageConnected() will always return true
After UMS mounted, isUsbMassStorageConnected() will always return true even if USB is disconnected.
It's because mUmsEnabling will always be ture.

Change-Id: Ib24b2359ea2684eb0a9faeb880f383e87630e6e1
2010-08-10 10:09:13 +08:00
Konstantin Lopyrev
5e7833a571 Fix focus notification
Change-Id: I51d73100695ceb70620754a1897ace681a26d839
2010-08-09 17:01:11 -07:00
Konstantin Lopyrev
d07476aee5 am 443f9baf: am 3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
Merge commit '443f9bafb02c6a5a7311c7069995e5a3bdd875f8'

* commit '443f9bafb02c6a5a7311c7069995e5a3bdd875f8':
  Adding a way for Hierarchy Viewer to get the focused window.
2010-08-06 19:06:44 -07:00
Konstantin Lopyrev
443f9bafb0 am 3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
Merge commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8' into gingerbread-plus-aosp

* commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8':
  Adding a way for Hierarchy Viewer to get the focused window.
2010-08-06 18:54:18 -07:00
Konstantin Lopyrev
f962476471 Adding a way for Hierarchy Viewer to get the focused window.
Change-Id: I01e6ab4aa24d632fba586cb9e112d8d9df1a681a
2010-08-06 13:27:31 -07:00
Mike Lockwood
7503b96e8e am 19be0bd0: am 5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time.
Merge commit '19be0bd07e348fc405e1c46a698843695fc64e48'

* commit '19be0bd07e348fc405e1c46a698843695fc64e48':
  GPS: Don't set XTRA download pending flag at boot time.
2010-08-06 07:44:28 -07:00
Mike Lockwood
19be0bd07e am 5723dfe8: GPS: Don\'t set XTRA download pending flag at boot time.
Merge commit '5723dfe8c87d0887b8926f43637ed300466890d2' into gingerbread-plus-aosp

* commit '5723dfe8c87d0887b8926f43637ed300466890d2':
  GPS: Don't set XTRA download pending flag at boot time.
2010-08-06 07:41:44 -07:00
Mike Lockwood
5723dfe8c8 GPS: Don't set XTRA download pending flag at boot time.
XTRA data downloads are now strictly on demand from the GPS engine.
Also fix typo in handleDownloadXtraData()

Change-Id: Ied1a6e2e62134add4d965326aae909c86f834682
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-06 10:15:15 -04:00
Chung-yih Wang
cffebf85be am 6866ecb9: am 1d62c773: Fix the build
Merge commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea'

* commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea':
  Fix the build
2010-08-05 21:13:25 -07:00
Chung-yih Wang
6866ecb927 am 1d62c773: Fix the build
Merge commit '1d62c7737c33f92e79f0a180b05969f52484e64c' into gingerbread-plus-aosp

* commit '1d62c7737c33f92e79f0a180b05969f52484e64c':
  Fix the build
2010-08-05 21:10:06 -07:00
Chung-yih Wang
024d59601e resolved conflicts for merge of a06ad953 to master
Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82
2010-08-06 12:06:04 +08:00