Commit Graph

6056 Commits

Author SHA1 Message Date
Svetoslav
5ee758932a am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
  Accessibility no longer overrides strong encryption.
2014-10-17 23:04:13 +00:00
Svetoslav
a6711ff6f0 Accessibility no longer overrides strong encryption.
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
2014-10-17 14:33:11 -07:00
Jesse Hall
95e14460d4 am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
2014-10-13 22:03:12 +00:00
Jesse Hall
d7e559675c Surface: Leave object in unlocked state when unlockCanvasAndPost fails
If nativeUnlockCanvasAndPost() throws, Surface was maintaining a
reference to the native Surface, and assuming it was still locked.
That would cause future lockCanvas() calls to throw without even
trying to lock the native Surface, even though in some cases the
native lock was actually released before the exception was thrown.

Now Surface treats the native object as unlocked even if
nativeUnlockCanvasAndPost() throws, so it will attempt the native lock
on lockCanvas() rather than assuming it would fail.

This change also changes an IllegalStateException to
IllegalArgumentException in unlockCanvasAndPost(). That exception was
added in KitKat, and was never documented or added to the throws
declaration. This was essentially a silent public API change. Quite a
bit of code in the framework (and likely in applications) catches
IAE from this method, but didn't attempt to handle ISE. Although ISE
is more correct here, it's not worth breaking code (and it did -- in
this bug it changed a problem that should have been silently and
perfectly recovered from into a fatal exception in system_server.)

Bug: 17684556
Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e
2014-10-13 11:01:15 -07:00
Svetoslav
3f41cbf422 am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev
* commit 'c43caf52a61e56d5ed78f947fc8c299ad5273abf':
  Fix child view ordering for accessibility.
2014-10-10 00:10:08 +00:00
Svetoslav
88e447b576 Fix child view ordering for accessibility.
When reporting views to accessibility services we are ordering the
children in a parent based on their location on the screen. The
initial implementation worked pretty well in practive but violated
the transitivity property leading to rare crashes in apps. The current
implementation does not violate transitivity but does not produce
good ordering.

Given the lack of time and to minumize risk this change uses the
old strategy which works most of the time and if that fails we
fall back to the current strategy. Coming up with a correct strategy
that produces good results requires more time.

bug:17887986

Change-Id: I1c233ecdf318befc315e793696ac48bd6c652ab6
2014-10-09 16:40:47 -07:00
Dianne Hackborn
529b78941c am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
2014-10-08 22:48:44 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name.
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
2014-10-07 20:17:19 -07:00
John Reck
b0d6cd236c am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
  Cleanup DeferredLayerUpdater
2014-10-03 23:57:09 +00:00
John Reck
749906b468 Cleanup DeferredLayerUpdater
Bug: 17765082

DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures

Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
2014-10-03 15:02:19 -07:00
Newton Allen
408f7534ef am d84ce32b: Merge "Fix some documentation typos." into lmp-dev
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
  Fix some documentation typos.
2014-10-02 16:46:03 +00:00
Newton Allen
d84ce32bd2 Merge "Fix some documentation typos." into lmp-dev 2014-10-02 16:39:12 +00:00
Neil Fuller
f7cf5d43aa resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
2014-10-02 11:48:08 +01:00
John Reck
5451afcae7 am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev
* commit '8786a962f0aa9991e0bc668eb7d9eae45645409e':
  Re-allow suppressing onDetachedFromWindow
2014-10-01 22:37:41 +00:00
John Reck
77e4a5250f Re-allow suppressing onDetachedFromWindow
Bug: 17578553

Games seem to be doing this to prevent destruction of their
GL contexts, and they assume it works even if it doesn't. However,
GLSurfaceView is clunky here, so while the app is doing something
questionable we don't really offer a better way. For now revert
back to kitkat behavior.

Change-Id: Icfa9e496279b9cfa47f9bc7f6848d9313caed0d5
2014-10-01 10:38:07 -07:00
Neil Fuller
33253a4baa Switch from FloatMath -> Math and Math.hypot where possible
The motivation is an API change: FloatMath is going to be
deprecated and/or removed. Performance is not the goal of
this change.

That said...

Math is faster than FloatMath with AOT compilation.

While making the change, occurances of:

{Float}Math.sqrt(x * x + y * y) and
{Float}Math.sqrt({Float}Math.pow(x, 2) + {Float}Math.pow(y, 2))

have been replaced with:

{(float)} Math.hypot(x, y)

Right now there is no runtime intrinsic for hypot so is not faster
in all cases for AOT compilation:

Math.sqrt(x * x + y * y) is faster than Math.hypot(x, y) with
AOT, but all other combinations of FloatMath, use of pow() etc.
are slower than hypot().

