4314 Commits

Author SHA1 Message Date
Chris Tate
0a7892367f Merge "Temporarily turn on backup/restore debug logs" into gingerbread 2010-10-11 14:42:00 -07:00
Mathias Agopian
5d477279e6 am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
Merge commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b' into gingerbread-plus-aosp

* commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b':
  fix a bug where FLIP_H would do a 180 rotation
2010-10-11 14:40:02 -07:00
Mathias Agopian
cf6b2765ae Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread 2010-10-11 14:37:57 -07:00
Chris Tate
a9c5043b24 Temporarily turn on backup/restore debug logs
Several people are seeing odd behaviors around backup/restore at present.
Enable expanded logging to help pin down exactly what is happening.

Change-Id: I95ca013017cb07e633f2ba765583de3cf0e056af
2010-10-11 14:37:12 -07:00
Mathias Agopian
5ba59975eb fix a bug where FLIP_H would do a 180 rotation
Change-Id: Ie2cc4a8543a5625750c8596f87edcb66fcbca31f
2010-10-11 14:19:24 -07:00
Mathias Agopian
3754d0ccc7 am d0528b74: Merge "deliver invalidate messages AFTER other messages" into gingerbread
Merge commit 'd0528b74b6de87c415ea498095e142d52c68875b' into gingerbread-plus-aosp

* commit 'd0528b74b6de87c415ea498095e142d52c68875b':
  deliver invalidate messages AFTER other messages
2010-10-11 14:17:25 -07:00
Mathias Agopian
d0528b74b6 Merge "deliver invalidate messages AFTER other messages" into gingerbread 2010-10-11 14:15:04 -07:00
Mathias Agopian
7b50a6dfac deliver invalidate messages AFTER other messages
because invalidate messages were always handled first, they
could prevent other messages to get through entirely.
there is no real reason to handle invalidate messages first because
the other messages are very uncommon and won't interfer with
updates.

Change-Id: Ib95cdf35a91407bd2f4d69dd082c5f546e1e0071
2010-10-11 14:11:15 -07:00
Joe Onorato
5be893a71a am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread
Merge commit '446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp

* commit '446547af37fd10142f15f6a9b3ac3007c6473981':
  Don't throw when userActivity fails because of the permission check.
2010-10-11 13:55:15 -07:00
Joe Onorato
446547af37 Merge "Don't throw when userActivity fails because of the permission check." into gingerbread 2010-10-11 13:52:34 -07:00
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
4cda1e3e8b am 2d39374f: am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread
Merge commit '2d39374f081031871a15c4532242afe9a8738f9f'

* commit '2d39374f081031871a15c4532242afe9a8738f9f':
  GPS: More HAL initialization cleanup
2010-10-11 11:36:01 -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
Wink Saville
c2a4432507 am 83d97f46: am 96619f9f: Merge "Add some error-case logging." into gingerbread
Merge commit '83d97f460412f117998f4d446fd65ca79761a294'

* commit '83d97f460412f117998f4d446fd65ca79761a294':
  Add some error-case logging.
2010-10-11 10:49:47 -07:00
Mike Lockwood
72f23bb1a5 am 748b413e: am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread
Merge commit '748b413e94c73b760c63a03126df2c4712a1ae05'

* commit '748b413e94c73b760c63a03126df2c4712a1ae05':
  GPS: Do not call sGpsInterface->init() multiple times
2010-10-11 10:20:41 -07:00
Dianne Hackborn
cc60839643 am 681f327e: am 62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread
Merge commit '681f327e839a40a4d55d3567af341b9e90f62378'

* commit '681f327e839a40a4d55d3567af341b9e90f62378':
  Fix retaining of granted permissions when updating of system app.
2010-10-10 19:13:09 -07:00
Dianne Hackborn
65bdf4e634 am c58e9bff: am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread
Merge commit 'c58e9bff10200daaad6d06d57745edcc33314325'

* commit 'c58e9bff10200daaad6d06d57745edcc33314325':
  Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
2010-10-10 19:11:51 -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
Mike Lockwood
ca936f1661 am 98e1f384: am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread
Merge commit '98e1f3840f06d3dfea987154da25d5351460d080'

* commit '98e1f3840f06d3dfea987154da25d5351460d080':
  Remove races in Geocoder/LocationProvider Proxy
2010-10-10 17:15:06 -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
Dianne Hackborn
615e2fa175 am b77455ee: am 78d68836: Implement tracking of package install times.
Merge commit 'b77455ee290691b036ac79236a93e57ff294ef0c'

* commit 'b77455ee290691b036ac79236a93e57ff294ef0c':
  Implement tracking of package install times.
2010-10-10 14:20:34 -07:00
Kenny Root
5bc3addb45 am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread
Merge commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124'

* commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124':
  Symlink application lib directory when on SD card
2010-10-10 14:19:52 -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
Kenny Root
7a2eff1fc7 am c0c2076e: am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread
Merge commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166'

* commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166':
  Eliminate MCS_GIVE_UP state
2010-10-10 11:15:44 -07:00
Kenny Root
3aa837cc0f am c296f22e: am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID"
Merge commit 'c296f22e713257271f95c2115df9e13d05d5687a'

* commit 'c296f22e713257271f95c2115df9e13d05d5687a':
  Revert "Only allow 8 OBBs to be mounted by a UID"
2010-10-10 11:14:31 -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