git.osdn.net Git - android-x86/frameworks-base.git/log

Jonathan Basseri [Tue, 2 Jun 2015 21:27:47 +0000 (21:27 +0000)]

am 6333eb78: am ca2e6a93: am ffa8f101: Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev

* commit '6333eb783cefbca1dad36ae545bf2c7ca8931c68':
Migrating MmsConfig to CarrierConfigManager.

commit | commitdiff | tree

Jason Monk [Tue, 2 Jun 2015 21:27:42 +0000 (21:27 +0000)]

am 20742cbf: am 27aaafbf: am d3c2089f: Merge "Add ability to get device by address" into mnc-dev

* commit '20742cbf1e8d39bbfb2522a6fdb5f05d4c05246a':
Add ability to get device by address

commit | commitdiff | tree

Amith Yamasani [Tue, 2 Jun 2015 21:27:36 +0000 (21:27 +0000)]

am 9984f181: am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev

* commit '9984f181c5d0ed933837e548a97729ae81b5e4dd':
Temporarily whitelist an app for network during doze

commit | commitdiff | tree

Winson Chung [Tue, 2 Jun 2015 21:27:30 +0000 (21:27 +0000)]

am 2f20faff: am acbdced1: am 42fde939: Merge "Use immutable ashmem bitmaps in screenshot notifications." into mnc-dev

* commit '2f20faff3aa259f4c6a5950ea8bbd7ca21cfaa19':
Use immutable ashmem bitmaps in screenshot notifications.

commit | commitdiff | tree

Adrian Roos [Tue, 2 Jun 2015 21:27:25 +0000 (21:27 +0000)]

am ca00a958: am 25d36c66: am 3546c61b: Remove obsolete symbols

* commit 'ca00a95863c1753e47675a0c7140df16297243d9':
Remove obsolete symbols

commit | commitdiff | tree

Robin Lee [Tue, 2 Jun 2015 21:27:19 +0000 (21:27 +0000)]

am 9aa90541: am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev

* commit '9aa905416931860cd92364aa2453c6a859785b2e':
Device policy: consistent javadoc and annotations

commit | commitdiff | tree

Adrian Roos [Tue, 2 Jun 2015 21:27:14 +0000 (21:27 +0000)]

am 71479c31: am 2a3443c4: am 1ea14d66: Merge "aapt: add option for stricter symbol generation" into mnc-dev

* commit '71479c31e7100797109470a2aacea1a28c936a32':
aapt: add option for stricter symbol generation

commit | commitdiff | tree

Tao Bao [Tue, 2 Jun 2015 21:27:08 +0000 (21:27 +0000)]

am e55f195a: am b8b93c1b: am da3f63ff: Merge "Fix the NPE when checking mRebootReason" into mnc-dev

* commit 'e55f195a98e7ba489d952034fced1b5aa703035b':
Fix the NPE when checking mRebootReason

commit | commitdiff | tree

Doris Liu [Tue, 2 Jun 2015 21:27:03 +0000 (21:27 +0000)]

am 34de1db1: am 9ba15d9f: am 7c3185e0: Merge "Fix calls to Rect.intersect(Rect) in package com.android.server.wm" into mnc-dev

* commit '34de1db18c5aac578f9cdd7c31465a86b960044e':
Fix calls to Rect.intersect(Rect) in package com.android.server.wm

commit | commitdiff | tree

Jason Monk [Tue, 2 Jun 2015 21:26:57 +0000 (21:26 +0000)]

am d714d6b3: am 74652ebf: am f3edbb55: Merge "Handle network info updates while scanning is paused" into mnc-dev

* commit 'd714d6b3abdb42e7c7af6a83798b736bbac9c0de':
Handle network info updates while scanning is paused

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jonathan Basseri [Tue, 2 Jun 2015 21:10:49 +0000 (21:10 +0000)]

am ca2e6a93: am ffa8f101: Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev

* commit 'ca2e6a93a3fb759eb7d1f59ca8bf9f04c79a9f5f':
Migrating MmsConfig to CarrierConfigManager.

commit | commitdiff | tree

Jason Monk [Tue, 2 Jun 2015 21:10:45 +0000 (21:10 +0000)]

am 27aaafbf: am d3c2089f: Merge "Add ability to get device by address" into mnc-dev

* commit '27aaafbf6e482fc62559d2eda4acac74a3a2d92e':
Add ability to get device by address

