OSDN Git Service

android-x86/frameworks-base.git
9 years agoam a204ca3f: am f991256b: am a90c453d: Merge "Make CameraService proxy retry behavior...
Ruben Brunk [Tue, 2 Jun 2015 21:26:52 +0000 (21:26 +0000)]
am a204ca3f: am f991256b: am a90c453d: Merge "Make CameraService proxy retry behavior more lenient." into mnc-dev

* commit 'a204ca3f9486f12438291eb8c5a8a7adba9acd3f':
  Make CameraService proxy retry behavior more lenient.

9 years agoam 52859e73: am b75c0517: am 16dbf0c7: Merge "Enabled WMS.DEBUG_STARTING_WINDOW"...
Wale Ogunwale [Tue, 2 Jun 2015 21:26:46 +0000 (21:26 +0000)]
am 52859e73: am b75c0517: am 16dbf0c7: Merge "Enabled WMS.DEBUG_STARTING_WINDOW" into mnc-dev

* commit '52859e739cd50fb66915637a46c2f28b679f7266':
  Enabled WMS.DEBUG_STARTING_WINDOW

9 years agoam be86841c: am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL...
Wale Ogunwale [Tue, 2 Jun 2015 21:26:41 +0000 (21:26 +0000)]
am be86841c: am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev

* commit 'be86841c64ea0d1b67bd77c0a5687729bc521b27':
  @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.

9 years agoam e17c3dba: am 00aeba9f: am 1fad138f: Merge "Show Carrier Network Change icon SysUI...
Andrew Flynn [Tue, 2 Jun 2015 21:26:35 +0000 (21:26 +0000)]
am e17c3dba: am 00aeba9f: am 1fad138f: Merge "Show Carrier Network Change icon SysUI even while connected" into mnc-dev

* commit 'e17c3dbadc16cdfb7f88a0d222705fb281154d6a':
  Show Carrier Network Change icon SysUI even while connected

9 years agoam 24613fae: am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and...
Robin Lee [Tue, 2 Jun 2015 21:26:30 +0000 (21:26 +0000)]
am 24613fae: am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev

* commit '24613fae6b82456837ab8e5d495fdf88a336ce52':
  Revert "Consistent documentation and annotations for DPMS"

9 years agoam b9555129: am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotation...
Robin Lee [Tue, 2 Jun 2015 21:26:24 +0000 (21:26 +0000)]
am b9555129: am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev

* commit 'b95551290a61c1a1b2cbc494055cdcd0f681e060':
  Consistent documentation and annotations for DPMS

9 years agoam b9b9db72: am 0806a359: am 5b9b66c7: Merge "Should reset mDismissKeyguard on keygua...
Olawale Ogunwale [Tue, 2 Jun 2015 21:26:19 +0000 (21:26 +0000)]
am b9b9db72: am 0806a359: am 5b9b66c7: Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev

* commit 'b9b9db72f8966d69821ae223cdf2fb42762ea938':
  Should reset mDismissKeyguard on keyguard secure change

9 years agoam 54cd07a3: am 0eac76cd: am cdc7bf10: Merge "Fix null pointer dereference when secur...
Olawale Ogunwale [Tue, 2 Jun 2015 21:26:14 +0000 (21:26 +0000)]
am 54cd07a3: am 0eac76cd: am cdc7bf10: Merge "Fix null pointer dereference when security exception occurs" into mnc-dev

* commit '54cd07a35a79c8ad1e9af4541248d0ccef6b55d5':
  Fix null pointer dereference when security exception occurs

9 years agoam 13e1cad7: am 8accd856: am cbf400b1: Merge "WindowManagerService not propagating...
Olawale Ogunwale [Tue, 2 Jun 2015 21:26:09 +0000 (21:26 +0000)]
am 13e1cad7: am 8accd856: am cbf400b1: Merge "WindowManagerService not propagating X and Y steps" into mnc-dev

* commit '13e1cad7a9708f749627570054754f0c2c3f7018':
  WindowManagerService not propagating X and Y steps

9 years agoam f991256b: am a90c453d: Merge "Make CameraService proxy retry behavior more lenient...
Ruben Brunk [Tue, 2 Jun 2015 21:09:44 +0000 (21:09 +0000)]
am f991256b: am a90c453d: Merge "Make CameraService proxy retry behavior more lenient." into mnc-dev

