OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 289733ec: am b0128eb0: am bb0e5391: Merge "Print exception stacktrace on failed...
Dmitriy Ivanov [Tue, 2 Jun 2015 20:32:53 +0000 (20:32 +0000)]
am 289733ec: am b0128eb0: am bb0e5391: Merge "Print exception stacktrace on failed scanPackageLI" into mnc-dev

* commit '289733ec1bb2a68df797cf9ac93fcc55ee87172b':
  Print exception stacktrace on failed scanPackageLI

9 years agoam 4db77feb: am 96195285: am 6f54da32: Merge "Expose a few system APIs for BLE scan...
Wei Wang [Tue, 2 Jun 2015 20:32:49 +0000 (20:32 +0000)]
am 4db77feb: am 96195285: am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev

* commit '4db77febac5ffba9c5581d149524c3e8d760b711':
  Expose a few system APIs for BLE scan only mode.

9 years agoam 0f7f72da: am a332605f: am 8fa8b95c: Merge "Respect accessibility importance for...
Svet Ganov [Tue, 2 Jun 2015 20:32:35 +0000 (20:32 +0000)]
am 0f7f72da: am a332605f: am 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering." into mnc-dev

* commit '0f7f72dae6fc6cdae5a668baff16d605fd140c7b':
  Respect accessibility importance for before/after node ordering.

9 years agoam e18cfd39: am 0693b7c4: am 54310008: Merge "Remove strict mode violation from value...
Alan Viverette [Tue, 2 Jun 2015 20:32:30 +0000 (20:32 +0000)]
am e18cfd39: am 0693b7c4: am 54310008: Merge "Remove strict mode violation from value to string coercion" into mnc-dev

* commit 'e18cfd3954ccc75b9c881528c5468d99c9f242f1':
  Remove strict mode violation from value to string coercion

9 years agoam 7fa99b25: am 882531da: am 233241f1: Fixed a crash with HUNs
Selim Cinek [Tue, 2 Jun 2015 20:32:13 +0000 (20:32 +0000)]
am 7fa99b25: am 882531da: am 233241f1: Fixed a crash with HUNs

* commit '7fa99b25253f038eb37e35d74bc8dc68da0fce30':
  Fixed a crash with HUNs

9 years agoam fa9c9388: am 7e00366b: am 60598075: Bluetooth PAN: Set isPreferred to true (1/2)
Andre Eisenbach [Tue, 2 Jun 2015 19:23:53 +0000 (19:23 +0000)]
am fa9c9388: am 7e00366b: am 60598075: Bluetooth PAN: Set isPreferred to true (1/2)

* commit 'fa9c938845bd783f81f982239ea51cb1450f9518':
  Bluetooth PAN: Set isPreferred to true (1/2)

9 years agoam 39e04519: am 305c1941: am 1f8b8448: Bluetooth: Fix to avoid framework reboot durin...
Nitin Shivpure [Tue, 2 Jun 2015 19:23:47 +0000 (19:23 +0000)]
am 39e04519: am 305c1941: am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing

* commit '39e04519ca1ecfa2c005394e50e2549979627b7c':
  Bluetooth: Fix to avoid framework reboot during monkey testing

9 years agoam d3681f7c: am 0e577232: am ac1f0a1a: Merge "Hide the software input based on its...
Seigo Nonaka [Tue, 2 Jun 2015 19:23:40 +0000 (19:23 +0000)]
am d3681f7c: am 0e577232: am ac1f0a1a: Merge "Hide the software input based on its state." into mnc-dev

* commit 'd3681f7c3ba8ca1f62deacad1d47ffb1552df4f5':
  Hide the software input based on its state.

9 years agoam 0205fafb: am 90546cd1: am 8f602cdd: Merge "Fix DHCP lease time parsing." into...
Lorenzo Colitti [Tue, 2 Jun 2015 19:23:30 +0000 (19:23 +0000)]
am 0205fafb: am 90546cd1: am 8f602cdd: Merge "Fix DHCP lease time parsing." into mnc-dev

* commit '0205fafb6b0d92a7bc806c2e6b553020c6aabb0f':
  Fix DHCP lease time parsing.

9 years agoam 5db96899: am 4e915dff: am 168bfef1: Merge "pass a defensive copy of DhcpResults...
Erik Kline [Tue, 2 Jun 2015 19:23:21 +0000 (19:23 +0000)]
am 5db96899: am 4e915dff: am 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev

* commit '5db968996c4b22d4952d171dd7ece76c4f0b4af1':
  pass a defensive copy of DhcpResults

9 years agoam caa7391f: (-s ours) am 2590a679: am 417820bb: am 65f6996a: (-s ours) am eb4bd19e...
Jeff Brown [Tue, 2 Jun 2015 19:23:12 +0000 (19:23 +0000)]
am caa7391f: (-s ours) am 2590a679: am 417820bb: am 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE

* commit 'caa7391f82dcb89334a53e91e6d640e6d60e15e2':
  Terminate loop properly when cursor window is full. DO NOT MERGE

9 years agoam 59a13c46: am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective...
Andre Eisenbach [Tue, 2 Jun 2015 19:23:05 +0000 (19:23 +0000)]
am 59a13c46: am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport

* commit '59a13c46ceef126a19476078e28205f456c9003f':
  Un-hide connectGatt() variant with selective transport

9 years agoam 8b2cf646: am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in...
Ruben Brunk [Tue, 2 Jun 2015 19:22:59 +0000 (19:22 +0000)]
am 8b2cf646: am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev

* commit '8b2cf64630074d89dbf336741cecf3a54d3ddd2d':
  Track camera and flashlight usage in battery stats.

9 years agoam 0d7e1e05: am 44499ecc: am 082138cd: am 348d0a68: am 7af35669: docs: Added Javadocs...
Quddus Chong [Tue, 2 Jun 2015 19:22:53 +0000 (19:22 +0000)]
am 0d7e1e05: am 44499ecc: am 082138cd: am 348d0a68: am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

* commit '0d7e1e05c736d497e94220d5c171fb423d2f090a':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

9 years agoam ffb1e45e: am ca15c039: am 405e895c: Merge "Fix issue related selecting of "Contact...
Sanket Padawe [Tue, 2 Jun 2015 19:22:45 +0000 (19:22 +0000)]
am ffb1e45e: am ca15c039: am 405e895c: Merge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev

* commit 'ffb1e45e810bdf46dc35331661cd64f846b748da':
  Fix issue related selecting of "Contact sharing" in BT Settings.

9 years agoam 9ebf7522: am 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finish...
Clara Bayarri [Tue, 2 Jun 2015 19:22:40 +0000 (19:22 +0000)]
am 9ebf7522: am 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev

* commit '9ebf7522895589d7bc9d6508c100ef8a26d42c9f':
  Fix TextView ActionMode overflow finishes the ActionMode

9 years agoam dc1630e4: am 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode seconda...
Clara Bayarri [Tue, 2 Jun 2015 19:22:34 +0000 (19:22 +0000)]
am dc1630e4: am 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev

* commit 'dc1630e45334b72a337e4dcb31fce453aa0fd3e1':
  Make Text Selection Action Mode secondary items IF_ROOM

9 years agoam 3fe0c565: am 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path...
Adam Powell [Tue, 2 Jun 2015 19:22:28 +0000 (19:22 +0000)]
am 3fe0c565: am 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev

* commit '3fe0c56559e305e0dabb899f171f5ef4996ddcae':
  Don't take the compatibility path for non-primary ActionModes

9 years agoam f53f3c24: am fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view...
Svetoslav [Tue, 2 Jun 2015 19:22:23 +0000 (19:22 +0000)]
am f53f3c24: am fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev

* commit 'f53f3c24324967e1eb055b0944a2f11acfcfe625':
  Don't add real children for a view with a node provider

9 years agoam b17e96de: am a60e4b08: am 03a7c4c6: Fix shared drawable state
Jorim Jaggi [Tue, 2 Jun 2015 19:22:15 +0000 (19:22 +0000)]
am b17e96de: am a60e4b08: am 03a7c4c6: Fix shared drawable state

* commit 'b17e96de98f16d9322ccca7457ee9c8197b416c9':
  Fix shared drawable state

9 years agoam 5d8e4aba: am bbf5b460: am acbe426b: Merge "Add accidentally deleted strings."...
Svetoslav [Tue, 2 Jun 2015 19:22:09 +0000 (19:22 +0000)]
am 5d8e4aba: am bbf5b460: am acbe426b: Merge "Add accidentally deleted strings." into mnc-dev

* commit '5d8e4abaf3775627cd8451254e56b0e439c291c2':
  Add accidentally deleted strings.

9 years agoam 5c40b533: am e94bc219: am 8a6d511d: Merge "Remove ViewAssistStructure and use...
Selim Gurun [Tue, 2 Jun 2015 19:22:02 +0000 (19:22 +0000)]
am 5c40b533: am e94bc219: am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev

* commit '5c40b53370f111fb82d9d82f6bfac8e2a16ffd6e':
  Remove ViewAssistStructure and use the frameworks data structure

9 years agoam 1a92fc59: am bbc27621: am b0f94ae5: Merge "Always send VIEW_CLICKED event from...
Alan Viverette [Tue, 2 Jun 2015 19:21:57 +0000 (19:21 +0000)]
am 1a92fc59: am bbc27621: am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev

