3046 Commits

Author SHA1 Message Date
Joe Onorato
17350886d0 am d3f6c1fa: am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
Merge commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188'

* commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
2010-07-28 11:05:29 -07:00
Mike Lockwood
ff0aff1914 Merge "Add new system service CountryDetector" 2010-07-28 11:04:18 -07:00
Joe Onorato
d3f6c1fa45 am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
Merge commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f' into gingerbread-plus-aosp

* commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
2010-07-28 10:16:39 -07:00
Joe Onorato
0c39b6c65b Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread 2010-07-28 09:53:12 -07:00
Mike Lockwood
d8aad91d8c am d5786b98: am c40d714c: Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b'

* commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b':
  Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
2010-07-28 04:18:10 -07:00
Mike Lockwood
d5786b982c am c40d714c: Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'c40d714ca520257bcb5ef2e03e83ea3273d3a0ec' into gingerbread-plus-aosp

* commit 'c40d714ca520257bcb5ef2e03e83ea3273d3a0ec':
  Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
2010-07-28 04:11:03 -07:00
Mike Lockwood
c40d714ca5 Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 2010-07-28 04:04:18 -07:00
Bai Tao
a58a8751b4 Add new system service CountryDetector
a. The CountryDetector detects the country the user is in
   in order of mobile network, location, sim card or locale.
   It will be used by contact and contact provider.

b. All added APIs are hidden at this stage.

Change-Id: I4ba278571ffb6ab6ded0996d4f440a18534f8ed4
2010-07-28 09:45:57 +08:00
Brad Fitzpatrick
8b67752c82 am 931ee98c: am b7304593: Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread
Merge commit '931ee98cc05aedaf0a7cdf0b7ec503a8586359f5'

* commit '931ee98cc05aedaf0a7cdf0b7ec503a8586359f5':
  Cap the size of StrictMode buffering we do before calling DropBox.
2010-07-27 18:39:21 -07:00
Brad Fitzpatrick
931ee98cc0 am b7304593: Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread
Merge commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea' into gingerbread-plus-aosp

* commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea':
  Cap the size of StrictMode buffering we do before calling DropBox.
2010-07-27 18:37:20 -07:00
Brad Fitzpatrick
b73045935c Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread 2010-07-27 18:34:08 -07:00
Brad Fitzpatrick
e73eb53125 Cap the size of StrictMode buffering we do before calling DropBox.
Change-Id: I46ea767bd0153c745e9b7eff945dacf5130f8807
2010-07-27 16:54:39 -07:00
Andreas Huber
84047bc295 Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Change-Id: I6d160a1851e1f73bac3775d24cf70d46da59aa47
2010-07-27 16:49:10 -07:00
Irfan Sheriff
a2a1b911a3 Refactor WifiStateTracker
Implement WifiStateTracker as a HSM.

Change-Id: Ic12fd78f1f183b5c4dea8ad2301002267ceff0cb
2010-07-27 11:59:29 -07:00
Dan Egnor
7d72e5ad7c am b9a8509a: am 499bee34: Merge "Remove a log message Jason doesn\'t like" into gingerbread
Merge commit 'b9a8509a6fd768f9be6de897e0a945197b64e7cf'

* commit 'b9a8509a6fd768f9be6de897e0a945197b64e7cf':
  Remove a log message Jason doesn't like
2010-07-27 10:32:54 -07:00
Dan Egnor
b9a8509a6f am 499bee34: Merge "Remove a log message Jason doesn\'t like" into gingerbread
Merge commit '499bee34c40945f898b7561ca7792ded5b974852' into gingerbread-plus-aosp

* commit '499bee34c40945f898b7561ca7792ded5b974852':
  Remove a log message Jason doesn't like
2010-07-27 10:28:38 -07:00
Dan Egnor
499bee34c4 Merge "Remove a log message Jason doesn't like" into gingerbread 2010-07-27 10:22:58 -07:00
Joe Onorato
d596d5115c am 070433ed: am 76d9bf52: am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner a
Merge commit '070433edee72de5fd9b93ddf055f74277f0deff4'

* commit '070433edee72de5fd9b93ddf055f74277f0deff4':
  Add a method to let a properly permissioned app directly
