7590 Commits

Author SHA1 Message Date
John Grossman
55fcd0def0 Merge "AAH: Fix PID gain for HW clock recovery." into ics-aah 2011-10-13 19:17:35 -07:00
Wink Saville
325f308289 am d54bcad4: am 8a058cbf: Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0
* commit 'd54bcad4bbb02eec47b26f6466bc01ff4e24f449':
  In releaseWifiLockLocked call noteReleaseWifiLock.
2011-10-13 17:45:56 -07:00
Wink Saville
d54bcad4bb am 8a058cbf: Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0
* commit '8a058cbf12c590db810fe8d9fab6f4f614909329':
  In releaseWifiLockLocked call noteReleaseWifiLock.
2011-10-13 17:42:58 -07:00
Wink Saville
8a058cbf12 Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0 2011-10-13 17:40:01 -07:00
John Grossman
39722542b9 AAH: Fix PID gain for HW clock recovery.
Before HW came in, when doing SW clock recovery, gain had been set to
produce a correction expressed in PPM from [-100, 100] PPM.  The HW
local clock HAL has been spec'ed to take a drive range from MIN_INT_16
to MAX_INT_16.  This changes the PID recovery loop to use a range from
MIN_INT_16 to MAX_INT_16, and adjusts the P and I gains to be the same
as they were before, but adjusted for the scale change.

Change-Id: I531175e5fbb20b7ba6ee06f457c5f4ad12c123ff
2011-10-13 16:56:37 -07:00
Wink Saville
ce0ea1f2b9 In releaseWifiLockLocked call noteReleaseWifiLock.
Bug: 5452027
Change-Id: I45786a9cfe752f02a9c2e75e5b6f35bc5dfed6ae
2011-10-13 16:55:20 -07:00
Dianne Hackborn
fcf485177c am d09289ed: am 97e9ea98: Merge "Fix bug with CLEAR_TASK -- wouldn\'t clear the top activity." into ics-mr0
* commit 'd09289ed80a56864c74024f8a2266a0c34c00d0b':
  Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
2011-10-13 16:47:27 -07:00
Dianne Hackborn
d09289ed80 am 97e9ea98: Merge "Fix bug with CLEAR_TASK -- wouldn\'t clear the top activity." into ics-mr0
* commit '97e9ea98afac197722d7620d5fd09a8c06aafe3a':
  Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
2011-10-13 16:45:56 -07:00
Dianne Hackborn
97e9ea98af Merge "Fix bug with CLEAR_TASK -- wouldn't clear the top activity." into ics-mr0 2011-10-13 16:44:26 -07:00
Dianne Hackborn
eabd328dee Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
Maybe this will also fix bug #5144065 as well.

I doubt I am so lucky, though.

Change-Id: I60bf595d3eff79353fdd94b0f2a089e81218bc30
2011-10-13 16:26:49 -07:00
John Grossman
dfe4448e28 Merge "AAH: Don't panic unless you are sure." into ics-aah 2011-10-13 14:27:48 -07:00
Christopher Tate
fc5800432d am 28e9046e: Merge "Require device encryption password to perform adb backup/restore"
* commit '28e9046ed41a04562c34d37cad690aeebec36001':
  Require device encryption password to perform adb backup/restore
2011-10-13 14:12:11 -07:00
John Grossman
5b8d7f9de9 AAH: Don't panic unless you are sure.
Change the definition of the panic threshold for the time sync service
to take the round trip time of the packet producing the discipline
action into account.  The idea here is that, in the worst case, the
error in the measurement of the clock sync error might be as high as
the round trip time of the packet used to measure the error.  If a
packet says we are 50mSec fast, its RTT is 75mSec, then we could be
anywhere from 25mSec slow to 125mSec fast.

