Commit Graph

46742 Commits

Author SHA1 Message Date
Wei Wang
c071e2775f am a4f81468: am 1217c2b2: am 2959231c: am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
* commit 'a4f814682ff30a19ba80555bdc809d14bdb24bca':
  Remove spammy log information for BLE scan.
2014-10-20 22:00:12 +00:00
Wei Wang
a4f814682f am 1217c2b2: am 2959231c: am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
* commit '1217c2b2dbe7b4273a7c08ac55b417270ee20b78':
  Remove spammy log information for BLE scan.
2014-10-20 21:54:59 +00:00
Wei Wang
2959231c78 am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
* commit '33bb6c2d3ca798c8275694d0fe700e9fb1fefe99':
  Remove spammy log information for BLE scan.
2014-10-20 21:46:08 +00:00
Wei Wang
33bb6c2d3c Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 2014-10-20 21:41:29 +00:00
Alan Viverette
05b07c56b5 am a14344de: am 49870a1b: am e28cd1a2: Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev
* commit 'a14344de9b4891301fcb1a57055e20e29f25075a':
  Only request layout when removeView() actually removes a view
2014-10-20 19:18:40 +00:00
Alan Viverette
a14344de9b am 49870a1b: am e28cd1a2: Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev
* commit '49870a1b6460dc006a20fc11e1d0d67248a87be4':
  Only request layout when removeView() actually removes a view
2014-10-20 19:13:30 +00:00
Alan Viverette
e28cd1a276 Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev 2014-10-20 19:00:36 +00:00
Adrian Roos
733ad97c38 am 4e2c2988: am 2f6fd874: am 5f978bfa: Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev
* commit '4e2c29887616596e922e2b5fc5ac4929b3654f6c':
  Retire RecentApplicationsDialog
2014-10-20 13:20:37 +00:00
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
17debef4c5 am 1f2ad9eb: am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '1f2ad9eb7417045c0a08b49a3bdf48600627c57e':
  Replacing FloatMath native implementation with calls to Math
2014-10-20 10:23:19 +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
265a4fc622 am 26ea56b3: am 5814bf1c: am 0608b932: CEC: Add a callback for vendor when HDMI control setting is changed.
* commit '26ea56b3c5dc746e4f292f909d08b4d8f80f0d2a':
  CEC: Add a callback for vendor when HDMI control setting is changed.
2014-10-20 09:24:21 +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
4e222e0b23 am dcc80043: am 7a78e578: Merge "CEC: add getDeviceList()" into lmp-mr1-dev automerge: f5e6935
* commit 'dcc8004377f868142561986b0339ef6dfe68438a':
  CEC: add getDeviceList()
2014-10-20 03:46:24 +00: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
961e3d3922 am 87036756: am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
* commit '870367567a1665dbb109e030f4a2828b60b454db':
  Revert "Replacing FloatMath native implementation with calls to Math"
2014-10-18 21:00:30 +00: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
Nick Kralevich
bf96737e58 Switch from FloatMath -> Math and Math.hypot where possible
Somehow the change at
https://android-review.googlesource.com/#/c/109481/1/core/java/android/util/Spline.java
isn't in master, which seems to be causing a boot failure.

  07-28 07:44:51.338   771   771 E art     : No implementation found for float android.util.FloatMath.hypot(float, float) (tried Java_android_util_FloatMath_hypot and Java_android_util_FloatMath_hypot__FF)
  07-28 07:44:51.338   771   771 W SystemServer: ***********************************************
  07-28 07:44:51.339   771   771 F SystemServer: BOOT FAILURE making Power Manager Service ready
  07-28 07:44:51.339   771   771 F SystemServer: java.lang.UnsatisfiedLinkError: No implementation found for float android.util.FloatMath.hypot(float, float) (tried Java_android_util_FloatMath_hypot and Java_android_util_FloatMath_hypot__FF)
  07-28 07:44:51.339   771   771 F SystemServer: 	at android.util.FloatMath.hypot(Native Method)
  07-28 07:44:51.339   771   771 F SystemServer: 	at android.util.Spline$MonotoneCubicSpline.<init>(Spline.java:168)
  07-28 07:44:51.339   771   771 F SystemServer: 	at android.util.Spline.createMonotoneCubicSpline(Spline.java:72)
  07-28 07:44:51.339   771   771 F SystemServer: 	at android.util.Spline.createSpline(Spline.java:47)
  07-28 07:44:51.339   771   771 F SystemServer: 	at com.android.server.display.DisplayPowerController.createAutoBrightnessSpline(DisplayPowerController.java:1100)

Change-Id: Ic6a85d4f9125b921fa4f307e9d5723c09104ca4d
2014-10-18 13:29:04 -07:00
Dianne Hackborn
515defdebd am 019de15c: am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev
* commit '019de15ca23c674b70ae2e94f0fbb82e4a2bab68':
  Fix issue #17948288: Improve accuracy of memory use reporting
2014-10-18 02:47:10 +00:00
Alan Viverette
649b649683 am 15b6be2d: am c97924f4: am a496ba55: am e61519b4: am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
* commit '15b6be2d16b477b217c0966bad3f5d89c98a61c2':
  Translate compound button drawable by scroll position
2014-10-18 02:46:59 +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
Wei Wang
020bd7b861 Remove spammy log information for BLE scan.
Bug:17574681
Change-Id: Ic5761ad7262200f38f2b67659c37f8a3f01d80d5
2014-10-18 00:29:57 +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
6955be046a am 8596960e: am 956e424d: am d9b81b11: am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
* commit '8596960eb5e072f5514f8863bfd09aac7a43611b':
  Add utility methods to LockPatternUtils for encryption
2014-10-18 00:12:13 +00: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
e7797227c4 am f4346545: am 0ee9f361: am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
* commit 'f43465452bb782166a4cb96dbfede9e7514787ba':
  Accessibility no longer overrides strong encryption.
2014-10-17 23:25:25 +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
William Bourke
ef0b5f56c9 am 83c97bab: am cb1e32ac: am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
* commit '83c97babb00b4b78747d5b14be2ed7dba6f438b0':
  Modified lollipop Easter egg for TV compatibility
2014-10-17 22:25:48 +00:00