* commit 'f991256bb9a66f14cd2faa176d9c77413dde564c':
  Make CameraService proxy retry behavior more lenient.

9 years agoam b75c0517: am 16dbf0c7: Merge "Enabled WMS.DEBUG_STARTING_WINDOW" into mnc-dev
Wale Ogunwale [Tue, 2 Jun 2015 21:09:37 +0000 (21:09 +0000)]
am b75c0517: am 16dbf0c7: Merge "Enabled WMS.DEBUG_STARTING_WINDOW" into mnc-dev

* commit 'b75c0517a279ad7911b18a445b8e366f24abcbad':
  Enabled WMS.DEBUG_STARTING_WINDOW

9 years agoam 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type...
Wale Ogunwale [Tue, 2 Jun 2015 21:09:30 +0000 (21:09 +0000)]
am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev

* commit '28e00af912154849c7e2bc592e16ee77155038e3':
  @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.

9 years agoam 00aeba9f: am 1fad138f: Merge "Show Carrier Network Change icon SysUI even while...
Andrew Flynn [Tue, 2 Jun 2015 21:09:20 +0000 (21:09 +0000)]
am 00aeba9f: am 1fad138f: Merge "Show Carrier Network Change icon SysUI even while connected" into mnc-dev

* commit '00aeba9f50b5cd5f857e2674daefcd3f9fd0fe83':
  Show Carrier Network Change icon SysUI even while connected

9 years agoam b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations...
Robin Lee [Tue, 2 Jun 2015 21:09:09 +0000 (21:09 +0000)]
am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev

* commit 'b35307343a72a24165e8adceec2fba8222ef86eb':
  Revert "Consistent documentation and annotations for DPMS"

9 years agoam 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS...
Robin Lee [Tue, 2 Jun 2015 21:09:03 +0000 (21:09 +0000)]
am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev

* commit '9b286dd637775d157b273cdb8dfec9e83af5c050':
  Consistent documentation and annotations for DPMS

9 years agoam 0806a359: am 5b9b66c7: Merge "Should reset mDismissKeyguard on keyguard secure...
Olawale Ogunwale [Tue, 2 Jun 2015 21:08:54 +0000 (21:08 +0000)]
am 0806a359: am 5b9b66c7: Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev

* commit '0806a3592864965600fe3a1e2e0e52df05d7ea78':
  Should reset mDismissKeyguard on keyguard secure change

9 years agoam 0eac76cd: am cdc7bf10: Merge "Fix null pointer dereference when security exception...
Olawale Ogunwale [Tue, 2 Jun 2015 21:08:49 +0000 (21:08 +0000)]
am 0eac76cd: am cdc7bf10: Merge "Fix null pointer dereference when security exception occurs" into mnc-dev

* commit '0eac76cd6f8552b38c7c5bbf30e5b99d4f8c0860':
  Fix null pointer dereference when security exception occurs

9 years agoam 8accd856: am cbf400b1: Merge "WindowManagerService not propagating X and Y steps...
Olawale Ogunwale [Tue, 2 Jun 2015 21:08:44 +0000 (21:08 +0000)]
am 8accd856: am cbf400b1: Merge "WindowManagerService not propagating X and Y steps" into mnc-dev

* commit '8accd8563ee737aafb99a41db56745bef1ab105e':
  WindowManagerService not propagating X and Y steps

9 years agoam e3f430e1: am 2ca50571: am 2ed6369c: Merge "System Health: Support expiring tokens...
Carlos Valdivia [Tue, 2 Jun 2015 20:32:58 +0000 (20:32 +0000)]
am e3f430e1: am 2ca50571: am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev

* commit 'e3f430e1dc56037699ae63585cbe3b5787aa9519':
  System Health: Support expiring tokens

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 a90c453d: Merge "Make CameraService proxy retry behavior more lenient." into mnc-dev
Ruben Brunk [Tue, 2 Jun 2015 19:10:45 +0000 (19:10 +0000)]
am a90c453d: Merge "Make CameraService proxy retry behavior more lenient." into mnc-dev

* commit 'a90c453d177d2437a64ae5a8a4b9097668f2c4ff':
  Make CameraService proxy retry behavior more lenient.

9 years agoam 16dbf0c7: Merge "Enabled WMS.DEBUG_STARTING_WINDOW" into mnc-dev
Wale Ogunwale [Tue, 2 Jun 2015 19:10:40 +0000 (19:10 +0000)]
am 16dbf0c7: Merge "Enabled WMS.DEBUG_STARTING_WINDOW" into mnc-dev