This change basically makes it so that the error measurement must be
greater than the RTT + the fixed panic threshold before we panic.  IOW
we don't panic unless we absolutely sure that our error must be
greater than the fixed panic threshold.  Also, lower the current value
of the panic threshold from 50mSec down to 20.  Now that the
definition takes into account the RTT, we can afford to be much
tighter in our definition of the fixed panic threshold.

Change-Id: I88406203ba4d6ec8ece79c0a09e5f3b28f67c6e8
2011-10-13 14:10:10 -07:00
Mike Lockwood
bfb48e30ef am 69828470: am ab9d5b11: Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0
* commit '69828470626cf267829a4762f6b0f49b7b964322':
  PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled.
2011-10-13 14:09:32 -07:00
Adam Cohen
582b885e43 am 1bbb92de: am c408a5d5: Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0
* commit '1bbb92deed0d2ae1b40be5a9603b0fb16329de97':
  Fixing issue where widgets file was getting blown away, issue: 5036321
2011-10-13 14:09:13 -07:00
Dianne Hackborn
e47894ae3b am 7fdf3568: am 97175bc3: Merge "Fix issue #5446988: WindowManager warns BOOT TIMEOUT,..." into ics-mr0
* commit '7fdf356837d8ccd63f1c1ea254c315356d816894':
  Fix issue #5446988: WindowManager warns BOOT TIMEOUT,...
2011-10-13 14:08:56 -07:00
Christopher Tate
28e9046ed4 Merge "Require device encryption password to perform adb backup/restore" 2011-10-13 14:06:22 -07:00
Mike Lockwood
6982847062 am ab9d5b11: Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0
* commit 'ab9d5b11737f8a460467657035186bcfa7085eb9':
  PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled.
2011-10-13 14:01:23 -07:00
Mike Lockwood
ab9d5b1173 Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0 2011-10-13 13:59:33 -07:00
Adam Cohen
1bbb92deed am c408a5d5: Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0
* commit 'c408a5d5738c84160a7e9a8299c953ea638bcef4':
  Fixing issue where widgets file was getting blown away, issue: 5036321
2011-10-13 13:40:01 -07:00
Adam Cohen
c408a5d573 Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0 2011-10-13 13:38:00 -07:00
Mike Lockwood
5dca30affc PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled.
Bug: 5426212

Change-Id: Iebe51609233ef17c108bbec680369793abbae1be
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-13 16:29:29 -04:00
Dianne Hackborn
7fdf356837 am 97175bc3: Merge "Fix issue #5446988: WindowManager warns BOOT TIMEOUT,..." into ics-mr0
* commit '97175bc3277055047d4c3e6109824065f2abec5d':
  Fix issue #5446988: WindowManager warns BOOT TIMEOUT,...
2011-10-13 13:14:43 -07:00
Dianne Hackborn
38cc8960cb Fix issue #5446988: WindowManager warns BOOT TIMEOUT,...
...dev.bootcomplete flags is set before boot animation is out

Also:

- Fix crash in recent apps if the intent for an old app didn't
happen to have the new task flag set.
- Fix issue where a crash in system UI would cause the crash
dialog to be displayed below it, effectively locking the UI.  Now
the crash dialog for persistent processes is shown above everything
else.

Change-Id: I0312001a92beeae5f644c7c3e5c5e19f6716df36
2011-10-13 12:55:57 -07:00
John Grossman
14252a0576 AAH: Fix a bug in the master election state machine.
Client's of Masters who disappear before the client has processed even
one timesync response should not enter the Ronin state.  Since they
have never synced to the old Master's timeline, by becoming Ronin they
run the risk of defeating other new Ronin's in the master election,
even though they don't have any idea what time it is on the old
Master's timeline and therefore are unsuitable to serve as the new
Master.  Instead, they should transition to the Initial state, where
other new Ronins (who do know what time it is) have the chance to step
in and serve as master of the old timeline.  If there are no other
Ronin who can do the job, then the old timeline is dead and by
transitioning to Initial, a new one will be generated.