commit | commitdiff | tree

Amith Yamasani [Tue, 2 Jun 2015 21:10:40 +0000 (21:10 +0000)]

am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev

* commit '52f26b6399cd28bfaa5822cb4c3a5340404f7800':
Temporarily whitelist an app for network during doze

commit | commitdiff | tree

Winson Chung [Tue, 2 Jun 2015 21:10:33 +0000 (21:10 +0000)]

am acbdced1: am 42fde939: Merge "Use immutable ashmem bitmaps in screenshot notifications." into mnc-dev

* commit 'acbdced1497995f06eeef45d74fc31c53ee61cab':
Use immutable ashmem bitmaps in screenshot notifications.

commit | commitdiff | tree

Adrian Roos [Tue, 2 Jun 2015 21:10:23 +0000 (21:10 +0000)]

am 25d36c66: am 3546c61b: Remove obsolete symbols

* commit '25d36c66f4b319747feed7a2c98d989924403df1':
Remove obsolete symbols

commit | commitdiff | tree

Robin Lee [Tue, 2 Jun 2015 21:10:18 +0000 (21:10 +0000)]

am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev

* commit '805402de76dc983b2b785d77531f81ab6eea5f87':
Device policy: consistent javadoc and annotations

commit | commitdiff | tree

Adrian Roos [Tue, 2 Jun 2015 21:10:12 +0000 (21:10 +0000)]

am 2a3443c4: am 1ea14d66: Merge "aapt: add option for stricter symbol generation" into mnc-dev

* commit '2a3443c49b584deda8f340bb24fe45ff39cb7369':
aapt: add option for stricter symbol generation

commit | commitdiff | tree

Tao Bao [Tue, 2 Jun 2015 21:10:01 +0000 (21:10 +0000)]

am b8b93c1b: am da3f63ff: Merge "Fix the NPE when checking mRebootReason" into mnc-dev

* commit 'b8b93c1b79ab7233e054425bd917a014159e7f7d':
Fix the NPE when checking mRebootReason

commit | commitdiff | tree

Doris Liu [Tue, 2 Jun 2015 21:09:56 +0000 (21:09 +0000)]

am 9ba15d9f: am 7c3185e0: Merge "Fix calls to Rect.intersect(Rect) in package com.android.server.wm" into mnc-dev

* commit '9ba15d9f88d06307a2113d38d4f5a898eb70923c':
Fix calls to Rect.intersect(Rect) in package com.android.server.wm

commit | commitdiff | tree

Jason Monk [Tue, 2 Jun 2015 21:09:49 +0000 (21:09 +0000)]

am 74652ebf: am f3edbb55: Merge "Handle network info updates while scanning is paused" into mnc-dev

* commit '74652ebff190f9ad78ab7d560dd4271c025dd1e2':
Handle network info updates while scanning is paused

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jonathan Basseri [Tue, 2 Jun 2015 20:50:05 +0000 (20:50 +0000)]

am ffa8f101: Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev

* commit 'ffa8f101ccdaae5aff14f7368e8910920157c615':
Migrating MmsConfig to CarrierConfigManager.

commit | commitdiff | tree

Jason Monk [Tue, 2 Jun 2015 20:50:01 +0000 (20:50 +0000)]

am d3c2089f: Merge "Add ability to get device by address" into mnc-dev

* commit 'd3c2089f8812063a1964087233b694780d3769fe':
Add ability to get device by address

commit | commitdiff | tree

Amith Yamasani [Tue, 2 Jun 2015 20:49:57 +0000 (20:49 +0000)]

am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev

* commit 'ff3b76d04672d09214cd0ceb29ec548c8abb2330':
Temporarily whitelist an app for network during doze

commit | commitdiff | tree

Jonathan Basseri [Tue, 2 Jun 2015 20:43:08 +0000 (20:43 +0000)]

Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev

commit | commitdiff | tree

Jason Monk [Tue, 2 Jun 2015 20:41:21 +0000 (20:41 +0000)]

Merge "Add ability to get device by address" into mnc-dev

commit | commitdiff | tree

Amith Yamasani [Tue, 2 Jun 2015 20:34:58 +0000 (20:34 +0000)]

Merge "Temporarily whitelist an app for network during doze" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Winson Chung [Tue, 2 Jun 2015 20:28:23 +0000 (20:28 +0000)]