hypot() has the advantage of being self documenting and
could be optimized in future. None of the behavior differences
around NaN and rounding appear to be important for the cases
looked at: they all assume results and arguments are in range
and usually the results are cast to float.

Different implementations measured on hammerhead / L:

AOT compiled:

[FloatMath.hypot(x, y)]
benchmark=Hypot_FloatMathHypot} 633.85 ns; σ=0.32 ns @ 3 trials

[FloatMath.sqrt(x*x + y*y)]
benchmark=Hypot_FloatMathSqrtMult} 684.17 ns; σ=4.83 ns @ 3 trials

[FloatMath.sqrt(FloatMath.pow(x, 2) + FloatMath.pow(y, 2))]
benchmark=Hypot_FloatMathSqrtPow} 1270.65 ns; σ=12.20 ns @ 6 trials

[(float) Math.hypot(x, y)]
benchmark=Hypot_MathHypot} 96.80 ns; σ=0.05 ns @ 3 trials

[(float) Math.sqrt(x*x + y*y)]
benchmark=Hypot_MathSqrtMult} 23.97 ns; σ=0.01 ns @ 3 trials

[(float) Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2))]
benchmark=Hypot_MathSqrtPow} 156.19 ns; σ=0.12 ns @ 3 trials

Interpreter:

benchmark=Hypot_FloatMathHypot} 1180.54 ns; σ=5.13 ns @ 3 trials
benchmark=Hypot_FloatMathSqrtMult} 1121.05 ns; σ=3.80 ns @ 3 trials
benchmark=Hypot_FloatMathSqrtPow} 3327.14 ns; σ=7.33 ns @ 3 trials
benchmark=Hypot_MathHypot} 856.57 ns; σ=1.41 ns @ 3 trials
benchmark=Hypot_MathSqrtMult} 1028.92 ns; σ=9.11 ns @ 3 trials
benchmark=Hypot_MathSqrtPow} 2539.47 ns; σ=24.44 ns @ 3 trials

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I06c91f682095e627cb547d60d936ef87941be692
2014-10-01 14:04:15 +01:00
Adam Powell
ad60831ed9 am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev
* commit 'fe426d061ad5feb65200c2970bf826b10e356247':
  Inset the non-overlay contextual action bar without a status guard
2014-09-30 22:22:01 +00:00
Adam Powell
46cbf7e190 Inset the non-overlay contextual action bar without a status guard
When the status guard is not available, (e.g. when the window is not
drawing system bars) do not consume the insets when an action mode is
active.

Bug 17691453

Change-Id: I459622eaf161a96152fb9ac5f60bb9508aa4de89
2014-09-30 13:31:51 -07:00
Svetoslav
a05e22ab3a am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
* commit '44d4eeaa48721296663a05d01071f196a509dc34':
  Use default encryption password if an accessibility service is enabled.
2014-09-30 20:07:46 +00:00
Svetoslav
44d4eeaa48 Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 2014-09-30 20:01:04 +00:00
Svetoslav
16e4a1aade Use default encryption password if an accessibility service is enabled.
When device is encrypted the user has to authenticate in order to decrypt
the data partition which is required for running accessibility services
and Text-To-Speech. In order to address this issue we are falling back
to use the default password if there is an enabled accessibility service
and the user has secure lock. This will enable the user to authenticate
when accessibility layer is completely functional.

bug:17671790

Change-Id: Iafffe7bcd234008cf91ffb5011b21b803dca227a
2014-09-30 13:00:11 -07:00
George Mount
a5e8b16767 am 8afceda1: Merge "Clear preordered list after use." into lmp-dev
* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
  Clear preordered list after use.
2014-09-30 15:55:03 +00:00
George Mount
bc6d38938e am 8120652b: Order GhostViews so that they display in their ghosted view\'s order.
* commit '8120652bb1155d762d945c1a3bf1636b6825dbd2':
  Order GhostViews so that they display in their ghosted view's order.
2014-09-30 14:55:05 +00:00
Svetoslav
8976ab39d9 am ed2fdc6e: Accessibility node provider getting invalid virtual view id.
* commit 'ed2fdc6ef560c76ba310a2c4e5bb63f01d08af40':
  Accessibility node provider getting invalid virtual view id.
2014-09-30 14:55:01 +00:00
Newton Allen
8f8a11b7fa Fix some documentation typos.
Change-Id: I747a0ade5c7b9c45d4465bf327952338bbc1cfaa
(cherry picked from commit 4465d1a03e)
2014-09-30 02:52:26 +00:00
George Mount
50ac6cb982 Clear preordered list after use.
Bug 17671834
Bug 17697944

Change-Id: I0ba46f32661869db0c925b00342211ea543e2f88
2014-09-29 17:10:24 -07:00
George Mount
8120652bb1 Order GhostViews so that they display in their ghosted view's order.
Bug 17671834