Change-Id: Ia6f76dfadb4a739e55886b103b501ca8cffdd774
Signed-off-by: John Grossman <johngro@google.com>
2011-10-13 12:38:57 -07:00
Christopher Tate
32418be49e Require device encryption password to perform adb backup/restore
This supersedes any backup-password that the user might supply.  Per
design, the device encryption password is also always used to encrypt
the backup archive.

The CL introduces two new strings, used for prompting the user for
their device encryption password rather than their settings-defined
"backup password" when confirming a full backup or restore operation.

Bug 5382487

Change-Id: I0b03881b45437c944eaf636b6209278e1bba7a9f
2011-10-13 12:29:32 -07:00
Dianne Hackborn
91c3f2a0b3 am 2c4d954e: am f4b40de6: Merge "Fix issue #5445966: WindowManager reporting -long on prime when it shouldn\'t be." into ics-mr0
* commit '2c4d954ece25324dee2b5f4dc08bd8fb3f5e3dfb':
  Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be.
2011-10-12 21:11:36 -07:00
Jeff Brown
8324d388a8 am 2b5b83bd: Merge "Improve screenshot chord debouncing. Bug: 5011907"
* commit '2b5b83bda80253a6ff0925ae65da636ed2856def':
  Improve screenshot chord debouncing. Bug: 5011907
2011-10-12 20:43:15 -07:00
Jamie Gennis
b001cfb4da am c2091130: am 075e4c3d: Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0
* commit 'c2091130ae1a1b37956f49d0fe81fb82413cd2dd':
  SurfaceFlinger: update orientation via transactions
2011-10-12 20:42:40 -07:00
Svetoslav Ganov
fda63b2655 am 9dbe4143: am 52763734: Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
* commit '9dbe41432c1a580b33f8820a2712e0a4d1c9fad4':
  Dragging in touch explore mode should not become exploring.
2011-10-12 19:38:27 -07:00
Dianne Hackborn
2c4d954ece am f4b40de6: Merge "Fix issue #5445966: WindowManager reporting -long on prime when it shouldn\'t be." into ics-mr0
* commit 'f4b40de684b3574475205542f22b2d49a75f31eb':
  Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be.
2011-10-12 17:06:27 -07:00
Dianne Hackborn
f4b40de684 Merge "Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be." into ics-mr0 2011-10-12 17:01:18 -07:00
Adam Cohen
9730031f8a Fixing issue where widgets file was getting blown away, issue: 5036321
Change-Id: If40a9c79f70e11eee935b2dd2614e723423ff3bf
2011-10-12 16:22:08 -07:00
Dianne Hackborn
36991744a2 Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be.
The window manager now uses the app screen dimensions to compute
the various configuration properties, as it should.

This means that prime is official a "not long" device.  Poor prime.
It probably feels inadequate now.

Because it is.

Oh and all that other stuff?  Debugging logs.  Turned off.  And
why the heck not, debugging logs are great.

Change-Id: Iaaf8ef270d986d34fd046d699ef4c0ecea1981fc
2011-10-12 15:17:11 -07:00
Jeff Brown
d5bb82d18c DO NOT MERGE. Improve screenshot chord debouncing.
Bug: 5011907

Introduce a 150ms delay in handling volume down keys
while waiting to see if a power key will follow.

Don't trigger the screenshot chord if both volume up and
volume down are pressed together.

Don't trigger the long-press power menu if volume keys are
also pressed.

Require the user to press both keys in the chord within
the debounce time and continue long-pressing them in order
to trigger the screenshot action.

Change-Id: I248968d37b73c09d6d08e7f62667c443eba32da0
2011-10-12 15:05:59 -07:00
Jeff Brown
2b5b83bda8 Merge "Improve screenshot chord debouncing. Bug: 5011907" 2011-10-12 14:49:57 -07:00
Jeff Brown
905805ad7c Improve screenshot chord debouncing.
Bug: 5011907