* commit '1a92fc592b76519cf746b7d4f9ed2878163ebbbb':
  Always send VIEW_CLICKED event from AdapterView.performItemClick()

9 years agoam 742b4eb8: am 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev
Eino-Ville Talvala [Tue, 2 Jun 2015 19:21:47 +0000 (19:21 +0000)]
am 742b4eb8: am 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev

* commit '742b4eb890926c0d05ad04dc860bff95ce8e0bf3':
  Camera2: Remove isLoggable

9 years agoam fab99fd8: am 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor...
Jeff Brown [Tue, 2 Jun 2015 19:21:41 +0000 (19:21 +0000)]
am fab99fd8: am 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev

* commit 'fab99fd899cfd6fdd2ca44bbbb2a47b3aee4c0ad':
  Terminate loop properly when cursor window is full.

9 years agoam 97e5851a: am c474645a: am c45d6c30: Merge "Translucent bars in landscape" into...
Adrian Roos [Tue, 2 Jun 2015 19:21:34 +0000 (19:21 +0000)]
am 97e5851a: am c474645a: am c45d6c30: Merge "Translucent bars in landscape" into mnc-dev

* commit '97e5851aec4b753befe0e1f085b2e9b8f8089c97':
  Translucent bars in landscape

9 years agoam ed40a4f3: am ef0647b6: am 346222f9: Merge "LayoutLib: Skip classes from java packa...
Deepanshu Gupta [Tue, 2 Jun 2015 19:21:26 +0000 (19:21 +0000)]
am ed40a4f3: am ef0647b6: am 346222f9: Merge "LayoutLib: Skip classes from java package." into mnc-dev

* commit 'ed40a4f38dc56afb229ee6bdc3e9b453cf46f954':
  LayoutLib: Skip classes from java package.

9 years agoam 604fab3c: am d61ff1cf: am 7ef93d15: Merge "Skip warnings for some unresolved refer...
Deepanshu Gupta [Tue, 2 Jun 2015 19:21:18 +0000 (19:21 +0000)]
am 604fab3c: am d61ff1cf: am 7ef93d15: Merge "Skip warnings for some unresolved references." into mnc-dev

* commit '604fab3c4c0440f1a3fe1620202b33882b87112d':
  Skip warnings for some unresolved references.

9 years agoam f64d85b4: am e2c09c2f: am 133b107d: am 65b7485d: am 2b95561d: docs: Fixed typo...
Quddus Chong [Tue, 2 Jun 2015 19:21:10 +0000 (19:21 +0000)]
am f64d85b4: am e2c09c2f: am 133b107d: am 65b7485d: am 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273

* commit 'f64d85b4d271cda3454aa244eb43868f7f7ecb4f':

9 years agoam 49e76757: am c50bb5b4: am c85cd734: Merge "Don\'t focus view for invalid task...
Winson Chung [Tue, 2 Jun 2015 19:21:03 +0000 (19:21 +0000)]
am 49e76757: am c50bb5b4: am c85cd734: Merge "Don\'t focus view for invalid task index." into mnc-dev

* commit '49e7675745cac3b38d2bbce18d09347e23e8515f':
  Don't focus view for invalid task index.

9 years agoam a974b09c: am ecb6be7d: am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INIT...
Adam Powell [Tue, 2 Jun 2015 19:20:56 +0000 (19:20 +0000)]
am a974b09c: am ecb6be7d: am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev

* commit 'a974b09c67228d8bab3cfbe91f7e38bae0323c81':
  Fix one-action choosers with EXTRA_INITIAL_INTENTS

9 years agoam 00055784: am 6b725182: am 29780eec: Merge "Cleanup Video API javadoc." into mnc-dev
Tyler Gunn [Tue, 2 Jun 2015 19:20:51 +0000 (19:20 +0000)]
am 00055784: am 6b725182: am 29780eec: Merge "Cleanup Video API javadoc." into mnc-dev

* commit '0005578446f25632e2a01096f732a5b9d0aaf575':
  Cleanup Video API javadoc.

9 years agoam ddd1dafd: am 2f395f32: am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
Tyler Gunn [Tue, 2 Jun 2015 19:20:44 +0000 (19:20 +0000)]
am ddd1dafd: am 2f395f32: am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev

* commit 'ddd1dafd26ec61613003f766d515c700d9fb11f2':
  IMS: Conference fixes

9 years agoam 4f57deb9: am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from...
Dianne Hackborn [Tue, 2 Jun 2015 19:20:33 +0000 (19:20 +0000)]
am 4f57deb9: am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev

* commit '4f57deb99025c6d625ffb17eba92190670a26f67':
  Update VoiceInteractionService from API review.

