3787 Commits

Author SHA1 Message Date
Brad Fitzpatrick
2af4c51e9a am 6bb7a4a6: Go one day into 1970 for timezone code.
Merge commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe' into gingerbread-plus-aosp

* commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe':
  Go one day into 1970 for timezone code.
2010-10-11 13:49:12 -07:00
Brad Fitzpatrick
6bb7a4a68a Go one day into 1970 for timezone code.
Change-Id: I80251de79db6684ef3fa1ec835b400d9e3547401
2010-10-11 13:43:51 -07:00
Joe Onorato
4b9f62d1a2 Don't throw when userActivity fails because of the permission check.
Just log.  But don't log too often.

Bug: 3083024
Change-Id: I66f942a67ed6c481afb4079045c66931a4c81688
2010-10-11 13:42:00 -07:00
Brad Fitzpatrick
14d151bf41 am ce2f1909: Merge "On boot, advance time to at least 1970." into gingerbread
Merge commit 'ce2f1909c74a1b90995f06a865d21260b062300b' into gingerbread-plus-aosp

* commit 'ce2f1909c74a1b90995f06a865d21260b062300b':
  On boot, advance time to at least 1970.
2010-10-11 13:03:15 -07:00
Brad Fitzpatrick
ce2f1909c7 Merge "On boot, advance time to at least 1970." into gingerbread 2010-10-11 13:00:51 -07:00
Mathias Agopian
8b8a8f65b5 am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
Merge commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c' into gingerbread-plus-aosp

* commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c':
  fix a bug where timeouts would only be handled when a message was delivered
2010-10-11 12:44:23 -07:00
Mathias Agopian
a7c76d8307 Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread 2010-10-11 12:41:33 -07:00
Mathias Agopian
b921d30263 fix a bug where timeouts would only be handled when a message was delivered
Change-Id: I98c69b129e75e065e61f47e54f0f855d9401b0dc
2010-10-11 12:40:09 -07:00
Brad Fitzpatrick
35ca9d8a35 On boot, advance time to at least 1970.
Otherwise various Java APIs start doing their documented "correct"
thing, which is to fail.

Bug: 3081605
Change-Id: I90f8cde745d2ddab78419e37f60eea1e81a58127
2010-10-11 12:17:16 -07:00
Mike Lockwood
431dd3b1bc am 86564dc6: Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread
Merge commit '86564dc673db6dd752c326e53404677a3db43bec' into gingerbread-plus-aosp

* commit '86564dc673db6dd752c326e53404677a3db43bec':
  GPS: Add update_network_state call to AGpsRillInterface
2010-10-11 12:05:20 -07:00
Mike Lockwood
50130bbc88 GPS: Add update_network_state call to AGpsRillInterface
Change-Id: I404a7a45773f592de7dfe75a8287fef15515ea8b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-11 14:28:28 -04:00
Vairavan Srinivasan
d6499dc69f frameworks/base: Handle null from topRunningNonDelayedActivityLocked
startActivityUncheckedLocked tries to move the target task to front
when it is not at front. topRunningNonDelayedActivityLocked is used
to find the current task, however null value isn't handled. This
null causes an unhandled exception leading to the android framework
reboot.

Change-Id: I2a43cda50483e28a4456846d8b3ccb30d7cf110e
2010-10-11 11:22:57 -07:00
Jean-Baptiste Queru
6d1321f02f am 65f23e71: Merge "Corrected visibility reporting error in WindowManager"
Merge commit '65f23e71bdf7d9ca8c4aa8ed126ac2bc9a2cbf43' into gingerbread-plus-aosp

* commit '65f23e71bdf7d9ca8c4aa8ed126ac2bc9a2cbf43':
  Corrected visibility reporting error in WindowManager
2010-10-10 18:51:47 -07:00
Jean-Baptiste Queru
65f23e71bd Merge "Corrected visibility reporting error in WindowManager" 2010-10-10 18:44:00 -07:00
Jean-Baptiste Queru
d54a97a0ef am fb1e5529: Merge "Fix time zone info in kernel is nothing after reboot"
Merge commit 'fb1e5529724d121aa47485e7245b69965088fbb4' into gingerbread-plus-aosp

* commit 'fb1e5529724d121aa47485e7245b69965088fbb4':
  Fix time zone info in kernel is nothing after reboot