* commit '16dbf0c79c6e8428c34f5da8c637baf5809f1748':
  Enabled WMS.DEBUG_STARTING_WINDOW

9 years agoam c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev
Wale Ogunwale [Tue, 2 Jun 2015 19:10:35 +0000 (19:10 +0000)]
am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev

* commit 'c9a0452244420b910ca3294f043f34ccc6a6044c':
  @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.

9 years agoMerge "Make CameraService proxy retry behavior more lenient." into mnc-dev
Ruben Brunk [Tue, 2 Jun 2015 18:55:26 +0000 (18:55 +0000)]
Merge "Make CameraService proxy retry behavior more lenient." into mnc-dev

9 years agoMerge "Enabled WMS.DEBUG_STARTING_WINDOW" into mnc-dev
Wale Ogunwale [Tue, 2 Jun 2015 18:55:09 +0000 (18:55 +0000)]
Merge "Enabled WMS.DEBUG_STARTING_WINDOW" into mnc-dev

9 years agoMerge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev
Wale Ogunwale [Tue, 2 Jun 2015 18:54:54 +0000 (18:54 +0000)]
Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev

9 years agoam 1fad138f: Merge "Show Carrier Network Change icon SysUI even while connected"...
Andrew Flynn [Tue, 2 Jun 2015 18:44:55 +0000 (18:44 +0000)]
am 1fad138f: Merge "Show Carrier Network Change icon SysUI even while connected" into mnc-dev

* commit '1fad138f820e23de050f16f22b5ad757dc41eb10':
  Show Carrier Network Change icon SysUI even while connected

9 years agoEnabled WMS.DEBUG_STARTING_WINDOW
Wale Ogunwale [Tue, 2 Jun 2015 18:32:52 +0000 (11:32 -0700)]
Enabled WMS.DEBUG_STARTING_WINDOW

To debug starting window issue reported in comment #38
of b/21384482

Bug 21384482

Change-Id: I2fbafda5fa79448057cf27a65d1be9b96894770e

9 years agoam f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into...
Robin Lee [Tue, 2 Jun 2015 18:29:45 +0000 (18:29 +0000)]
am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev

* commit 'f4d9ecc503e7e849ff37a4674680c7213d819592':
  Revert "Consistent documentation and annotations for DPMS"

9 years agoam 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev
Robin Lee [Tue, 2 Jun 2015 18:29:41 +0000 (18:29 +0000)]
am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev

* commit '5de95550b7741bfd7d4da54ea562afb8bb328397':
  Consistent documentation and annotations for DPMS

9 years agoMerge "Show Carrier Network Change icon SysUI even while connected" into mnc-dev
Andrew Flynn [Tue, 2 Jun 2015 18:28:22 +0000 (18:28 +0000)]
Merge "Show Carrier Network Change icon SysUI even while connected" into mnc-dev

9 years agoMerge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev
Robin Lee [Tue, 2 Jun 2015 18:25:42 +0000 (18:25 +0000)]
Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev

9 years agoRevert "Consistent documentation and annotations for DPMS"
Robin Lee [Tue, 2 Jun 2015 18:25:28 +0000 (18:25 +0000)]
Revert "Consistent documentation and annotations for DPMS"

This reverts commit 695142a17a657d2c254ec4e1bfad9920f4c54832.

Change-Id: Iaa2abe7e8bcecc5177a395b0dab8f66cc7100d3d

9 years agoMerge "Consistent documentation and annotations for DPMS" into mnc-dev
Robin Lee [Tue, 2 Jun 2015 18:16:25 +0000 (18:16 +0000)]
Merge "Consistent documentation and annotations for DPMS" into mnc-dev

9 years agoConsistent documentation and annotations for DPMS
Robin Lee [Tue, 2 Jun 2015 16:56:29 +0000 (09:56 -0700)]
Consistent documentation and annotations for DPMS

Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.

Deleted or fixed some inconsistent or poorly-worded documentation.

Bug: 21422939
Change-Id: I8d86d0968c2af3595f268828ea1625f1ed256d50

9 years ago@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
Wale Ogunwale [Tue, 2 Jun 2015 18:07:07 +0000 (11:07 -0700)]
@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.

