Commit Graph

48790 Commits

Author SHA1 Message Date
Carlos Valdivia
de326e63fa am e3f430e1: am 2ca50571: am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev
* commit 'e3f430e1dc56037699ae63585cbe3b5787aa9519':
  System Health: Support expiring tokens
2015-06-02 20:32:58 +00:00
Wei Wang
7e1fa88e0e 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.
2015-06-02 20:32:49 +00:00
Svet Ganov
ad602c3c82 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.
2015-06-02 20:32:35 +00:00
Alan Viverette
88dba6c893 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
2015-06-02 20:32:30 +00:00
Nitin Shivpure
19e72a689d 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
2015-06-02 19:23:47 +00:00
Andre Eisenbach
cd5f41e863 am 59a13c46: am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport
* commit '59a13c46ceef126a19476078e28205f456c9003f':
  Un-hide connectGatt() variant with selective transport
2015-06-02 19:23:05 +00:00
Ruben Brunk
b179685bfe 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.
2015-06-02 19:22:59 +00:00
Clara Bayarri
be850e8362 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
2015-06-02 19:22:40 +00:00
Clara Bayarri
6ed5549cf1 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
2015-06-02 19:22:34 +00:00
Adam Powell
536b6a8147 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
2015-06-02 19:22:28 +00:00
Svetoslav
64f0090286 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
2015-06-02 19:22:23 +00:00
Jorim Jaggi
54e12e8cc0 am b17e96de: am a60e4b08: am 03a7c4c6: Fix shared drawable state
* commit 'b17e96de98f16d9322ccca7457ee9c8197b416c9':
  Fix shared drawable state
2015-06-02 19:22:15 +00:00
Selim Gurun
41a853fab7 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
2015-06-02 19:22:02 +00:00
Alan Viverette
d584b26ae6 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()
2015-06-02 19:21:57 +00:00
Eino-Ville Talvala
9785e0eb61 am 742b4eb8: am 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev
* commit '742b4eb890926c0d05ad04dc860bff95ce8e0bf3':
  Camera2: Remove isLoggable
2015-06-02 19:21:47 +00:00
Jeff Brown
10b57f5fcb 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.
2015-06-02 19:21:41 +00:00
Dianne Hackborn
6679bc0445 am 4f57deb9: am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev
* commit '4f57deb99025c6d625ffb17eba92190670a26f67':
  Update VoiceInteractionService from API review.
2015-06-02 19:20:33 +00:00
Raph Levien
c544053531 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""
2015-06-02 19:20:21 +00:00
Alan Viverette
8760d9df16 am 9a5b45c1: am 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
* commit '9a5b45c1e1e91f00fed6d84876a670f5278f934f':
  Clean up AbsListView constructor
2015-06-02 19:20:15 +00:00
Carlos Valdivia
e3f430e1dc am 2ca50571: am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev
* commit '2ca505718d6a607e49dbab8704dc354c72e371ce':
  System Health: Support expiring tokens
2015-06-02 17:49:10 +00:00
Wei Wang
4db77febac 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.
2015-06-02 17:48:59 +00:00
Carlos Valdivia
2ed6369c5d Merge "System Health: Support expiring tokens" into mnc-dev 2015-06-02 17:31:29 +00:00
Wei Wang
6f54da32c9 Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev 2015-06-02 17:24:00 +00:00
Wei Wang
f9e3e9e3dd Expose a few system APIs for BLE scan only mode.
Bug: 21562349
Change-Id: Ifc58efcf01edac5b4f9e5266adb966e7bc492209
2015-06-02 10:22:20 -07:00
Svet Ganov
0f7f72dae6 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.
2015-06-02 17:14:13 +00:00
Alan Viverette
e18cfd3954 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
2015-06-02 17:14:08 +00:00
Carlos Valdivia
91979be880 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
2015-06-02 09:58:18 -07:00
Svet Ganov
8fa8b95c9d Merge "Respect accessibility importance for before/after node ordering." into mnc-dev 2015-06-02 16:49:47 +00:00
Alan Viverette
5431000830 Merge "Remove strict mode violation from value to string coercion" into mnc-dev 2015-06-02 16:47:53 +00:00
Svet Ganov
2dca7ca9bf 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
2015-06-02 09:45:19 -07:00
Nitin Shivpure
39e04519ca am 305c1941: am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing
* commit '305c19412544f7dc5ce38d1f7949f9fc9acf47bd':
  Bluetooth: Fix to avoid framework reboot during monkey testing
2015-06-02 14:24:58 +00:00
Andre Eisenbach
59a13c46ce am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport
* commit 'ac00438d00e42f49b1d278bbd0d632e7caeef137':
  Un-hide connectGatt() variant with selective transport
2015-06-02 14:24:10 +00:00
Ruben Brunk
8b2cf64630 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.
2015-06-02 14:24:01 +00:00
Clara Bayarri
9ebf752289 am 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev
* commit '8ed46d3f0a3a30414b178b41ea7160bac46ea3d7':
  Fix TextView ActionMode overflow finishes the ActionMode
2015-06-02 14:23:44 +00:00
Clara Bayarri
dc1630e453 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
2015-06-02 14:23:39 +00:00
Adam Powell
3fe0c56559 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
2015-06-02 14:23:32 +00:00
Svetoslav
f53f3c2432 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
2015-06-02 14:23:14 +00:00
Jorim Jaggi
b17e96de98 am a60e4b08: am 03a7c4c6: Fix shared drawable state
* commit 'a60e4b08a0e7d536c930f5455f568d75b558e396':
  Fix shared drawable state
2015-06-02 14:23:03 +00:00
Selim Gurun
5c40b53370 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
2015-06-02 14:22:47 +00:00
Alan Viverette
1a92fc592b 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()
2015-06-02 14:22:40 +00:00
Eino-Ville Talvala
742b4eb890 am 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev
* commit '5665014117a322bdec630adc38cb296195e9086b':
  Camera2: Remove isLoggable
2015-06-02 14:22:35 +00:00
Jeff Brown
fab99fd899 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.
2015-06-02 14:22:27 +00:00
Dianne Hackborn
4f57deb990 am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev
* commit '0d69c19dcdc3df11c28d3981b086c40e94d860be':
  Update VoiceInteractionService from API review.
2015-06-02 14:21:28 +00:00
Raph Levien
7689a967a7 am dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
* commit 'dcab9a13f7220d4e29ecc18526ee17ccbd3b1b9f':
  Revert "Revert "Use getRunAdvance to position cursor""
2015-06-02 14:21:07 +00:00
Alan Viverette
9a5b45c1e1 am 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
* commit '49ceab843872ea562d8deefc54ff86bf6dc3ba5f':
  Clean up AbsListView constructor
2015-06-02 14:21:01 +00:00
Nitin Shivpure
1f8b844870 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
2015-06-02 01:23:11 -07:00
Andre Eisenbach
708f57f4dc Un-hide connectGatt() variant with selective transport
Change-Id: I1d3c512160de2bd68550faf243bb151d5cf7f3c9
2015-06-02 02:28:54 +00:00
Ruben Brunk
11df5b66ef Merge "Track camera and flashlight usage in battery stats." into mnc-dev 2015-06-02 01:48:27 +00:00
Clara Bayarri
a0b77dd5e2 Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev 2015-06-02 01:15:50 +00:00
Clara Bayarri
d63a177670 Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev 2015-06-02 01:15:03 +00:00