11590 Commits

Author SHA1 Message Date
Dianne Hackborn
d341344be0 am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev
* commit '7caa51e6ec6443d5c1fdb96f7e42508b074b4278':
  Fix issue #17811029: Settings provider race when removing users
2014-10-03 21:02:55 +00:00
Dianne Hackborn
67f175cf07 Fix issue #17811029: Settings provider race when removing users
Change-Id: Ia40d0a9c161b765d1340db5390d0acdbfc050b81
2014-10-03 12:29:43 -07:00
John Spurlock
0c6964f359 am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev
* commit 'a79caa53405ea3efdd77d59ea7aa6dd64ecf09d3':
  Update framework icons for media & alarm streams.
2014-10-03 14:00:18 +00:00
John Spurlock
4bebb1dc5e Update framework icons for media & alarm streams.
Update resources to new style and remove obsolete items.

Bug: 17762712
Change-Id: Ibec121828084934cc066afe117f66b6a0eea603f
2014-10-02 20:11:37 -04:00
Kenny Guy
e4a091bb82 am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev
* commit '3de09018a9611b1791cc29ed5200b7d9694189a9':
  SettingsProvider should use correct cache when redirecting to user 0.
2014-10-02 16:54:18 +00:00
Kenny Guy
3de09018a9 Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 2014-10-02 16:48:57 +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
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
John Spurlock
b208f618cf am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev
* commit 'c403a340cbb097a95b35b198b27cf44c80a7242e':
  Doze: Route volume keys to music only while pulsing.
2014-10-01 22:38:16 +00:00
Winson Chung
3515d34b0d am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode o
* commit 'd092fc7076310fca5edd089df5bb5398096f6627':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
2014-10-01 22:38:02 +00:00
Selim Cinek
9262cd1498 am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev
* commit '15b2202bacdfcc249d7f51bcd3361e6694d24267':
  Adapting translation length for a string in a dialog
2014-10-01 22:36:07 +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
John Spurlock
c403a340cb Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 2014-10-01 20:17:36 +00:00
Winson Chung
d092fc7076 Merge "Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option" into lmp-dev 2014-10-01 20:03:19 +00:00
John Spurlock
0b99ea94f0 Doze: Route volume keys to music only while pulsing.
Avoid waking up the device on hw vol key presses during a doze
pulse.  Instead, behave as if the screen was off for these keys,
namely forwarding them over to the session manager.

Bug:17672775
Change-Id: I566b93f0bdea79253ac3eca41d3876b271c61306
2014-10-01 15:32:22 -04:00
Kenny Guy
a37d000c2b SettingsProvider should use correct cache when redirecting to user 0.
SettingsProvider reads secure and system settings for managed
profiles from user 0 instead. However it still checks the cache
for the managed profile not user 0.

Bug: 17736586
Change-Id: I15d44b8a5779b01e6b9032e528dc34f5c5602449
2014-10-01 19:18:18 +01:00
Winson Chung
9cb5c4e385 Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618)
- Fix regression with launching an affiliated task due to clipping changes (Bug 17755902)
- Tweaking previous changes to home transition
- Disable the debug mode option
2014-10-01 17:48:05 +00:00
Selim Cinek
15b2202bac Merge "Adapting translation length for a string in a dialog" into lmp-dev 2014-10-01 16:43:07 +00:00
Baligh Uddin
ff99ff98cc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 16:35:13 +00: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
Selim Cinek
1aca1d4110 Adapting translation length for a string in a dialog
Bug: 17344905
Change-Id: Id95bdfea30c8ffd86a44cfa259cf5417abb09528
2014-10-01 14:12:11 +02:00
Vineeta Srivastava
044ae6938c am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev
* commit 'ab1e241d385ac2cb589f961cf6ea4a86b8a3e867':
  Show one name if both plmn and spn are equal
2014-10-01 00:11:04 +00:00
Sungmin Choi
ab1b39f434 Show one name if both plmn and spn are equal
If both plmn and SPN are SKTelecom, lockscreen is shown as SKTelecom-SKTelecom.
In this case, it would be better to show only SKTelecom.

Bug: 17702041
Change-Id: I268455b037752cf21a3247be7809283f50b72c27
2014-09-30 23:35:14 +00:00
Paul Jensen
2569c8ddc4 am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects.
* commit '8df099df1516d23c113be3121635dcd34984a4a0':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
2014-09-30 18:40:31 +00:00
Paul Jensen
8df099df15 Make CaptivePortalLogin app exit if underlying Network disconnects.
The app is no longer useful if the underlying Network has disconnected
and could get in the way of another signing into another Network.