am 42fde939: Merge "Use immutable ashmem bitmaps in screenshot notifications." into mnc-dev

* commit '42fde939ea31e061a93a01b0d2f27032bfb2f3f6':
Use immutable ashmem bitmaps in screenshot notifications.

commit | commitdiff | tree

Winson Chung [Tue, 2 Jun 2015 20:20:06 +0000 (20:20 +0000)]

Merge "Use immutable ashmem bitmaps in screenshot notifications." into mnc-dev

commit | commitdiff | tree

Adrian Roos [Tue, 2 Jun 2015 20:08:43 +0000 (20:08 +0000)]

am 3546c61b: Remove obsolete symbols

* commit '3546c61b27eee218fc37581a3e0229b8646eb119':
Remove obsolete symbols

commit | commitdiff | tree

Robin Lee [Tue, 2 Jun 2015 20:02:07 +0000 (20:02 +0000)]

am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev

* commit '02a400ca6e5a185906b743c379716f9315e03bb2':
Device policy: consistent javadoc and annotations

commit | commitdiff | tree

Adrian Roos [Tue, 2 Jun 2015 20:02:03 +0000 (20:02 +0000)]

am 1ea14d66: Merge "aapt: add option for stricter symbol generation" into mnc-dev

* commit '1ea14d6696dafce9b7487eb850346a124a9c977c':
aapt: add option for stricter symbol generation

commit | commitdiff | tree

Adrian Roos [Tue, 2 Jun 2015 02:20:07 +0000 (19:20 -0700)]

Remove obsolete symbols

Change-Id: I8e95e82ef4f954376c57685df80184416d579fe5

commit | commitdiff | tree

Robin Lee [Tue, 2 Jun 2015 19:53:40 +0000 (19:53 +0000)]

Merge "Device policy: consistent javadoc and annotations" into mnc-dev

commit | commitdiff | tree

Adrian Roos [Tue, 2 Jun 2015 19:52:31 +0000 (19:52 +0000)]

Merge "aapt: add option for stricter symbol generation" into mnc-dev

commit | commitdiff | tree

Tao Bao [Tue, 2 Jun 2015 19:42:53 +0000 (19:42 +0000)]

am da3f63ff: Merge "Fix the NPE when checking mRebootReason" into mnc-dev

* commit 'da3f63ffb87397943546a7c5c893ce98f2489df2':
Fix the NPE when checking mRebootReason

commit | commitdiff | tree

Doris Liu [Tue, 2 Jun 2015 19:42:48 +0000 (19:42 +0000)]

am 7c3185e0: Merge "Fix calls to Rect.intersect(Rect) in package com.android.server.wm" into mnc-dev

* commit '7c3185e0b45c6fe6e61b9d9da85cc12f8d7f68df':
Fix calls to Rect.intersect(Rect) in package com.android.server.wm

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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()

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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':

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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""

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Winson Chung [Tue, 2 Jun 2015 19:18:05 +0000 (12:18 -0700)]

Use immutable ashmem bitmaps in screenshot notifications.

Bug 21037890
Change-Id: Ib5ed32bb475e1e8f7b3407ac72f53a6d640ffad1

commit | commitdiff | tree

Tao Bao [Tue, 2 Jun 2015 19:17:52 +0000 (19:17 +0000)]

Merge "Fix the NPE when checking mRebootReason" into mnc-dev

commit | commitdiff | tree

Doris Liu [Tue, 2 Jun 2015 19:13:34 +0000 (19:13 +0000)]

Merge "Fix calls to Rect.intersect(Rect) in package com.android.server.wm" into mnc-dev

commit | commitdiff | tree

Tao Bao [Tue, 2 Jun 2015 19:12:53 +0000 (12:12 -0700)]

Fix the NPE when checking mRebootReason

Bug: 21584198
Change-Id: Ie11092dbc771b54bd049d258dc705835a3eda494

commit | commitdiff | tree

Jason Monk [Tue, 2 Jun 2015 19:10:50 +0000 (19:10 +0000)]

am f3edbb55: Merge "Handle network info updates while scanning is paused" into mnc-dev

* commit 'f3edbb55ddf45ba2b37c18dea9e2e80594b81523':
Handle network info updates while scanning is paused

commit | commitdiff | tree

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.

commit | commitdiff | tree

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