Adrian Roos
4e2c298876
am 2f6fd874: am 5f978bfa: Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev
...
* commit '2f6fd874510cd333f7fc0b08e146d5d069fa2013':
Retire RecentApplicationsDialog
2014-10-20 13:15:40 +00:00
Adrian Roos
5f978bfa09
Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev
2014-10-20 13:04:09 +00:00
Neil Fuller
1f2ad9eb74
am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
...
* commit 'dfcf065505a12aa358af5cd2607fd355eee964c4':
Replacing FloatMath native implementation with calls to Math
2014-10-20 10:16:29 +00:00
Neil Fuller
dfcf065505
am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
...
* commit '09fd5a1873fa1ab51f4e428b1b909fea35091a51':
Replacing FloatMath native implementation with calls to Math
2014-10-20 10:10:34 +00:00
Neil Fuller
09fd5a1873
Merge "Replacing FloatMath native implementation with calls to Math"
2014-10-20 10:08:11 +00:00
Yuncheol Heo
26ea56b3c5
am 5814bf1c: am 0608b932: CEC: Add a callback for vendor when HDMI control setting is changed.
...
* commit '5814bf1c7bc4b8abed781c1667305d843e7079fb':
CEC: Add a callback for vendor when HDMI control setting is changed.
2014-10-20 09:19:49 +00:00
Nick Kralevich
7b3db39aa4
Replacing FloatMath native implementation with calls to Math
...
On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.
When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.
Example timings:
Mako AOSP AOT:
Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns
Mako AOSP interpreted:
Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns
Other calls Mako AOT:
Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns
The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
2014-10-20 09:24:11 +01:00
Yuncheol Heo
0608b9328b
CEC: Add a callback for vendor when HDMI control setting is changed.
...
- removed unregisterContentObserver() to reactivate the service later.
- added the parameter destAddress to onReceived() callback to
distinguish whether the message is broadcast or not.
Bug: 17962624
Change-Id: I552d14661583f63bb66b07866092f972b259b15a
2014-10-20 16:47:24 +09:00
Jinsuk Kim
dcc8004377
am 7a78e578: Merge "CEC: add getDeviceList()" into lmp-mr1-dev
...
automerge: f5e6935
* commit 'f5e693510153ecf855d7d2d807bd36b1bd9be28c':
CEC: add getDeviceList()
2014-10-20 03:28:32 +00:00
Jinsuk Kim
7a78e578d7
Merge "CEC: add getDeviceList()" into lmp-mr1-dev
2014-10-20 03:02:44 +00:00
Jinsuk Kim
bdf27fbf74
CEC: add getDeviceList()
...
Returns the list of all the connected CEC device information. This is
different from getInputDevices() which returns devices of source type only.
For this, turned the local device address list to unmodifiable so that it can
be used by any threads.
Now respects the device type info passed through <Report Physical Address>
rather than always defaulting to the one from HdmiUtil.getTypeFromAddress().
This ensures future compatibility when a device of reserved logical address
comes with a specific type.
Bug: 18046603
Change-Id: I5f7d5e31706efba1ad5dcf4bcfd4ffc918d1d940
2014-10-20 11:32:47 +09:00
Elliott Hughes
870367567a
am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
...
* commit '84e6d466edc2aba711f90431a1cd209d11c0e70d':
Revert "Replacing FloatMath native implementation with calls to Math"
2014-10-18 20:54:05 +00:00
Elliott Hughes
84e6d466ed
am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
...
* commit '4cd671e4d27befdd576fa86051956c3cafad6808':
Revert "Replacing FloatMath native implementation with calls to Math"
2014-10-18 20:48:03 +00:00
Elliott Hughes
4cd671e4d2
Merge "Revert "Replacing FloatMath native implementation with calls to Math""
2014-10-18 20:43:07 +00:00
Elliott Hughes
b3b68d0333
Revert "Replacing FloatMath native implementation with calls to Math"
...
This reverts commit 32b88b48da .
Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
2014-10-18 20:41:27 +00:00
Dianne Hackborn
019de15ca2
am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288 : Improve accuracy of memory use reporting" into lmp-mr1-dev
...
* commit '2ea2bf284078eea4871bfa0fb42b56dff3e8bbf3':
Fix issue #17948288 : Improve accuracy of memory use reporting
2014-10-18 00:52:07 +00:00
Alan Viverette
15b6be2d16
am c97924f4: am a496ba55: am e61519b4: am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
...
* commit 'c97924f49365e61f409071ad23bc0b920ebdf2b3':
Translate compound button drawable by scroll position
2014-10-18 00:44:08 +00:00
Dianne Hackborn
ed512c817c
Merge "Fix issue #17948288 : Improve accuracy of memory use reporting" into lmp-mr1-dev
2014-10-18 00:42:24 +00:00
Alan Viverette
a496ba5552
am e61519b4: am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
...
* commit 'e61519b4a541a4262389842ae8b72dac401b2199':
Translate compound button drawable by scroll position
2014-10-18 00:32:17 +00:00
Alan Viverette
e61519b4a5
am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
...
* commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
Translate compound button drawable by scroll position
2014-10-18 00:26:21 +00:00
Alan Viverette
15e7b2ac60
Merge "Translate compound button drawable by scroll position" into lmp-dev
2014-10-18 00:20:27 +00:00
Alan Viverette
b95c336d78
Translate compound button drawable by scroll position
...
BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
2014-10-17 17:19:12 -07:00
Jim Miller
8596960eb5
am 956e424d: am d9b81b11: am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
...
* commit '956e424d007df454cc4a2bfc576336eb0c8f20e4':
Add utility methods to LockPatternUtils for encryption
2014-10-18 00:07:35 +00:00
Jim Miller
d9b81b11b9
am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
...
* commit 'a054a8280c1316a1f805cc86f00f571a3b1cfc2f':
Add utility methods to LockPatternUtils for encryption
2014-10-17 23:57:33 +00:00
Jim Miller
a054a8280c
am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
...
* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
Add utility methods to LockPatternUtils for encryption
2014-10-17 23:52:41 +00:00
Jim Miller
c6c843fbe8
Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
2014-10-17 23:48:21 +00:00
Svetoslav
f43465452b
am 0ee9f361: am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
...
* commit '0ee9f36140530cf8ee60613f4f057c2ec95fe498':
Accessibility no longer overrides strong encryption.
2014-10-17 23:19:57 +00:00
Svetoslav
0b5af04a8b
am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
...
* commit 'ebb38bcc03a0f770d371b2ed997570572df7aed1':
Accessibility no longer overrides strong encryption.
2014-10-17 23:09:55 +00:00
Jim Miller
dd5de719c5
Add utility methods to LockPatternUtils for encryption
...
This enables a change in Settings that allows device
encryption to be disabled by the user.
Fixes bug 17881324
Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
2014-10-17 16:08:21 -07:00
Svetoslav
ebb38bcc03
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:12 +00:00
Svetoslav
cd2b54e6e5
Merge "Accessibility no longer overrides strong encryption." into lmp-dev
2014-10-17 22:59:22 +00:00
Dianne Hackborn
b3af4ec6ba
Fix issue #17948288 : Improve accuracy of memory use reporting
...
We now use Mapped to not double-count cached pages that are
mapped in to app processes. Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.
It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space. I need to figure out
how I was finding that before.
Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
2014-10-17 15:25:13 -07:00
William Bourke
83c97babb0
am cb1e32ac: am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
...
* commit 'cb1e32ac2b5eb12ff89af5eb8074908b5f54d047':
Modified lollipop Easter egg for TV compatibility
2014-10-17 22:20:44 +00:00
William Bourke
44d515457a
am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
...
* commit '7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3':
Modified lollipop Easter egg for TV compatibility
2014-10-17 22:09:19 +00:00
William Bourke
7d5c68e31e
am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
...
* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
Modified lollipop Easter egg for TV compatibility
2014-10-17 22:03:50 +00:00
William Bourke
33f577cfea
Modified lollipop Easter egg for TV compatibility
...
Bug: 17997922
Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec
2014-10-17 21:57:23 +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
Adam Lesinski
7dd87312c9
am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev
...
* commit '87a529c899045cf2785b86e4e289dd6c6cf56c1a':
Minor resource notation/compatibility fixes
2014-10-17 20:28:47 +00:00
Amith Yamasani
50207f043f
am 3e732ab2: am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev
...
* commit '3e732ab2050507dbfde23ee0d050daae86d9d8bc':
Use the correct method to check if device is encrypted
2014-10-17 20:28:41 +00:00
Adam Lesinski
12c84b5d9f
Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev
2014-10-17 19:17:20 +00:00
Dianne Hackborn
eff986af30
am 9baa4506: am 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
...
* commit '9baa4506f1e7218d555d37a2057325c68492f080':
SDK only: hide the old L API version constant.
2014-10-17 19:16:37 +00:00
Amith Yamasani
e1970346a4
am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev
...
* commit 'b5afeca3d9ce3efb0ab9ab6536d4446ec73b416c':
Use the correct method to check if device is encrypted
2014-10-17 19:05:25 +00:00
Amith Yamasani
b5afeca3d9
am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev
...
* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
Use the correct method to check if device is encrypted
2014-10-17 19:00:36 +00:00
Amith Yamasani
a865bb5df8
Merge "Use the correct method to check if device is encrypted" into lmp-dev
2014-10-17 18:55:58 +00:00
Alan Viverette
694410981f
am 15d3a53b: am 721fc2ad: Fix build
...
* commit '15d3a53be5fa856ad85d066111d27c60c885f3b2':
Fix build
2014-10-17 18:55:05 +00:00
Dianne Hackborn
3182987eb8
am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
...
* commit 'bab9b48efcc55ee247c428aa3f53725c25222166':
SDK only: hide the old L API version constant.
2014-10-17 18:53:37 +00:00
Amith Yamasani
cd410ba4e8
Use the correct method to check if device is encrypted
...
DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.
Check if the device is encrypted by some means, instead.
Also fix a SecurityException when Device Admin queries encryption state
(recent regression)
Bug: 17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
2014-10-17 11:43:57 -07:00
Alan Viverette
721fc2adf4
Fix build
...
Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
2014-10-17 11:36:38 -07:00
Alan Viverette
ef8a19147e
am 0087f225: am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev
...
* commit '0087f2253ac8cbb4868fd27d71afbad32a103a75':
Check type resolution on declared methods and fields in ViewDebug
2014-10-17 17:27:41 +00:00
Dianne Hackborn
aa02bce2f4
am 56ae0447: am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev
...
* commit '56ae044791aa9a800292eb0f6c3852ede91f17c2':
Add API level for MR1.
2014-10-17 17:19:55 +00:00