Joe LaPenna
3e1bbaf786
am 45734b4a: Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev
...
* commit '45734b4ae180ea3c34f92575b3ed362bbf4f20e5':
Log accept and close debug statements in BluetoothSocket.
2014-05-17 01:57:44 +00:00
Joe LaPenna
45734b4ae1
Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev
2014-05-17 01:55:06 +00:00
Griff Hazen
cfa271618f
am 50c11659: Fix Notification sdk docs build.
...
* commit '50c11659f0f971e1a6b0adde59247f5de370b74d':
Fix Notification sdk docs build.
2014-05-16 16:56:47 +00:00
Griff Hazen
50c11659f0
Fix Notification sdk docs build.
...
Builder#X looked like it was considered ambiguous even though Action
was not in scope. Intellij disagreed but this fixes the issue.
Change-Id: I51fac39b2a4834e25f936c6eae223cda8c9c610e
2014-05-16 09:46:31 -07:00
John Reck
313c5f38e8
am f18aed83: am 0661ddee: Merge "Enable display list updates with zero delta time"
...
* commit 'f18aed83f63b41fc9e2fd4cecc1fdf2c08c302c0':
Enable display list updates with zero delta time
2014-05-16 16:00:09 +00:00
John Reck
f18aed83f6
am 0661ddee: Merge "Enable display list updates with zero delta time"
...
* commit '0661ddee112477db180d65e605f34fd538fdf8bc':
Enable display list updates with zero delta time
2014-05-16 15:56:07 +00:00
John Reck
0661ddee11
Merge "Enable display list updates with zero delta time"
2014-05-16 15:51:39 +00:00
Griff Hazen
de35b636df
am 959591e3: Add support for extendable actions to Notification.
...
* commit '959591e3ba3934f5bd8ecc2c81ad2a16d226acab':
Add support for extendable actions to Notification.
2014-05-16 15:40:18 +00:00
Ben Murdoch
0e04bcfbdc
Fallback to NullWebView when Chromium WebView not present.
...
If it's not possible to load the Chromium WebView, fallback to loading
the NullWebView that will throw UnsupportedOperationException.
Bug: 13438487
Change-Id: If44b8b7a569c2f8e0e8bba7e6953288802d1c9e0
2014-05-16 13:41:12 +01:00
Narayan Kamath
b4606676a8
am 49538def: am 79e0206e: Merge "Init the static member when first used for CursorWindow."
...
* commit '49538def98520eb57d4fb634bf09b2f3104e7953':
Init the static member when first used for CursorWindow.
2014-05-16 12:29:59 +00:00
Narayan Kamath
49538def98
am 79e0206e: Merge "Init the static member when first used for CursorWindow."
...
* commit '79e0206ef3203a1842949242e58fa8f3c25eb129':
Init the static member when first used for CursorWindow.
2014-05-16 12:26:34 +00:00
Narayan Kamath
79e0206ef3
Merge "Init the static member when first used for CursorWindow."
2014-05-16 12:24:33 +00:00
Griff Hazen
959591e3ba
Add support for extendable actions to Notification.
...
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
2014-05-15 22:26:18 -07:00
Narayan Kamath
35b884f88e
am be3dc575: am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
...
* commit 'be3dc5754fd081f54a86df9894763c0da915eed3':
Wait for secondary zygote before bringing up the system_server.
2014-05-15 13:41:12 +00:00
Narayan Kamath
be3dc5754f
am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
...
* commit '402120a2236b294dff9a51461cb22400a6ef67f6':
Wait for secondary zygote before bringing up the system_server.
2014-05-15 13:38:17 +00:00
Narayan Kamath
402120a223
Merge "Wait for secondary zygote before bringing up the system_server."
2014-05-15 13:34:09 +00:00
Narayan Kamath
5d5f19a339
am 6e2e6868: am 706b1d7e: Merge "Remove "required" prefix from ABI fields."
...
* commit '6e2e686889037711170ee145f9dfdb442cee85db':
Remove "required" prefix from ABI fields.
2014-05-15 12:45:27 +00:00
Narayan Kamath
6e2e686889
am 706b1d7e: Merge "Remove "required" prefix from ABI fields."
...
* commit '706b1d7ea0214b6858730e68c95c6a6d6d9a4c30':
Remove "required" prefix from ABI fields.
2014-05-15 12:41:47 +00:00
Narayan Kamath
706b1d7ea0
Merge "Remove "required" prefix from ABI fields."
2014-05-15 12:39:36 +00:00
Narayan Kamath
6e35a2ad05
Remove "required" prefix from ABI fields.
...
As per a comment on an earlier code review.
(cherry-picked from commit a9d64733421d6765eab5c2730fa912f068e26047)
Change-Id: I064cffc13c323b721f3a16c83e0e95ee348ef9f6
2014-05-15 10:57:05 +01:00
Tina Zhang
cf85d6ee0f
Enable display list updates with zero delta time
...
It's better not to cancel display lists updates. In the emulator, if we use
low precision clock source like refined-jiffies, the display list which
should be updated with a new frame, won't be updated due to the delta time
is 0 . And this makes all the hardware accelerated GUI out of order.
Change-Id: I41dba8965c96b6ad1b6d326ad1d6fa4a0a49173f
Signed-off-by: Tina Zhang <tina.zhang@intel.com >
2014-05-15 08:41:24 +08:00
Torne (Richard Coles)
41ecc8b1e0
am dcc9cf03: am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
...
* commit 'dcc9cf03a846cb01d91de70d7a115d95c0c4db19':
Avoid supported ABI list containing "unknown".
2014-05-14 15:35:19 +00:00
Torne (Richard Coles)
dcc9cf03a8
am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
...
* commit '41ec8c9672fccce90a7156bcd856f59a36e93ad3':
Avoid supported ABI list containing "unknown".
2014-05-14 15:31:28 +00:00
Torne (Richard Coles)
da8c037c8b
Avoid supported ABI list containing "unknown".
...
If one of the ABI list system properties is undefined/empty (as
ro.product.cpu.abilist64 is on a 32-bit only device), getString returns
"unknown", which ends up creating a 1-element array with "unknown" as a
member. Fix this to instead just get the empty string and split that
into a 0-element array.
Change-Id: I0d0a54eb06bb04427bcf0487e2a16d4180b81116
2014-05-14 16:17:26 +01:00
Joe LaPenna
f3de98a2d0
Log accept and close debug statements in BluetoothSocket.
...
Bug: 14902781
Bug: 14784262
Change-Id: Id0c2cd216244e05c218568427bda863a538b1041
2014-05-13 18:53:11 -07:00
Justin Koh
32c5f2998f
am 78b94de4: Set KITKAT_WATCH to be level 20, document API specific changes.
...
* commit '78b94de4b527c26bb3c038ae4f8cc351b3b4881f':
Set KITKAT_WATCH to be level 20, document API specific changes.
2014-05-13 23:24:33 +00:00
Justin Koh
78b94de4b5
Set KITKAT_WATCH to be level 20, document API specific changes.
...
Bug: 14116162
Change-Id: Iab094dbd0add414a365234c275bd473787b8803b
2014-05-13 16:03:18 -07:00
Justin Koh
72a4c15c49
am 5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev
...
* commit '5e6b8d37cfdf6849890c730045f01ca5a0b4b8e8':
Hide new methods in notificationlistenerservice DO NOT MERGE
2014-05-13 22:45:50 +00:00
Justin Koh
e98122ed5d
Hide new methods in notificationlistenerservice DO NOT MERGE
...
Hide new methods in notificationlistenerservice for now.
Bug: 14116162
Change-Id: Ib57fd2feff174ab8638bd172710873e9e2be553a
2014-05-13 15:10:16 -07:00
Aaron Whyte
8452776b95
am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
...
* commit '5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b':
Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 20:36:31 +00:00
Narayan Kamath
64cd907af9
Wait for secondary zygote before bringing up the system_server.
...
The zygote that's responsible for starting up the system server
now checks if there's another zygote on the system, and waits
for it to start up. Also, a few minor clean ups :
- Address a long standing TODO about zygote retries.
- Have functions throw IOException where appropriate and
wrap them in ZygoteStartFailedEx with a filled in cause.
bug: 14869939
Change-Id: I9e514659b79b3d2c98a4c5f93c0c376843f6c881
2014-05-13 15:24:26 +01:00
Aaron Whyte
1fb617fecd
Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.
...
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859
Change-Id: I342eea5afafd56bed9b4138b97c2e906a10d300d
2014-05-12 22:08:53 -07:00
Aaron Whyte
d67fd6428a
am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev
...
* commit '6af2ef8e25844b740e84dc410ca713361bd6dbcc':
Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
2014-05-13 02:27:00 +00:00
Aaron Whyte
6af2ef8e25
Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev
2014-05-13 02:24:13 +00:00
Aaron Whyte
d5f010e4e7
Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
...
This reverts commit 3f3e3e87e2 .
Change-Id: I799d9a2b0eeb708f57127be60780c7a005b792b5
2014-05-13 02:19:10 +00:00
Aaron Whyte
064789efc1
am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
...
* commit '24f3d0915e55d490b7537b20aeadbfa2e6a780a9':
Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 01:49:16 +00:00
Aaron Whyte
24f3d0915e
Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
2014-05-13 01:44:18 +00:00
Aaron Whyte
3f3e3e87e2
Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.
...
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859
Change-Id: I0a8641894b41058f53a5bf241763a9a0605244d1
2014-05-12 17:20:02 -07:00
Tim Kilbourn
82c93357d0
am 05c581ac: Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev
...
* commit '05c581ac4d6f44263891eae94a41a3841634d89c':
DO NOT MERGE Hide more leanback stuff.
2014-05-12 18:43:41 +00:00
Tim Kilbourn
0ff8f796d9
am d6fc5115: Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev
...
* commit 'd6fc5115a656f9d06dd1d455f8bedd5f5eca943b':
DO NOT MERGE Hide leanback packagemanager apis.
2014-05-12 18:43:37 +00:00
Tim Kilbourn
05c581ac4d
Merge "DO NOT MERGE Hide more leanback stuff." into klp-modular-dev
2014-05-12 18:41:11 +00:00
Tim Kilbourn
d6fc5115a6
Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev
2014-05-12 18:39:45 +00:00
Vinod Krishnan
88aa8aab3d
am c4ebd014: Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev
...
* commit 'c4ebd014cec31a2d5a18c2339681ca71bd1f5d0e':
Adding a margin for the AlertDialog to work on circular UI.
2014-05-09 18:09:53 +00:00
Vinod Krishnan
c4ebd014ce
Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev
2014-05-09 18:05:10 +00:00
Vinod Krishnan
119ba2c72d
Adding a margin for the AlertDialog to work on circular UI.
...
- also removing the background completely for sdk >= 20
Change-Id: I239c8d066bb7ed0d1ab852a4d162475948b8a0d5
2014-05-09 11:03:20 -07:00
Mikhail Naganov
a08771edfa
am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass
...
* commit 'fa75ff626ca48db1007105fa5fd72d83c81c56e2':
Add EventLog event for logging of attempts to call java.lang.Object.getClass
2014-05-09 16:19:12 +00:00
Mikhail Naganov
fa75ff626c
am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass
...
* commit 'b76bc8e06e456715a36edd92cb4ea5437d5306e4':
Add EventLog event for logging of attempts to call java.lang.Object.getClass
2014-05-09 16:14:16 +00:00
Mikhail Naganov
b76bc8e06e
am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass
...
* commit '6940b664093c7e66708b125957a2879e027e8cfa':
Add EventLog event for logging of attempts to call java.lang.Object.getClass
2014-05-09 16:08:58 +00:00
Eino-Ville Talvala
8bfb3513ee
am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature.
...
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
DO NOT MERGE: Add android.hardware.camera.external feature.
2014-05-09 15:47:58 +00:00
Eino-Ville Talvala
1caeb10a7a
DO NOT MERGE: Add android.hardware.camera.external feature.
...
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.
Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.
Change-Id: I57497758877e4286c1f0116961731d483b56808f
2014-05-08 21:47:36 +00:00