Introduce a 150ms delay in handling volume down keys
while waiting to see if a power key will follow.

Don't trigger the screenshot chord if both volume up and
volume down are pressed together.

Don't trigger the long-press power menu if volume keys are
also pressed.

Require the user to press both keys in the chord within
the debounce time and continue long-pressing them in order
to trigger the screenshot action.

Change-Id: I248968d37b73c09d6d08e7f62667c443eba32da0
2011-10-12 14:34:23 -07:00
Jamie Gennis
c2091130ae am 075e4c3d: Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0
* commit '075e4c3d2e6a8a9eb3506dfedc8da938fb65fb65':
  SurfaceFlinger: update orientation via transactions
2011-10-12 13:04:36 -07:00
Jamie Gennis
075e4c3d2e Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0 2011-10-12 13:03:11 -07:00
Jeff Sharkey
a2c6f16047 am 69f364ae: Merge "Update internal state when iface is removed."
* commit '69f364ae879cfde8716de07cc3358a4bc515a05b':
  Update internal state when iface is removed.
2011-10-12 12:37:23 -07:00
Svetoslav Ganov
9dbe41432c am 52763734: Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
* commit '5276373430af24448324941af6b911d90a3ddd10':
  Dragging in touch explore mode should not become exploring.
2011-10-11 18:41:05 -07:00
Svetoslav Ganov
2e1c66bd53 Dragging in touch explore mode should not become exploring.
In touch exploration two fingers in the same direction drag and if one of them
goes up the other starts to touch explore. This however causes inadvertent touch
exploring to happen on almost every scroll causing confusion. Now two finger
drag and they should both go up to allow exploring. This way the inadvertent
exploring is gone and user experience is much better.

bug:5440411

Change-Id: Id8aaece92e5dea1fc740400d2adc9dd63a1674e4
2011-10-11 18:22:16 -07:00
Jeff Sharkey
69f364ae87 Merge "Update internal state when iface is removed." 2011-10-11 14:54:08 -07:00
Jamie Gennis
e2909e121c SurfaceFlinger: update orientation via transactions
This change merges the ISurfaceComposer::setOrientation functionality
into ISurfaceComposer::setTransactionState.  It enables the window
manager to atomically update both the display orientation and the
position and size of the windows in a single transaction with
SurfaceFlinger.

Bug: 5439574
Change-Id: I18a8ccc564d7d760ef8afb2d015ccdb7a7963900
2011-10-11 13:34:01 -07:00
Jeff Sharkey
89b8a2161a Update internal state when iface is removed.
Bug: 5433432
Change-Id: I7eb0ffe3ae07f42d5c47fe4082f490478c5099bf
2011-10-11 11:58:11 -07:00
Mathias Agopian
7031b8e67e am 5c3bea70: Merge "fix an issue where the screen could stay off"
* commit '5c3bea702276bed21234715b497d683ef1b1f012':
  fix an issue where the screen could stay off
2011-10-10 22:24:06 -07:00
Mathias Agopian
5c3bea7022 Merge "fix an issue where the screen could stay off" 2011-10-10 22:21:57 -07:00
Mathias Agopian
919139247c fix an issue where the screen could stay off
this would happen when toggling on/off/on very fast, the screen
could stay black (while the panel is on).

Bug: 5429724
Change-Id: Ic8aa6aff066e6267923c0d47ef65e314e7bb6d41
2011-10-10 22:18:55 -07:00
Dianne Hackborn
0e00b30822 am 9f4021d8: Merge "Keep screen brightness at 0 while waiting for the UI to be displayed."
* commit '9f4021d86a92355539844623b782331006926a4e':
  Keep screen brightness at 0 while waiting for the UI to be displayed.
2011-10-10 19:19:15 -07:00
Dianne Hackborn
9f4021d86a Merge "Keep screen brightness at 0 while waiting for the UI to be displayed." 2011-10-10 19:16:52 -07:00