GhostViews can be added in arbitrary order since they are added
depending on how they are insterted into the TransitionValues
maps. This CL does two things: it ensures that GhostViews are always
pulled to the top of the Overlay and inserts GhostViews into
the Overlay in the order that their ghosted views are drawn.

Change-Id: I9f68105126834cc8f30a6cfe5d58fc3c51465afd
2014-09-28 21:13:38 +00:00
Svetoslav
ed2fdc6ef5 Accessibility node provider getting invalid virtual view id.
If the virtual child id is not specified we should ask the node
provider to create a node info for the hosting view bu passing
the special host node id.

bug:17664111

Change-Id: Iaf1387acdfe33b50b50729d293adcdf82340a648
2014-09-28 20:05:23 +00:00
Svetoslav
584599cce2 am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev
* commit '7c20fcc83a5216a993bb1b31ab9ed09e90457fc5':
  Accessibility node provider getting invalid virtual view id.
2014-09-26 23:03:38 +00:00
Svetoslav
b3ba1d4e71 Accessibility node provider getting invalid virtual view id.
If the virtual child id is not specified we should ask the node
provider to create a node info for the hosting view bu passing
the special host node id.

bug:17664111

Change-Id: I9c2d3195ad813eed7ea4108fe0d7ccb9cc32a1a0
2014-09-26 15:23:36 -07:00
Svetoslav
e86737947a am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev
* commit '9ec435dca7296db68b19e03300ff814e34f84c16':
  Using wrong virtual view id When prefetching accessibility nodes.
2014-09-26 02:00:18 +00:00
Svetoslav
c569d35945 Using wrong virtual view id When prefetching accessibility nodes.
When getting an accessibility node info we also prefetch its predecessors,
siblings and descendants up to fifty. If a view has a node provider, i.e.
virtual descendants, and the id of the virtual descendant is not specified
we use a speacial constant to refer that the provider should create a node
for its hosting view. The bug was that we were not using the correct constant
when calling into the provider.

bug:17664111

Change-Id: I4f6b2333e1e7e3e2bb6b164c0752613417c60d16
2014-09-25 18:46:33 -07:00
John Reck
fa8c074faf am e5831979: Missing null check
* commit 'e58319791de1e47db1d6d3c6565f03a5f775a9cb':
  Missing null check
2014-09-25 16:14:25 +00:00
John Reck
ccf2fa0031 Missing null check
Bug: 17642023
Change-Id: I874b76e1e184a59dec714191d759c1045b7b9814
2014-09-25 08:33:05 -07:00
Svetoslav
d0de0d7cb0 am 3d64ca90: am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
* commit '3d64ca90f4af2db3d50d0b41a83c661d4b15b508':
  Ignore not visible  views computing click point for accessibility.
2014-09-24 15:45:09 +00:00
Svetoslav
e7482460af Ignore not visible views computing click point for accessibility.
In accessibility mode we compute a location to where to send down and up
events to click a view (triggered by a double tap). This solves the problem
of interacting with views that are partially covered by other interactive
views. The logic that computes the click point was not ignoring siblings
that are not visible. As a result a blind user cannot interact with some
views.

bug:17632224

Change-Id: I93e637ee6702e4ba3e79faa736205430e2196d01
2014-09-23 18:48:28 -07:00
Jeff Brown
b0697d1e8c am a9b97c68: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit 'a9b97c6839ebf7364552c3c7b1e8eed2c2e56e1a':
  Fix window manager policy state when waking from doze.
2014-09-23 17:00:11 +00:00
Jeff Brown
3ee549ca24 Fix window manager policy state when waking from doze.
Once upon a time when the world was fresh and new, the heavens
had an easy rhythm.  Day and night.  Night and day.  In the day,
the pixel fairies would cavort and play in the bright gardens
with narry a mark of shadow or gloom.  In the night, they would
rest peacefully, dreaming no dreams and knowing no fear.

Then one night a fairy dreamed the first dream.  At first
the dream was peaceful, full of colors and delight, hopes and
memories.  Then all at once, jarringly, it awoke in bright
daylight.  The pixel fairy knew fear, for the world had changed
and it was unprepared.

Time passed and the pixel fairies grew accustomed to their
fate, day and night, night and day, sometimes dreaming, until
there came a night when a fairy did not sleep.  It roamed
the land in a dreamless doze, lost and afraid amid a grim haze
of grey and darkness.  The fairy despaired.  It wanted no
part of this place.  It pretended for a time to be awake but
the bright daylight would not come.  It pretended for a time to
be dreaming but the colors and memories would not come.
That is when the fairy wished for oblivion.  Then just as
suddenly, it awoke in the daylight.  It fell to the ground,
stunned as if it had forgotten how to walk in the too bright
daylight.