2010-10-10 18:37:37 -07:00
Jean-Baptiste Queru
fb1e552972 Merge "Fix time zone info in kernel is nothing after reboot" 2010-10-10 18:20:55 -07:00
Jean-Baptiste Queru
89fbcd72fb resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
2010-10-10 17:45:45 -07:00
Imre Sunyi
9239612870 Support showing "Cold" battery health.
The Linux kernel supports reporting "cold" battery health to sysfs.
Android framework has not implemented this and it defaults to "unknown"
This adds handling the cold battery health.

Change-Id: Idcc156aae6aabce73391081143f79d052edf332e
2010-10-10 17:20:24 -07:00
Jean-Baptiste Queru
779d1778b6 am bd1454f5: Merge "Include debugger connection status in error entry"
Merge commit 'bd1454f5005619b69d887fee6a7a4891b3323d18' into gingerbread-plus-aosp

* commit 'bd1454f5005619b69d887fee6a7a4891b3323d18':
  Include debugger connection status in error entry
2010-10-10 17:00:59 -07:00
Mike Lockwood
1bdba9fa31 am 2f77c3e4: Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread
Merge commit '2f77c3e4de3d68904a6a872d53283775b3a5c349' into gingerbread-plus-aosp

* commit '2f77c3e4de3d68904a6a872d53283775b3a5c349':
  GPS: Fix another race condition in GPS HAL initialization
2010-10-10 16:41:28 -07:00
Mike Lockwood
01df140b60 GPS: Fix another race condition in GPS HAL initialization
BUG: 3082940

Change-Id: I0953882cb768aec608f754c3bc9ab41418eded97
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-10 19:25:50 -04:00
Jeff Brown
41aabeb513 am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread
Merge commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32' into gingerbread-plus-aosp

* commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32':
  Added more robust tracking and cancelation of events.
2010-10-10 14:50:38 -07:00
Jeff Brown
1e6a3a53fc Merge "Added more robust tracking and cancelation of events." into gingerbread 2010-10-10 14:47:57 -07:00
Jeff Brown
b699726018 Added more robust tracking and cancelation of events.
This change fixes several issues where events would be dropped in the
input dispatch pipeline in such a way that the dispatcher could not
accurately track the state of the input device.

Given more robust tracking, we can now also provide robust cancelation
of input events in cases where an application might otherwise become
out of sync with the event stream due to ANR, app switch, policy decisions,
or forced focus transitions.

Pruned some of the input dispatcher log output.

Moved the responsibility for calling intercept*BeforeQueueing into
the input dispatcher instead of the input reader and added support for
early interception of injected events for events coming from trusted
sources.  This enables behaviors like injection of media keys while
the screen is off, haptic feedback of injected virtual keys, so injected
events become more "first class" in a way.

Change-Id: Iec6ff1dd21e5f3c7feb80ea4feb5382bd090dbd9
2010-10-10 14:45:51 -07:00
Mike Lockwood
2d39374f08 am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread
Merge commit '66e606040a521b81033ff75025620436c050c82e' into gingerbread-plus-aosp

* commit '66e606040a521b81033ff75025620436c050c82e':
  GPS: More HAL initialization cleanup
2010-10-10 13:16:22 -07:00
Mike Lockwood
66e606040a Merge "GPS: More HAL initialization cleanup" into gingerbread 2010-10-10 13:13:16 -07:00
Mike Lockwood
4270237def GPS: More HAL initialization cleanup
BUG: 3082940

Change-Id: Idd584ab8fe4512aae0769ecd1274c55d6ea2e5e7
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-10-10 16:04:18 -04:00
Wink Saville
83d97f4604 am 96619f9f: Merge "Add some error-case logging." into gingerbread
Merge commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696' into gingerbread-plus-aosp

* commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696':
  Add some error-case logging.
2010-10-10 12:47:18 -07:00
Robert Greenwalt
572172befb Add some error-case logging.
Turning off all debug logging is a good thing, but it leaves us blind when errors come in.
bug:3075537

Change-Id: I8a4e7f2ce094574ec45cec268bdbc46449540c9f
2010-10-10 11:26:41 -07:00
Mike Lockwood
748b413e94 am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread
Merge commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5' into gingerbread-plus-aosp

* commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5':
  GPS: Do not call sGpsInterface->init() multiple times
2010-10-09 17:20:56 -07:00
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
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
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
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
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
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
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
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
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
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
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