9 years agoam cff4394d: am 27e104d5: am e1c68765: Merge "ActionBar menu text should look like...
Alan Viverette [Tue, 2 Jun 2015 19:20:27 +0000 (19:20 +0000)]
am cff4394d: am 27e104d5: am e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev

* commit 'cff4394db1ad467f058828cd013ca29065fab1f4':
  ActionBar menu text should look like Button

9 years agoam 7689a967: am dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to...
Raph Levien [Tue, 2 Jun 2015 19:20:21 +0000 (19:20 +0000)]
am 7689a967: am dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev

* commit '7689a967a76a8ddd827be9efd8b2b1b6c60f8648':
  Revert "Revert "Use getRunAdvance to position cursor""

9 years agoam 9a5b45c1: am 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into...
Alan Viverette [Tue, 2 Jun 2015 19:20:15 +0000 (19:20 +0000)]
am 9a5b45c1: am 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev

* commit '9a5b45c1e1e91f00fed6d84876a670f5278f934f':
  Clean up AbsListView constructor

9 years agoam e7a9ba99: am 8fe47569: am eb8a51f3: Merge "MediaPlayer: trigger onError instead...
Robert Shih [Tue, 2 Jun 2015 19:20:09 +0000 (19:20 +0000)]
am e7a9ba99: am 8fe47569: am eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev

* commit 'e7a9ba9934a6d6ef13ca2f072a41bf342d8c4ac0':
  MediaPlayer: trigger onError instead of exception on stale native notifications

9 years agoam b0128eb0: am bb0e5391: Merge "Print exception stacktrace on failed scanPackageLI...
Dmitriy Ivanov [Tue, 2 Jun 2015 17:49:04 +0000 (17:49 +0000)]
am b0128eb0: am bb0e5391: Merge "Print exception stacktrace on failed scanPackageLI" into mnc-dev

* commit 'b0128eb0d5a465399652015cd95743dcc37d2a97':
  Print exception stacktrace on failed scanPackageLI

9 years agoam 96195285: am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode...
Wei Wang [Tue, 2 Jun 2015 17:48:59 +0000 (17:48 +0000)]
am 96195285: am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev

* commit '9619528558e9d97eb518d29f7cf72b5fa3fe194c':
  Expose a few system APIs for BLE scan only mode.

9 years agoam bb0e5391: Merge "Print exception stacktrace on failed scanPackageLI" into mnc-dev
Dmitriy Ivanov [Tue, 2 Jun 2015 17:35:59 +0000 (17:35 +0000)]
am bb0e5391: Merge "Print exception stacktrace on failed scanPackageLI" into mnc-dev

* commit 'bb0e5391b82912a620b29a0f8b2af47649e7f9ce':
  Print exception stacktrace on failed scanPackageLI

9 years agoam 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev
Wei Wang [Tue, 2 Jun 2015 17:35:54 +0000 (17:35 +0000)]
am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev

* commit '6f54da32c9c5c766ba15a6e9cc4be0c27276fc68':
  Expose a few system APIs for BLE scan only mode.

9 years agoMerge "Print exception stacktrace on failed scanPackageLI" into mnc-dev
Dmitriy Ivanov [Tue, 2 Jun 2015 17:28:21 +0000 (17:28 +0000)]
Merge "Print exception stacktrace on failed scanPackageLI" into mnc-dev

9 years agoMerge "Expose a few system APIs for BLE scan only mode." into mnc-dev
Wei Wang [Tue, 2 Jun 2015 17:23:59 +0000 (17:23 +0000)]
Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev

9 years agoExpose a few system APIs for BLE scan only mode.
Wei Wang [Mon, 1 Jun 2015 19:14:28 +0000 (12:14 -0700)]
Expose a few system APIs for BLE scan only mode.

Bug: 21562349
Change-Id: Ifc58efcf01edac5b4f9e5266adb966e7bc492209

9 years agoam a332605f: am 8fa8b95c: Merge "Respect accessibility importance for before/after...
Svet Ganov [Tue, 2 Jun 2015 17:14:13 +0000 (17:14 +0000)]
am a332605f: am 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering." into mnc-dev

* commit 'a332605fb71fc7f99721bf23a22a6d93b2c4ccec':
  Respect accessibility importance for before/after node ordering.

9 years agoam 0693b7c4: am 54310008: Merge "Remove strict mode violation from value to string...
Alan Viverette [Tue, 2 Jun 2015 17:14:08 +0000 (17:14 +0000)]
am 0693b7c4: am 54310008: Merge "Remove strict mode violation from value to string coercion" into mnc-dev

* commit '0693b7c4f6aa1e3a4aaa3e79b49c59654aa10adf':
  Remove strict mode violation from value to string coercion

