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
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
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
b95c336d78
Translate compound button drawable by scroll position
...
BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
2014-10-17 17:19:12 -07: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
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
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
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
985adb98b6
am 7dd87312: am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev
...
* commit '7dd87312c9e9ee52c7c945785c6d3b274b3004b3':
Minor resource notation/compatibility fixes
2014-10-17 21:28:32 +00: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
Dianne Hackborn
f27e06b65b
am eff986af: am 9baa4506: am 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
...
* commit 'eff986af3024c7348d4ff3810872421dfef79ac3':
SDK only: hide the old L API version constant.
2014-10-17 19:23:47 +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
Alan Viverette
d50efd6214
am 69441098: am 15d3a53b: am 721fc2ad: Fix build
...
* commit '694410981fc55c84f740dea41b640e2ff7f5e474':
Fix build
2014-10-17 19:01:47 +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
Alan Viverette
721fc2adf4
Fix build
...
Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
2014-10-17 11:36:38 -07:00
Alan Viverette
247566e3e6
am ef8a1914: am 0087f225: am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev
...
* commit 'ef8a19147e086c559e5e98e9ff340532385ab556':
Check type resolution on declared methods and fields in ViewDebug
2014-10-17 17:32:11 +00: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
6fb1a7f53b
am aa02bce2: am 56ae0447: am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev
...
* commit 'aa02bce2f4acc57f2536cc41c2f0bf15498f6165':
Add API level for MR1.
2014-10-17 17:25:39 +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
Alan Viverette
2f68a204b2
Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev
2014-10-17 17:18:36 +00:00
Dianne Hackborn
bab9b48efc
am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
...
* commit '52476989b8afc0e96c2218625031ed550b12c79b':
SDK only: hide the old L API version constant.
2014-10-17 17:15:08 +00:00
Dianne Hackborn
686a41ef2b
Merge "Add API level for MR1." into lmp-mr1-dev
2014-10-17 17:12:01 +00:00
Neil Fuller
a762f687eb
am 3b96bfb1: am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"
...
* commit '3b96bfb1034433fde57239de036eaa96be107f04':
Removing some more FloatMath references
2014-10-17 15:04:34 +00:00
Neil Fuller
3b96bfb103
am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"
...
* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
Removing some more FloatMath references
2014-10-17 14:59:48 +00:00
Neil Fuller
9b0109eb05
am c7aa8fe6: Merge "Removing some more FloatMath references"
...
* commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
Removing some more FloatMath references
2014-10-17 14:54:17 +00:00
Neil Fuller
c7aa8fe623
Merge "Removing some more FloatMath references"
2014-10-17 14:48:17 +00:00
Adam Lesinski
9086562a6a
Minor resource notation/compatibility fixes
...
- Change the format of mnc/mcc when printing a resource-qualifier
formatted string from a Configuration object.
- Correctly bump the SDK to 21 when using anydpi in a resource qualifier.
Change-Id: I3c31e344dc5384d45398d6e9f264a073abab65d1
2014-10-17 01:21:50 +00:00
Dianne Hackborn
3b6968876f
Add API level for MR1.
...
Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e
2014-10-16 18:14:12 -07:00
Alan Viverette
6658034c91
Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev automerge: 0db6536 automerge: e0fceba
...
automerge: 777949c
* commit '777949c64d335fd56eef80eadc2b09dcb5e009fa':
Update AM/PM selectors for clock face TimePicker
2014-10-17 00:51:15 +00:00