2010-07-27 09:26:26 -07:00
Joe Onorato
070433edee am 76d9bf52: am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone
Merge commit '76d9bf52f31b8f31f64348b736422861c90ab463' into gingerbread-plus-aosp

* commit '76d9bf52f31b8f31f64348b736422861c90ab463':
  Add a method to let a properly permissioned app directly
2010-07-27 09:19:48 -07:00
Joe Onorato
76d9bf52f3 am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." i
Merge commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread

* commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917':
  Add a method to let a properly permissioned app directly
2010-07-27 09:14:42 -07:00
Dan Egnor
c13978afe3 Remove a log message Jason doesn't like
Bug: 2856942
Change-Id: Ifc5cfc076bfed0918bb203ed9c82a42092ac3939
2010-07-26 15:32:00 -07:00
Dianne Hackborn
9fb0bb8292 am b6022e3d: am 14bfa398: Infrastructure to report running services to developer.
Merge commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736'

* commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736':
  Infrastructure to report running services to developer.
2010-07-26 12:30:19 -07:00
Dianne Hackborn
4cca89c042 am 3a2ff74f: am 46730fc7: Fix handling of application disabled state.
Merge commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111'

* commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111':
  Fix handling of application disabled state.
2010-07-26 12:30:10 -07:00
Dianne Hackborn
b6022e3d50 am 14bfa398: Infrastructure to report running services to developer.
Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp

* commit '14bfa398a4e8697ce5822861a684b7d1245e4a85':
  Infrastructure to report running services to developer.
2010-07-26 12:24:57 -07:00
Dianne Hackborn
3a2ff74fa4 am 46730fc7: Fix handling of application disabled state.
Merge commit '46730fc78388607fd562044cbaaa26ffc9f65337' into gingerbread-plus-aosp

* commit '46730fc78388607fd562044cbaaa26ffc9f65337':
  Fix handling of application disabled state.
2010-07-26 12:24:21 -07:00
Dianne Hackborn
14bfa398a4 Infrastructure to report running services to developer.
Change-Id: Id1aae61323e7b8357c5fcc4bc641aaa57f3b6fde
2010-07-24 20:07:17 -07:00
Dianne Hackborn
46730fc783 Fix handling of application disabled state.
Change-Id: I617b76e89eeb75437b384b92f1205bb00b15bb70
2010-07-24 16:34:00 -07:00
Joe Onorato
7999bff154 Add a method to let a properly permissioned app directly
manipulate the user activity timeout.  We should come up
with a better API for this, but this is for a last minute
power manager hack to turn off the screen sooner after a
phone call ends.

Change-Id: I76422f952e3e894c90b3311e7d889899c79cbbaa
2010-07-24 11:50:05 -04:00
Jean-Baptiste Queru
1b57b86dcc am 83a23630: am dd299046: Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
Merge commit '83a236303438453740d5db41b0d017be9e5d56c1'

* commit '83a236303438453740d5db41b0d017be9e5d56c1':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
2010-07-22 16:18:35 -07:00
Jean-Baptiste Queru
83a2363034 am dd299046: Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
Merge commit 'dd29904638fb36cd5585560e83367d1f5565cc4c' into gingerbread-plus-aosp

* commit 'dd29904638fb36cd5585560e83367d1f5565cc4c':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
2010-07-22 16:14:18 -07:00
Vairavan Srinivasan
61f07659fe frameworks/base: Implement Mutual exclusion in BroadcastReceiver
Invoke forceStopPackageLocked after acquiring a lock on
ActivityManagerService.this.

Change-Id: I75a85da03418a87c26b89360cebd3bccc6a25e46
2010-07-22 13:36:40 -07:00
Mathias Agopian
50558b9561 resolved conflicts for merge of bc54e63c to master
Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
2010-07-21 18:10:22 -07:00
Mathias Agopian
bc54e63c84 am e4764521: Merge "new SensorService" into gingerbread
Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp

* commit 'e4764521353e898554931a557460fc49209fb0a9':
  new SensorService
2010-07-21 16:09:55 -07:00
The Android Open Source Project
57339e752c am e9e04673: merge from open-source master
Merge commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530'

* commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530':
  replaced deprecated setButton Methods
2010-07-21 08:13:02 -07:00
The Android Open Source Project
e9e046733d merge from open-source master
Change-Id: I5d220f16c319e95547f133ee9bcbd0b5caabc597
2010-07-21 08:05:45 -07:00
Romain Guy
13d33472b2 Merge "replaced deprecated setButton Methods" 2010-07-20 11:11:20 -07:00
Christian Mehlmauer
7664e20927 replaced deprecated setButton Methods
Change-Id: I8361377cda18ae060a53b84702a2cf9b6f3e8365
2010-07-20 08:46:17 +02:00
Mathias Agopian
1bf797857e new SensorService
remove old sensor service and implement SensorManager
on top of the new (native) SensorManger API.

Change-Id: Iddb77d498755da3e11646473a44d651f12f40281
2010-07-19 17:57:29 -07:00
Mike Lockwood
2ef1cea440 Merge "Add support for emulating external storage on devices with no SD card" 2010-07-19 16:09:40 -07:00
Mike Lockwood
03559753ce Add support for emulating external storage on devices with no SD card
Change-Id: I4feb03a4b8f4eae33e940477b355d3a4cac7fa86
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-19 18:25:03 -04:00
Maciej Białka
26824b7a9e Remove the window from being a target for motion events when it is destroyed.
If window was destroyed when touch was pressed this destroyed
window was still considered as a target for motion events.
In some cases this could result with hang up inside event dispatch procedure.

Change-Id: I2ede17a40b14b2f509ab3d2560abb65292324f45
2010-07-19 15:12:20 -07:00
Winson Chung
499cb9f516 Initial changes to allow collections in widgets.
Change-Id: I3cfa899bae88cd252912cecebc12e93c27a3b7c9
2010-07-19 14:48:31 -07:00
Adam Bliss
6181f39257 am 27ef0f73: am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
Merge commit '27ef0f732c5a97ba88a699b7490045e5370cf51f'

* commit '27ef0f732c5a97ba88a699b7490045e5370cf51f':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation
2010-07-19 09:07:53 -07:00
Adam Bliss
27ef0f732c am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp

* commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation
2010-07-19 08:36:26 -07:00
Mike Lockwood
f4d207b1c2 Don't throw an exception from isProviderEnabled and getLastKnownLocation
if the location provider does not exist.  Instead use the same behavior
as if the provider were disabled in settings
(return false for isProviderEnabled and null from getLastKnownLocation).
This eliminates for a lot of exception handling around some simple
queries to the location manager.

BUG: 2841014

Change-Id: I4fbe0c088e915c90969e13083201dd3e7f4029cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-17 08:21:33 -04:00
Jeff Brown
eb857f12d6 resolved conflicts for merge of f7adbe10 to master
Change-Id: I898a5e53b180adaee2337c0c0b9896c799d056e7
2010-07-16 10:06:33 -07:00
Kenny Root
fb4e1e24a9 resolved conflicts for merge of 181bb0ab to master
Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf
2010-07-16 09:04:09 -07:00
Jeff Brown
f7adbe10c2 am eec69d29: Merge "Fix bug with phantom input windows." into gingerbread
Merge commit 'eec69d2923636b2aaa51df93bacc2b3bbb742736' into gingerbread-plus-aosp

* commit 'eec69d2923636b2aaa51df93bacc2b3bbb742736':
  Fix bug with phantom input windows.
2010-07-16 00:16:09 -07:00
Jeff Brown
e33348ba54 Fix bug with phantom input windows.
Add dumpsys integration for the native input dispatcher.
Add some InputDevice API stubs.
Add an appendFormat helper method to String8 for printf style
string formatting mainly for debugging purposes.
Use generic ArrayList<WindowState> everywhere in WindowManagerService
to eliminate unnecessary casts all over.

Change-Id: I9d1e3bd90eb7222d10620200477f11b7bfd25e44
2010-07-16 00:02:48 -07:00
Jeff Brown
b75fa30aaf resolved conflicts for merge of aca672ba to master
Change-Id: I7ae11fca0acdbf513a4870226d0d3e3cafbe9a08
2010-07-15 23:47:29 -07:00