Though the world again grew softer and kinder in time, the pixel
fairies were never the same.  For the night is dark and full
of terrors.

---

It used to be easy.  Screen on and screen off could explain almost
everything about the state of the device but it's different now with
ambient display.  We need to be able to wait for all windows to be
drawn even in the case where the device is still nominally asleep.
In truth, the window manager policy which drives a lot of these
interactions is a thicket of outdated assumptions.

Added a new method to tell the window manager policy when the screen
is being turned off so that it can correctly account for changes
to the interactive state (wakeUp and goingToSleep) and screen state
(screenTurningOn and screenTurnedOff).  Now we can independently
poke keyguard during interactive state changes and we can apply
screen on blocking during screen state changes.

Moved the code which manages screen on blocking (which is what
ensures the UI has fully drawn before revealing screen contents)
from the power manager to the display manager since the display
manager is in a better position to accurately track the state of
the screen, particularly when the screen is being turned off.

Fixed a bunch of synchronization issues.  Previously some work
had been moved to a handler without considering what might
happen if it became reordered relative to other work happening
elsewhere.  Documented the desired behavior in the code to
prevent this from happening again.

There's still a bunch of stuff in here that isn't quite right,
particularly the assumption that there's only one screen, but
it's good enough for now.  Hopefully there aren't too many bugs.

Bug: 17605802
Change-Id: Ic7319e09948c8a3cda014d7e169c964a3ad86f14
2014-09-23 09:38:05 -07:00
John Reck
7a5b01bc0e am 01b5cfaa: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev
* commit '01b5cfaac7e72526d145b4c5ea706993321abaa9':
  Aggressively trim memory for system_process
2014-09-23 02:52:16 +00:00
John Reck
73840ea367 Aggressively trim memory for system_process
Bug: 16978006

Don't HWUI-accelerate KeyguardScrim
Aggressively trim memory as soon as a ViewRootImpl
dies or has its visibility changed.

Change-Id: Ie1b7c9d30653456bd2e9f309128174f972999368
2014-09-22 16:01:56 -07:00
Svetoslav
ea2ecf1611 am efe0f19c: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev
* commit 'efe0f19cd99b5d5ab72fa0c261cb30c0d708efc9':
  Fix memory leak in accessibility cache.
2014-09-21 18:15:48 +00:00
Svetoslav
650d7d9dd2 Merge "Fix memory leak in accessibility cache." into lmp-dev 2014-09-21 17:53:45 +00:00
Yigit Boyar
565dc77229 am 3439d367: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev
* commit '3439d367f662f84cc26c3e7a0eefb6d5d57be5c0':
  Find activity from context in menu inflator for click events
2014-09-20 04:46:21 +00:00
Jeff Brown
2a46170cd6 am 54d28e51: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev
* commit '54d28e51275e948d59484e3bd3e3eaea25c012e8':
  Decouple turning screen on from waking up in policy.
2014-09-20 04:46:16 +00:00
Svetoslav
13bd771c99 Fix memory leak in accessibility cache.
We were not clearing the cache if window state change event
is fired which was the behavior before adding the window
inspection APIs. As a result if no accessibility service
cares about windows we get a leek. Also when the accessibiilty
service cares about windows we were not clearing all windows
nodes from the cache. Now if a windows change or a window
state change event is recived we clear the cache.

bug:17589257

Change-Id: I8c416fbcab623160c6f505128b9fca713fcc6623
2014-09-19 19:21:55 -07:00
Yigit Boyar
1a74dc4547 Merge "Find activity from context in menu inflator for click events" into lmp-dev 2014-09-20 01:30:00 +00:00
Jeff Brown
36c4db8bd3 Decouple turning screen on from waking up in policy.
This allows us to ensure windows are fully drawn before unblocking
screen on while dozing.

Bug: 17516245
Change-Id: Ibe63c212b8db855ce26a34a8169f33764b266ee6
2014-09-19 13:14:29 -07:00
Yohei Yukawa
f4b5dae23a am e7f77f64: am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev
* commit 'e7f77f641821b150173080d02336764e0e82629a':
  Speculative fix of IMMS crash
2014-09-19 05:41:12 +00:00
Yohei Yukawa
d66a7324cc Merge "Speculative fix of IMMS crash" into lmp-dev 2014-09-19 05:19:04 +00:00
Yohei Yukawa
fcedfa0190 Speculative fix of IMMS crash
This CL is a follow up CL for I6571d464a46453934f0a8f5e790.

Do not propagate Resources.NotFoundException to the caller
of InputMethodInfo.isDefault().

BUG: 17553712
BUG: 17549437
BUG: 17517332

Change-Id: Ie95880c1f68f49eb63518e69b7dfa20af3ce8737
2014-09-19 05:02:59 +00:00