Bug: 21572285
Change-Id: Iff56a8ee5b91e02bd20afb7891bd94a0ec1abba9

9 years agoam 5b9b66c7: Merge "Should reset mDismissKeyguard on keyguard secure change" into...
Olawale Ogunwale [Tue, 2 Jun 2015 18:01:40 +0000 (18:01 +0000)]
am 5b9b66c7: Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev

* commit '5b9b66c73c80697c1d3694a2d4ee975e409bd89d':
  Should reset mDismissKeyguard on keyguard secure change

9 years agoam cdc7bf10: Merge "Fix null pointer dereference when security exception occurs"...
Olawale Ogunwale [Tue, 2 Jun 2015 18:01:35 +0000 (18:01 +0000)]
am cdc7bf10: Merge "Fix null pointer dereference when security exception occurs" into mnc-dev

* commit 'cdc7bf10dd19d1fa233d51ba46151310f4e0fd3f':
  Fix null pointer dereference when security exception occurs

9 years agoam cbf400b1: Merge "WindowManagerService not propagating X and Y steps" into mnc-dev
Olawale Ogunwale [Tue, 2 Jun 2015 18:01:31 +0000 (18:01 +0000)]
am cbf400b1: Merge "WindowManagerService not propagating X and Y steps" into mnc-dev

* commit 'cbf400b1642913d8640ae0ce59e910e12d7e4f5d':
  WindowManagerService not propagating X and Y steps

9 years agoMerge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev
Olawale Ogunwale [Tue, 2 Jun 2015 17:51:15 +0000 (17:51 +0000)]
Merge "Should reset mDismissKeyguard on keyguard secure change" into mnc-dev

9 years agoMerge "Fix null pointer dereference when security exception occurs" into mnc-dev
Olawale Ogunwale [Tue, 2 Jun 2015 17:51:00 +0000 (17:51 +0000)]
Merge "Fix null pointer dereference when security exception occurs" into mnc-dev

9 years agoMerge "WindowManagerService not propagating X and Y steps" into mnc-dev
Olawale Ogunwale [Tue, 2 Jun 2015 17:50:37 +0000 (17:50 +0000)]
Merge "WindowManagerService not propagating X and Y steps" into mnc-dev

9 years agoam 2ca50571: am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev
Carlos Valdivia [Tue, 2 Jun 2015 17:49:10 +0000 (17:49 +0000)]
am 2ca50571: am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev

* commit '2ca505718d6a607e49dbab8704dc354c72e371ce':
  System Health: Support expiring tokens

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 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev
Carlos Valdivia [Tue, 2 Jun 2015 17:36:03 +0000 (17:36 +0000)]
am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev

* commit '2ed6369c5d856aa2e1f9972d52f0f3c2526c713a':
  System Health: Support expiring tokens

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 agoMake CameraService proxy retry behavior more lenient.
Ruben Brunk [Tue, 2 Jun 2015 01:41:28 +0000 (18:41 -0700)]
Make CameraService proxy retry behavior more lenient.

Bug: 21527760
Change-Id: I70abea66f1d1fafffcfdd8e30b0cff244f814e59

9 years agoMerge "System Health: Support expiring tokens" into mnc-dev
Carlos Valdivia [Tue, 2 Jun 2015 17:31:27 +0000 (17:31 +0000)]
Merge "System Health: Support expiring tokens" into mnc-dev

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 agoSystem Health: Support expiring tokens
Carlos Valdivia [Fri, 22 May 2015 21:11:35 +0000 (14:11 -0700)]
System Health: Support expiring tokens

In the past android:customTokens=true authenticators were required to handle
their own token caching. This is detrimental for battery when high traffic
authenticators are constantly spinning up processes to start services to do
file io to check their own caches.  This change allows authenticator
implementers to optionally let the framework do some of the work for them by
providing the framework with a expiration time.

The AccountManagerService will make a best effort to re-use the cached
token if possible.

Bug: 21530782

Change-Id: I16a7edba36a220e3891e55cf61c725c2be863323

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 agoShow Carrier Network Change icon SysUI even while connected
Andrew Flynn [Fri, 29 May 2015 12:33:46 +0000 (08:33 -0400)]
Show Carrier Network Change icon SysUI even while connected

Taking connect/disconnect events into accounts results in frequent jank
while trying to show the icon.

Bug: 21504588
Change-Id: If271980cc46cfc20f80083de17a4b57c42439069

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