9 years agoam 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering...
Svet Ganov [Tue, 2 Jun 2015 16:57:18 +0000 (16:57 +0000)]
am 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering." into mnc-dev

* commit '8fa8b95c9d38183497f08efc6bdf4d2c56a4116c':
  Respect accessibility importance for before/after node ordering.

9 years agoam 54310008: Merge "Remove strict mode violation from value to string coercion" into...
Alan Viverette [Tue, 2 Jun 2015 16:57:12 +0000 (16:57 +0000)]
am 54310008: Merge "Remove strict mode violation from value to string coercion" into mnc-dev

* commit '5431000830551959db15038da8f057c2e993d01a':
  Remove strict mode violation from value to string coercion

9 years agoMerge "Respect accessibility importance for before/after node ordering." into mnc-dev
Svet Ganov [Tue, 2 Jun 2015 16:49:46 +0000 (16:49 +0000)]
Merge "Respect accessibility importance for before/after node ordering." into mnc-dev

9 years agoMerge "Remove strict mode violation from value to string coercion" into mnc-dev
Alan Viverette [Tue, 2 Jun 2015 16:47:52 +0000 (16:47 +0000)]
Merge "Remove strict mode violation from value to string coercion" into mnc-dev

9 years agoRespect accessibility importance for before/after node ordering.
Svet Ganov [Tue, 2 Jun 2015 16:45:16 +0000 (09:45 -0700)]
Respect accessibility importance for before/after node ordering.

One can set a view to be visited before/after another one for
accessibility but the before/after target views were always added
to the node info for the view regardless if they are included
for accessiilbity. Now the target viwes are reported only if they
should be included for accessibility.

Change-Id: Iba64e6f0ee0dc090c8c3e6a0a940df8c7ecd49d9

9 years agoam 882531da: am 233241f1: Fixed a crash with HUNs
Selim Cinek [Tue, 2 Jun 2015 16:15:24 +0000 (16:15 +0000)]
am 882531da: am 233241f1: Fixed a crash with HUNs

* commit '882531da96dc363da492140e13b2f01d7524beef':
  Fixed a crash with HUNs

9 years agoam 7e00366b: am 60598075: Bluetooth PAN: Set isPreferred to true (1/2)
Andre Eisenbach [Tue, 2 Jun 2015 14:25:03 +0000 (14:25 +0000)]
am 7e00366b: am 60598075: Bluetooth PAN: Set isPreferred to true (1/2)

* commit '7e00366b8fc7656182ef238758f18da2e620837c':
  Bluetooth PAN: Set isPreferred to true (1/2)

9 years agoam 305c1941: am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey...
Nitin Shivpure [Tue, 2 Jun 2015 14:24:58 +0000 (14:24 +0000)]
am 305c1941: am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing

* commit '305c19412544f7dc5ce38d1f7949f9fc9acf47bd':
  Bluetooth: Fix to avoid framework reboot during monkey testing

9 years agoam 0e577232: am ac1f0a1a: Merge "Hide the software input based on its state." into...
Seigo Nonaka [Tue, 2 Jun 2015 14:24:49 +0000 (14:24 +0000)]
am 0e577232: am ac1f0a1a: Merge "Hide the software input based on its state." into mnc-dev

* commit '0e5772324dce75867ed6d7def00a742eed7a0efe':
  Hide the software input based on its state.

9 years agoam 90546cd1: am 8f602cdd: Merge "Fix DHCP lease time parsing." into mnc-dev
Lorenzo Colitti [Tue, 2 Jun 2015 14:24:35 +0000 (14:24 +0000)]
am 90546cd1: am 8f602cdd: Merge "Fix DHCP lease time parsing." into mnc-dev

* commit '90546cd1a1cd2ae71421ef0c909df10cf078125a':
  Fix DHCP lease time parsing.

9 years agoam 4e915dff: am 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev
Erik Kline [Tue, 2 Jun 2015 14:24:29 +0000 (14:24 +0000)]
am 4e915dff: am 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev

* commit '4e915dff5b09f92546f1b9113aa6dcb66498eca9':
  pass a defensive copy of DhcpResults

9 years agoam 2590a679: am 417820bb: am 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly...
Jeff Brown [Tue, 2 Jun 2015 14:24:20 +0000 (14:24 +0000)]
am 2590a679: am 417820bb: am 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE

* commit '2590a679f60a874928ca2b6c25670ef600bed5cd':
  Terminate loop properly when cursor window is full. DO NOT MERGE

9 years agoam ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport
Andre Eisenbach [Tue, 2 Jun 2015 14:24:10 +0000 (14:24 +0000)]
am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport

* commit 'ac00438d00e42f49b1d278bbd0d632e7caeef137':
  Un-hide connectGatt() variant with selective transport

