7666 Commits

Author SHA1 Message Date
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
Mathias Agopian
4a0970fc0a am 9c518d1f: Merge "Fix screen off animation when in landscape"
* commit '9c518d1f16850ba1036bab5d731cad9dacd1b6fa':
  Fix screen off animation when in landscape
2011-10-10 19:06:47 -07:00
Mathias Agopian
9c518d1f16 Merge "Fix screen off animation when in landscape" 2011-10-10 19:05:23 -07:00
Mathias Agopian
b946a56b69 Fix screen off animation when in landscape
Change-Id: I4bc5b12d7a64a4bf8b9a851594be4d60b790d1ed
2011-10-10 19:02:07 -07:00
Dianne Hackborn
474fd74b88 Keep screen brightness at 0 while waiting for the UI to be displayed.
Change-Id: I957135c5423db6d83f4f30232481a1b6d77165fa
2011-10-10 18:40:22 -07:00
Jeff Sharkey
78d8308677 am 338140f7: Merge "Over-limit within handful of MTU\'s, update assets."
* commit '338140f7340a5471b5c5e8152405bc810fe56769':
  Over-limit within handful of MTU's, update assets.
2011-10-10 17:49:04 -07:00
Jeff Sharkey
338140f734 Merge "Over-limit within handful of MTU's, update assets." 2011-10-10 17:47:46 -07:00
Christopher Tate
a16ee2642d am b765e45f: Merge "Gracefully handle "needs init" transport errors at finish"
* commit 'b765e45f007a97c5b624f27a9368164ad03a4fee':
  Gracefully handle "needs init" transport errors at finish
2011-10-10 17:28:52 -07:00
Christopher Tate
b765e45f00 Merge "Gracefully handle "needs init" transport errors at finish" 2011-10-10 17:27:05 -07:00
Jeff Sharkey
50e7e51d68 Over-limit within handful of MTU's, update assets.
Consider a network over-limit when it's measured usage is within a
handful of MTU's, since kernel completely drops packets that trigger
limit alert.

Update notification drawables.

Bug: 5433359, 5224629
Change-Id: I10b19cc34c34b47775904229829a25208cd85d25
2011-10-10 16:57:21 -07:00
Christopher Tate
e659fb9275 Gracefully handle "needs init" transport errors at finish
Although it's typical for a backup transport to report that it
needs an explicit initialization opportunity when the backup is
initiated, it can sometimes come to pass that the "needs init"
error condition is reported at backup *finish*.  In this case the
framework side was failing to properly reset all of the relevant
state.  The end result was to spin hard forever, holding wakelocks
and continually failing to actually perform the necessary init
operation, possibly continuing even after a reboot.  Fixed.

Bug 5434579

Change-Id: If1d72c338526e4019ea524c48a11e71e44e77f71
2011-10-10 16:34:50 -07:00
Dianne Hackborn
091ff486ab am 94e8471a: Merge "Fix issue #5405788: Device continuously opening and closing..."
* commit '94e8471a956d46f4fae3da2b1e79862e07209efa':
  Fix issue #5405788: Device continuously opening and closing...
2011-10-10 16:10:02 -07:00
Dianne Hackborn
58f42a59bd Fix issue #5405788: Device continuously opening and closing...
...the "Complete action using" dialog

When an application goes idle, it sends back to the activity manager
the configuration it last used, to make sure the two don't get out
of sync.  Fix a bunch of edge cases here in dealing with that, and
be sure to also send the current configuration when launching an
activity so the client is always up-to-date when launching.

Also a small fix to not show the upgrading dialog during first boot.

Change-Id: I14ed366a87cd689d1c78787369e052422290ac6f
2011-10-10 14:53:08 -07:00
Mathias Agopian
c6af3967bd am 5872a775: Merge "enable EGL_IMG_context_priority for the omap4 platform"
* commit '5872a7758b15f98fcd37e7f1cd357328932f7bf5':
  enable EGL_IMG_context_priority for the omap4 platform
2011-10-10 12:40:12 -07:00
Mathias Agopian
5872a7758b Merge "enable EGL_IMG_context_priority for the omap4 platform" 2011-10-10 12:38:16 -07:00
satok
413d00c2d7 am af8139ee: Merge "Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME"
* commit 'af8139ee9b97c031e5b45ac9f1175ef4794c39ee':
  Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME
2011-10-10 01:16:17 -07:00
satok
af8139ee9b Merge "Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME" 2011-10-10 00:59:41 -07:00
satok
dc9ddaee9a Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME
Bug: 5420127

Change-Id: I3649de36806fc24e1c85c2b15db5e37acad1f120
2011-10-10 15:49:22 +09:00
Jeff Sharkey
1825da11a9 am d78a38ca: Merge "Move battery stats to xt_qtaguid for data stats."
* commit 'd78a38cae2f041629326d475333f43fd81ae4137':
  Move battery stats to xt_qtaguid for data stats.
2011-10-09 17:10:15 -07:00
Jeff Sharkey
1059c3c30a Move battery stats to xt_qtaguid for data stats.
Replace TrafficStats calls by reading values from xt_qtaguid kernel
module. To keep BatteryStatsImpl changes lightweight, cache recently
parsed stats. Tracks mobile ifaces from ConnectivityService.

Refactor xt_qtaguid parsing into factory outside of NMS. Add stats
grouping based on UID, and total based on limiting filters like iface
prefix and UID.

Bug: 4902271
Change-Id: I533f116c434b77f93355bf95b839e7478528505b
2011-10-09 13:49:08 -07:00
James Dong
8d7956d368 am 650c53aa: Merge "SurfaceFlinger: screenshots w/ protected buffers"
* commit '650c53aad5a49c793bbcddad9bfce63a3b3d0360':
  SurfaceFlinger: screenshots w/ protected buffers
2011-10-09 09:18:47 -07:00
Jamie Gennis
830d083bf7 SurfaceFlinger: screenshots w/ protected buffers
This change modifies SurfaceFlinger's screenshot behavior when a layer
with a protected buffer is visible.  The previous behavior was to simply
fail the screenshot.  The new behavior is to render the screenshot using
a placeholder texture where the protected buffer would have been.

Change-Id: I5e50cb2f3b31b2ea81cfe291c9b4a42e9ee71874
2011-10-07 17:53:37 -07:00
Mathias Agopian
184df101c0 enable EGL_IMG_context_priority for the omap4 platform
Bug: 5311015
Change-Id: Icaad3d1c963d382ac0a4b9121fe20d3408846c2b
2011-10-07 15:42:53 -07:00
Dianne Hackborn
be870e81e8 am ba8ecd20: Merge "Fix how we hide and show the nav bar."
* commit 'ba8ecd206cc6f175767f952d380c88f70ece04cf':
  Fix how we hide and show the nav bar.
2011-10-07 15:14:55 -07:00
Dianne Hackborn
ba8ecd206c Merge "Fix how we hide and show the nav bar." 2011-10-07 15:12:17 -07:00