bug:17672087
Change-Id: I26e820444640975e7fd4dd73244f4d4f4b40cb5e
2014-09-30 14:34:04 -04:00
Winson Chung
2a44d2333c am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev
* commit 'e3206407a5968dcf6690793f047bdfede0424df5':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
2014-09-30 16:45:44 +00:00
John Spurlock
ffca85400f am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
  Don't play hint animations when dozing
2014-09-30 16:41:14 +00:00
Winson Chung
e3206407a5 Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 2014-09-30 16:39:43 +00:00
John Spurlock
a1b84165f9 Merge "Don't play hint animations when dozing" into lmp-dev 2014-09-30 16:35:26 +00:00
Jason Monk
d1b1947b89 am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
  Pull roaming from mServiceState for consistency
2014-09-30 15:55:07 +00:00
John Spurlock
72fd266961 am ee98df79: Doze: Log screenOnFromTouch when flinging.
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
  Doze: Log screenOnFromTouch when flinging.
2014-09-30 15:54:55 +00:00
Jorim Jaggi
d7912d2f10 Don't play hint animations when dozing
Bug: 17718416
Change-Id: I2c27b4ea479ee46612eb5284a2c872d03dc52ab0
2014-09-30 17:38:19 +02:00
Jason Monk
e7b18d2bab Merge "Pull roaming from mServiceState for consistency" into lmp-dev 2014-09-30 15:30:11 +00:00
Jorim Jaggi
6db0bd8bbb am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev
* commit 'b5140130839e70f1fb55a0bc81b11354b42b820b':
  Revert "Add massive logging to investigate blank Keyguard"
2014-09-30 14:55:19 +00:00
John Spurlock
e88efd75bb am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev
* commit 'e5238f7a8db90ebc0e8875adaff84efc198f0800':
  DozeLog: Keep keyguard monitor alive, keep emer call stats.
2014-09-30 14:55:12 +00:00
Jorim Jaggi
227339fde2 am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev
* commit '79107083ca50b99c9e7b678d7739b9ab4798db0f':
  Add option to enable scrim SRC optimization
2014-09-30 14:55:10 +00:00
Jorim Jaggi
e7d9475a91 am e2ff1a4e: Merge "Fix overdraw" into lmp-dev
* commit 'e2ff1a4edbe5c8eeb2610a62b8cfe7a58d4c8150':
  Fix overdraw
2014-09-30 14:55:09 +00:00
Selim Cinek
6f0975d0dd am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView
* commit '311fc0b399f01a79169ae69aea05556043a7d7df':
  Fixed a crash that could occur in the ObservableScrollView
2014-09-30 14:55:08 +00:00
Svetoslav
ce8d47600b am 922fcc2f: Merge "Crash in print spooler if save to PDF selected early." into lmp-dev
* commit '922fcc2f9e2370b34672af0e91e5754c6f8d6da7':
  Crash in print spooler if save to PDF selected early.
2014-09-30 14:55:04 +00:00
Svetoslav
ed62f5d8c8 am b179bed3: Merge "Fix carsh in print spooler if custom print setings return bad pages." into lmp-dev
* commit 'b179bed35302704bce809029ab424f919de351c3':
  Fix carsh in print spooler if custom print setings return bad pages.
2014-09-30 14:55:03 +00:00
John Spurlock
ee98df79a1 Doze: Log screenOnFromTouch when flinging.
Bug: 17350239
Bug: 17496795
Change-Id: I4a8e26c2fc05cf4396e9c8cb58e81b4f95c531e6
2014-09-30 14:07:23 +00:00
Jason Monk
1cd44e3ab4 Pull roaming from mServiceState for consistency
Also consolidate roaming logic while here, to make it easier to
maintain.

Bug: 17514906
Bug: 17619763
Change-Id: I8efabdecc26722ff6ac70d715f3befaae989abdc
2014-09-30 10:05:46 -04:00
Baligh Uddin
3fd0438f55 Import translations. DO NOT MERGE
Change-Id: Ic6eb721869643c210f5e3e89fb407a346d27ffd2
Auto-generated-cl: translation import
2014-09-30 04:00:07 -07:00
Winson Chung
8bf05afc26 Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
Change-Id: I016dd8b7be9efa786291051152b1b56aac708e33
2014-09-29 13:42:49 -07:00
Jorim Jaggi
b514013083 Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev 2014-09-29 16:31:55 +00:00
Baligh Uddin
e98a55e87e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:31:10 +00:00