9 years agoam cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats...
Ruben Brunk [Tue, 2 Jun 2015 14:24:01 +0000 (14:24 +0000)]
am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev

* commit 'cf4a301fa94f71e46cccbceeb8e8e9910eeb714a':
  Track camera and flashlight usage in battery stats.

9 years agoam 44499ecc: am 082138cd: am 348d0a68: am 7af35669: docs: Added Javadocs for Testing...
Quddus Chong [Tue, 2 Jun 2015 14:23:53 +0000 (14:23 +0000)]
am 44499ecc: am 082138cd: am 348d0a68: am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

* commit '44499ecc056805f65deed38a6ecce0aa08a90200':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922

9 years agoam ca15c039: am 405e895c: Merge "Fix issue related selecting of "Contact sharing...
Sanket Padawe [Tue, 2 Jun 2015 14:23:48 +0000 (14:23 +0000)]
am ca15c039: am 405e895c: Merge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev

* commit 'ca15c039d064edceb1b9194f30533fc9e679040e':
  Fix issue related selecting of "Contact sharing" in BT Settings.

9 years agoam 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the Action...
Clara Bayarri [Tue, 2 Jun 2015 14:23:44 +0000 (14:23 +0000)]
am 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev

* commit '8ed46d3f0a3a30414b178b41ea7160bac46ea3d7':
  Fix TextView ActionMode overflow finishes the ActionMode

9 years agoam 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode secondary items...
Clara Bayarri [Tue, 2 Jun 2015 14:23:39 +0000 (14:23 +0000)]
am 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev

* commit '4ebfd76a8975cd90edea06343d6a6aba586712b5':
  Make Text Selection Action Mode secondary items IF_ROOM

9 years agoam 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary...
Adam Powell [Tue, 2 Jun 2015 14:23:32 +0000 (14:23 +0000)]
am 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev

* commit '3e03326719f7e4481c3204e834bc1c8fbdfd3466':
  Don't take the compatibility path for non-primary ActionModes

9 years agoam fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view with a node...
Svetoslav [Tue, 2 Jun 2015 14:23:14 +0000 (14:23 +0000)]
am fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev

* commit 'fcec13f095186f95bd8483d7ea226944e8913cb4':
  Don't add real children for a view with a node provider

9 years agoam a60e4b08: am 03a7c4c6: Fix shared drawable state
Jorim Jaggi [Tue, 2 Jun 2015 14:23:03 +0000 (14:23 +0000)]
am a60e4b08: am 03a7c4c6: Fix shared drawable state

* commit 'a60e4b08a0e7d536c930f5455f568d75b558e396':
  Fix shared drawable state

9 years agoam bbf5b460: am acbe426b: Merge "Add accidentally deleted strings." into mnc-dev
Svetoslav [Tue, 2 Jun 2015 14:22:52 +0000 (14:22 +0000)]
am bbf5b460: am acbe426b: Merge "Add accidentally deleted strings." into mnc-dev

* commit 'bbf5b4600bdbcf48656a6fb30b4d9518e722b733':
  Add accidentally deleted strings.

9 years agoam e94bc219: am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks...
Selim Gurun [Tue, 2 Jun 2015 14:22:47 +0000 (14:22 +0000)]
am e94bc219: am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev

* commit 'e94bc219668b99c010f86bf4742b0b3d477e9d0b':
  Remove ViewAssistStructure and use the frameworks data structure

9 years agoam bbc27621: am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView...
Alan Viverette [Tue, 2 Jun 2015 14:22:40 +0000 (14:22 +0000)]
am bbc27621: am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev

* commit 'bbc27621b5cb9eee66b254c08a22fd8b148b7b39':
  Always send VIEW_CLICKED event from AdapterView.performItemClick()

9 years agoam 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev
Eino-Ville Talvala [Tue, 2 Jun 2015 14:22:35 +0000 (14:22 +0000)]
am 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev

* commit '5665014117a322bdec630adc38cb296195e9086b':
  Camera2: Remove isLoggable

9 years agoam 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor window is full...
Jeff Brown [Tue, 2 Jun 2015 14:22:27 +0000 (14:22 +0000)]
am 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev

* commit '17fa101c3744dc0834b86f0841cf29bbfd1f6f29':
  Terminate loop properly when cursor window is full.

9 years agoam c474645a: am c45d6c30: Merge "Translucent bars in landscape" into mnc-dev
Adrian Roos [Tue, 2 Jun 2015 14:22:20 +0000 (14:22 +0000)]
am c474645a: am c45d6c30: Merge "Translucent bars in landscape" into mnc-dev

* commit 'c474645ab8555ce1226f5f72a8a9fafe18965bbf':
  Translucent bars in landscape

