Commit Graph

44815 Commits

Author SHA1 Message Date
George Mount
60a27c87ef am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev
* commit 'd982b582d1993288347f771177f6889fe14fb387':
  Fix ChangeTransform works only once on a View.
2014-10-02 14:34:15 +00:00
George Mount
d982b582d1 Merge "Fix ChangeTransform works only once on a View." into lmp-dev 2014-10-02 14:27:21 +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
Neil Fuller
ee665151a4 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible
2014-10-02 10:18:29 +00:00
Sreeram Ramachandran
06b4f45899 am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.
2014-10-02 06:29:39 +00:00
Sreeram Ramachandran
e4a05afe85 Send app permissions to netd.
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
2014-10-01 20:22:34 -07:00
Dianne Hackborn
e2aa87b8e2 am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
  More work on issue #17656716: Unhandled exception in Window Manager
2014-10-02 00:27:28 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +00:00
Erik Pasternak
9d96c9fa05 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
2014-10-02 00:04:16 +00:00
Erik Pasternak
4d82c46ef5 Merge "Implement auto-sleep functionality." into lmp-dev 2014-10-02 00:00:40 +00:00
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
2014-10-01 16:58:56 -07:00
Hui Shu
00207f564d am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
2014-10-01 22:39:00 +00:00
Patrick Tjin
df670e7347 am dea847c2: Skip over directories when iterating tombstones
* commit 'dea847c2ace8894a595cf9bd87764ce2ca9698ab':
  Skip over directories when iterating tombstones
2014-10-01 22:38:31 +00: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
Hui Shu
4979a6ade1 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
2014-10-01 22:37:23 +00:00
Craig Mautner
6f357112f8 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
2014-10-01 22:36:47 +00:00
Narayan Kamath
1ff5abdbb1 am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev
* commit '7dc7f676d699c739128dcc7855cbc0dacddaaa57':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
2014-10-01 22:35:50 +00:00
Jerome Poichet
8be1828ae9 am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev
* commit '72079f7f9b644e57169e26597ec7c727786071a1':
  Make sure cancel is called on tear down.
2014-10-01 22:34:24 +00:00
Hui Shu
4e0ad44fca Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 2014-10-01 22:10:23 +00:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality.
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
2014-10-01 15:01:10 -07:00
Hui Shu
2267177279 Revert "Remove WebView DRP Setting from Developer Settings"
This reverts commit eb487c6301.

Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
2014-10-01 21:41:07 +00:00
George Mount
24314e7d10 Fix ChangeTransform works only once on a View.
Bug 17762118

When ChangeTransform is used on a View, its intermediate values
are being set, but not cleared after the transition completes
unless it uses a GhostView. This CL clears the intermediate
values when the animation ends if no GhostView is used.

Change-Id: I2590d9c2bc36d31023b3e1af94d2bd72c9589eb5
2014-10-01 14:28:05 -07:00
Patrick Tjin
dea847c2ac Skip over directories when iterating tombstones
Bug: 17380601
Change-Id: Idb6e559a89c7438751bd7a52375b9789454e0334
2014-10-01 21:17:52 +00:00
John Reck
8786a962f0 Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 2014-10-01 19:11:04 +00:00
Hui Shu
aee5c9e7c1 Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 2014-10-01 18:28:57 +00:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +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
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
2014-10-01 10:14:53 -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
Narayan Kamath
7dc7f676d6 Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 2014-10-01 09:53:34 +00:00
Jerome Poichet
c1fb6dc1a4 Make sure cancel is called on tear down.
- Make sure cancel is called when consumer of SpeechRecognizer calls
  destroy.
- If consumer goes away, make sure to call cancel as well.

b/17584947 Pressing mic button in Music hoses audio

Change-Id: Ibe1198b37fe6167493a8694f9089d970f1eb07de
2014-09-30 17:56:27 -07:00
Hui Shu
eb487c6301 Remove WebView DRP Setting from Developer Settings
BUG: 17730990
Change-Id: Ic4fde9affb2f887329d6b3d2dbe8945959c016d8
2014-09-30 16:52:41 -07:00
Eino-Ville Talvala
c89f28019d am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev
* commit '0a62ab707977d4d6666d1c452ba702442655b6e6':
  Camera2 Legacy: Set a default thumbnail size
2014-09-30 23:51:26 +00:00
Eino-Ville Talvala
0a62ab7079 Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 2014-09-30 23:44:58 +00: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
fe426d061a Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 2014-09-30 22:17:01 +00:00
Alan Viverette
0be2757ad5 am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev
* commit 'c44c77d305c02d9c8280df5ce3a816ee586c9d52':
  Implement missing visibility management for FrameLayout foreground
2014-09-30 22:09:26 +00:00
Ruben Brunk
e06a3d8253 am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
* commit 'b3c802f2381c3411fe753206ab89027f60164b77':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
2014-09-30 22:09:18 +00:00
Alan Viverette
c44c77d305 Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev 2014-09-30 22:06:05 +00:00
Ruben Brunk
b3c802f238 Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 2014-09-30 22:05:48 +00:00
Alan Viverette
3be5e0e625 Implement missing visibility management for FrameLayout foreground
BUG: 15350931
Change-Id: I16900d0d95051489852385d682e7b5aa4adad327
2014-09-30 14:27:58 -07:00
Ruben Brunk
0c79884076 camera2: Use valid dimensions for RGBA8888 gralloc buffers.
Bug: 17675571

- All of the mistakes were made.  Unmake them.

Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
2014-09-30 13:54:20 -07: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
Dianne Hackborn
ed1589d81f am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '9cf01b63cb0023aec0e05b1ce050ff572532b876':
  More work on issue #17656716: Unhandled exception in Window Manager
2014-09-30 20:23:01 +00:00
Dianne Hackborn
9cf01b63cb Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-09-30 20:18:49 +00: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
Winson Chung
a07d989165 am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev
* commit 'da649073bd927fa69d02982745cc1d61e9a4f8b3':
  Fixing regression with black task bar background. (Bug 17584337)
2014-09-30 19:41:49 +00:00
Winson Chung
da649073bd Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 2014-09-30 19:16:22 +00:00