9 years agoam ef0647b6: am 346222f9: Merge "LayoutLib: Skip classes from java package." into...
Deepanshu Gupta [Tue, 2 Jun 2015 14:22:13 +0000 (14:22 +0000)]
am ef0647b6: am 346222f9: Merge "LayoutLib: Skip classes from java package." into mnc-dev

* commit 'ef0647b625c82b64e0ee4e1ea197697cd793c7cf':
  LayoutLib: Skip classes from java package.

9 years agoam d61ff1cf: am 7ef93d15: Merge "Skip warnings for some unresolved references." into...
Deepanshu Gupta [Tue, 2 Jun 2015 14:22:08 +0000 (14:22 +0000)]
am d61ff1cf: am 7ef93d15: Merge "Skip warnings for some unresolved references." into mnc-dev

* commit 'd61ff1cf099c16cf38d095e6e401d92f9205b78f':
  Skip warnings for some unresolved references.

9 years agoam e2c09c2f: am 133b107d: am 65b7485d: am 2b95561d: docs: Fixed typo for confirm...
Quddus Chong [Tue, 2 Jun 2015 14:22:03 +0000 (14:22 +0000)]
am e2c09c2f: am 133b107d: am 65b7485d: am 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273

* commit 'e2c09c2f975c187af3270bc36f2b92019339f74a':
  docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273

9 years agoam c50bb5b4: am c85cd734: Merge "Don\'t focus view for invalid task index." into...
Winson Chung [Tue, 2 Jun 2015 14:21:57 +0000 (14:21 +0000)]
am c50bb5b4: am c85cd734: Merge "Don\'t focus view for invalid task index." into mnc-dev

* commit 'c50bb5b46255b0e1d7426401ef6c4f4381e8159e':
  Don't focus view for invalid task index.

9 years agoam ecb6be7d: am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS...
Adam Powell [Tue, 2 Jun 2015 14:21:46 +0000 (14:21 +0000)]
am ecb6be7d: am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev

* commit 'ecb6be7d2889c2bb09179239817578fbb465bc99':
  Fix one-action choosers with EXTRA_INITIAL_INTENTS

9 years agoam 6b725182: am 29780eec: Merge "Cleanup Video API javadoc." into mnc-dev
Tyler Gunn [Tue, 2 Jun 2015 14:21:40 +0000 (14:21 +0000)]
am 6b725182: am 29780eec: Merge "Cleanup Video API javadoc." into mnc-dev

* commit '6b725182f58af150922a10a880c06f26c223acb9':
  Cleanup Video API javadoc.

9 years agoam 2f395f32: am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
Tyler Gunn [Tue, 2 Jun 2015 14:21:33 +0000 (14:21 +0000)]
am 2f395f32: am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev

* commit '2f395f3233092032be55e4148edc7b8cb3d0697b':
  IMS: Conference fixes

9 years agoam 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review....
Dianne Hackborn [Tue, 2 Jun 2015 14:21:28 +0000 (14:21 +0000)]
am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev

* commit '0d69c19dcdc3df11c28d3981b086c40e94d860be':
  Update VoiceInteractionService from API review.

9 years agoam 27e104d5: am e1c68765: Merge "ActionBar menu text should look like Button" into...
Alan Viverette [Tue, 2 Jun 2015 14:21:13 +0000 (14:21 +0000)]
am 27e104d5: am e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev

* commit '27e104d56fc115c940429998c10d4bc7519f2f2d':
  ActionBar menu text should look like Button

9 years agoam dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor...
Raph Levien [Tue, 2 Jun 2015 14:21:07 +0000 (14:21 +0000)]
am dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev

* commit 'dcab9a13f7220d4e29ecc18526ee17ccbd3b1b9f':
  Revert "Revert "Use getRunAdvance to position cursor""

9 years agoam 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
Alan Viverette [Tue, 2 Jun 2015 14:21:01 +0000 (14:21 +0000)]
am 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev

* commit '49ceab843872ea562d8deefc54ff86bf6dc3ba5f':
  Clean up AbsListView constructor

9 years agoam 8fe47569: am eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception...
Robert Shih [Tue, 2 Jun 2015 14:20:55 +0000 (14:20 +0000)]
am 8fe47569: am eb8a51f3: Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev

* commit '8fe47569912ffa5b98d9b092e63b7b1f0cd5f69b':
  MediaPlayer: trigger onError instead of exception on stale native notifications

9 years agoMerge "Fix text on move notifications and toasts."
Ben Kwa [Tue, 2 Jun 2015 14:20:35 +0000 (14:20 +0000)]
Merge "Fix text on move notifications and toasts."

9 years agoam 233241f1: Fixed a crash with HUNs
Selim Cinek [Tue, 2 Jun 2015 13:17:10 +0000 (13:17 +0000)]
am 233241f1: Fixed a crash with HUNs

* commit '233241f13d5d7f841d3db80408429d4d0a528c78':
  Fixed a crash with HUNs

9 years agoFixed a crash with HUNs
Selim Cinek [Mon, 1 Jun 2015 13:11:19 +0000 (06:11 -0700)]
Fixed a crash with HUNs

Bug: 21500600
Change-Id: Idf0a7be5d58bb5c666b930a0beada1e0ed2869aa

9 years agoam 60598075: Bluetooth PAN: Set isPreferred to true (1/2)
Andre Eisenbach [Tue, 2 Jun 2015 09:44:49 +0000 (09:44 +0000)]
am 60598075: Bluetooth PAN: Set isPreferred to true (1/2)

* commit '60598075a0d54dcb4287d77c91b946e6c407a669':
  Bluetooth PAN: Set isPreferred to true (1/2)

9 years agoam 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing
Nitin Shivpure [Tue, 2 Jun 2015 09:44:45 +0000 (09:44 +0000)]
am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing

* commit '1f8b844870eb9acb334b541b0b41de37e000d2f0':
  Bluetooth: Fix to avoid framework reboot during monkey testing

9 years agoBluetooth PAN: Set isPreferred to true (1/2)
Andre Eisenbach [Tue, 2 Jun 2015 08:38:03 +0000 (01:38 -0700)]
Bluetooth PAN: Set isPreferred to true (1/2)

isPreferred must always be true for PAN so that the DUT can initiate
a PANU connection with the remote device not only from the internet
access menu in the profile setting, but also from the paired device
list menu.

Currently isPreferred is only true when PAN is in connected state
for the PANU role, so it will return false when the PAN profile is
not connected and the PANU connection will never be initiated
from the paired device list menu.

Change-Id: I120e681a113f56b74b45e01870adf96cdc2ca262

9 years agoBluetooth: Fix to avoid framework reboot during monkey testing
Nitin Shivpure [Thu, 12 Dec 2013 14:33:49 +0000 (20:03 +0530)]
Bluetooth: Fix to avoid framework reboot during monkey testing

When running monkeyrunner, sometimes the framework is disconnected due
to an unhandled Java exception while binding the PAN service (when it
is unsuccessful). Handing the Java exception while binding PAN service
solves this issue.

Change-Id: Idea710593a3f9496305f636042605303e73e7749

9 years agoam ac1f0a1a: Merge "Hide the software input based on its state." into mnc-dev
Seigo Nonaka [Tue, 2 Jun 2015 08:07:53 +0000 (08:07 +0000)]
am ac1f0a1a: Merge "Hide the software input based on its state." into mnc-dev

* commit 'ac1f0a1a9169f8bbbddba68b0410d5530512da63':
  Hide the software input based on its state.

9 years agoam 8f602cdd: Merge "Fix DHCP lease time parsing." into mnc-dev
Lorenzo Colitti [Tue, 2 Jun 2015 07:55:50 +0000 (07:55 +0000)]
am 8f602cdd: Merge "Fix DHCP lease time parsing." into mnc-dev

* commit '8f602cdd38f7345eb0a8ec34ae4e51a333edce6c':
  Fix DHCP lease time parsing.

9 years agoMerge "Hide the software input based on its state." into mnc-dev
Seigo Nonaka [Tue, 2 Jun 2015 07:55:48 +0000 (07:55 +0000)]
Merge "Hide the software input based on its state." into mnc-dev

9 years agoam 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev
Erik Kline [Tue, 2 Jun 2015 07:55:46 +0000 (07:55 +0000)]
am 168bfef1: Merge "pass a defensive copy of DhcpResults" into mnc-dev

* commit '168bfef182b8e631c93404f4e9e9c0176aa66ece':
  pass a defensive copy of DhcpResults

9 years agoMerge "Fix DHCP lease time parsing." into mnc-dev
Lorenzo Colitti [Tue, 2 Jun 2015 07:47:46 +0000 (07:47 +0000)]
Merge "Fix DHCP lease time parsing." into mnc-dev

9 years agoMerge "pass a defensive copy of DhcpResults" into mnc-dev
Erik Kline [Tue, 2 Jun 2015 07:42:53 +0000 (07:42 +0000)]
Merge "pass a defensive copy of DhcpResults" into mnc-dev

9 years agopass a defensive copy of DhcpResults
Erik Kline [Tue, 2 Jun 2015 06:51:45 +0000 (15:51 +0900)]
pass a defensive copy of DhcpResults

Also: correct state transition handling in DhcpBoundState#enter().

Bug: 20451261
Change-Id: I3be50f6b1b3fae179d6fff7ca8ae1d687caa3221