Kenny Guy
75377cd237
Merge "Cleanup API that is already @removed" into oc-dev am: 33b4964874
...
am: ddf5448ef9
Change-Id: I2e937e78c4506698c26bb9fdadf0d5ce3198b8ab
2017-05-12 07:48:24 +00:00
Kenny Guy
ddf5448ef9
Merge "Cleanup API that is already @removed" into oc-dev
...
am: 33b4964874
Change-Id: I933de065f75417e16541c86089e981b3a9fbd362
2017-05-12 03:51:39 +00:00
TreeHugger Robot
33b4964874
Merge "Cleanup API that is already @removed" into oc-dev
2017-05-12 00:13:56 +00:00
Kenny Guy
653c32432d
Cleanup API that is already @removed
...
EVICT_CE_KEY was @removed before API freeze
now removing it entirely.
Bug: 37663081
Test: compiles
Change-Id: I9ab318196cfe2da601be65b26a3b579f2f4bad82
2017-05-11 12:44:23 +01:00
Andre Eisenbach
617b0ef8ac
Merge "Bluetooth: Fix interval low/min values" am: 66deee2bd4 am: 0771cb13a2 am: 1655862b93
...
am: 4246cc309d
Change-Id: I55e757aed4cf9c8a2c9b6414804774af51188d65
2017-05-10 01:59:55 +00:00
Jakub Pawlowski
fec6ef8e90
Bluetooth: Fix interval low/min values
...
Bug: 38175945
Test: none
Change-Id: Idf487c7aafc518f2c57be78a1fa979b2c4a383d6
(cherry picked from commit 6b1f39502c )
2017-05-10 01:30:31 +00:00
Andre Eisenbach
4246cc309d
Merge "Bluetooth: Fix interval low/min values" am: 66deee2bd4 am: 0771cb13a2
...
am: 1655862b93
Change-Id: I32d56c5d0fca7947ac754eda100b36f2ee94ffe7
2017-05-10 00:15:32 +00:00
Jakub Pawlowski
6b1f39502c
Bluetooth: Fix interval low/min values
...
Bug: 38175945
Test: none
Change-Id: Idf487c7aafc518f2c57be78a1fa979b2c4a383d6
2017-05-09 22:59:18 +00:00
Siarhei Vishniakou
6a9ad74c29
Merge "Adding feature: input device disable/enable."
2017-05-04 18:51:27 +00:00
Ian Pedowitz
e2c45a5e20
Merge "Revert "O is API 26"" into oc-dev am: b42b9a22df
...
am: c96a358318
Change-Id: If16a559a068f93f79c7c398323fe3f1bafe1aaf9
2017-05-04 00:23:27 +00:00
Ian Pedowitz
c96a358318
Merge "Revert "O is API 26"" into oc-dev
...
am: b42b9a22df
Change-Id: Ic869f9f6f627c960222cb5364e04e6f4491c0a88
2017-05-04 00:18:19 +00:00
Ian Pedowitz
b42b9a22df
Merge "Revert "O is API 26"" into oc-dev
2017-05-04 00:07:10 +00:00
Ian Pedowitz
12025857cd
Revert "O is API 26"
...
This reverts commit 9bcef8e2da .
Reason for revert: b/37355569
Bug: 37480230
Bug: 37355569
Change-Id: I39b4a7fd9bda77df0746c7bc32b87f0c2b722f2b
2017-05-03 22:00:56 +00:00
Winson Chung
4678eca685
Merge "Restoring old methods for compatibility." into oc-dev am: d6c190c8d2
...
am: 3d66fb6519
Change-Id: I1066d1efed081776286ef8ded7933998a89e1dd8
2017-05-02 23:34:46 +00:00
Winson Chung
3d66fb6519
Merge "Restoring old methods for compatibility." into oc-dev
...
am: d6c190c8d2
Change-Id: I306a8520873eb76182f3b04617265f5bf662aaf8
2017-05-02 23:27:48 +00:00
Winson Chung
d6c190c8d2
Merge "Restoring old methods for compatibility." into oc-dev
2017-05-02 23:19:29 +00:00
Michael Wright
c48451933d
Merge "O is API 26" into oc-dev am: 074a67c116
...
am: 8433705f77
Change-Id: I8e394ffd699c115b316f3b6d2430ae75325d4047
2017-05-02 22:26:41 +00:00
Winson Chung
ca754789c1
Restoring old methods for compatibility.
...
Bug: 37637423
Test: Build and test PIP apps
Change-Id: I9ccb49a3e42de55a249ab54bde2f3c5a1c179c1c
2017-05-02 15:18:23 -07:00
Michael Wright
8433705f77
Merge "O is API 26" into oc-dev
...
am: 074a67c116
Change-Id: Ie1d9b8ebb3b1c1693bbce5bf7f7d1f8c7159e54e
2017-05-02 22:17:25 +00:00
Michael Wright
9bcef8e2da
O is API 26
...
Bug: 37480230
Test: build, boot
Change-Id: Idfa91e1e094606f92c4141beb8569c241c639ee1
2017-05-02 19:23:12 +01:00
Narayan Kamath
194f8471fd
Merge "Track libcore change 03e8c7dca78a95ccf719a7."
2017-05-02 10:06:49 +00:00
Casey Burkhardt
7a0de65bee
Merge "Refactor accessibility button support detection" into oc-dev
...
am: 337e2aae53
Change-Id: I4f96a5ae3e847b2439d017b34038a4b7b07965fa
2017-05-02 04:11:01 +00:00
Casey Burkhardt
337e2aae53
Merge "Refactor accessibility button support detection" into oc-dev
2017-05-02 04:05:30 +00:00
Casey Burkhardt
496cd387f6
Merge "Manually merge CL 2175149 to master for green build"
2017-05-02 02:00:19 +00:00
Peter Qiu
294b0cc850
Merge "hotspot2: hide Release 2 APIs" into oc-dev am: 39da850a95
...
am: 10da2c2d84
Change-Id: I0cad5713f1c272770edd1400d09259b8c3e9932a
2017-05-02 01:58:15 +00:00
Peter Qiu
10da2c2d84
Merge "hotspot2: hide Release 2 APIs" into oc-dev
...
am: 39da850a95
Change-Id: Id5e1f6184de563b51fcd185fb2768c648f788ff9
2017-05-02 01:52:44 +00:00
TreeHugger Robot
39da850a95
Merge "hotspot2: hide Release 2 APIs" into oc-dev
2017-05-02 01:44:44 +00:00
Jeff Sharkey
8179485886
Merge "Video badging levels: @Deprecate and @remove" into oc-dev am: 0a5b14309a
...
am: 43ddd0f31d
Change-Id: I3f66d8adaed78ea53f52d97e51c986487def3818
2017-05-02 01:01:17 +00:00
Jeff Sharkey
43ddd0f31d
Merge "Video badging levels: @Deprecate and @remove" into oc-dev
...
am: 0a5b14309a
Change-Id: Icce4883fe59bede2e91c091b8e4734b7224eb0e3
2017-05-02 00:53:04 +00:00
Jeff Sharkey
0a5b14309a
Merge "Video badging levels: @Deprecate and @remove" into oc-dev
2017-05-02 00:44:51 +00:00
Adam Powell
072661f580
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev am: ba9b2ce254
...
am: d1832d7bf8
Change-Id: Ic5186638644ef7b1654d473c15866476788ccfaa
2017-05-01 23:48:57 +00:00
Hyunyoung Song
d6afaa8563
Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev am: 1e8f451bbf
...
am: 090109cb19
Change-Id: I688ef5dd83d10529e8669dfb9e5ea818e0fdc348
2017-05-01 23:40:10 +00:00
Adam Powell
d1832d7bf8
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
...
am: ba9b2ce254
Change-Id: I787a726517687d1cec60a0f96d3abef3229a5dcc
2017-05-01 23:37:00 +00:00
Jeff Sharkey
74bfa11974
Merge "Rename to follow API council guidance." into oc-dev am: 0d6c3a691e
...
am: 6560d8845b
Change-Id: Ie9b4a033dfb08ea9326725e66ed4787a1ed69651
2017-05-01 23:36:36 +00:00
TreeHugger Robot
ba9b2ce254
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
2017-05-01 23:30:12 +00:00
Hyunyoung Song
090109cb19
Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev
...
am: 1e8f451bbf
Change-Id: I9d95fdcd56ccf99fe497b68f85fd5db036548a83
2017-05-01 23:28:48 +00:00
Jeff Sharkey
6560d8845b
Merge "Rename to follow API council guidance." into oc-dev
...
am: 0d6c3a691e
Change-Id: I9116471537b51bd3aa785ff21f0bef48ec380889
2017-05-01 23:25:24 +00:00
Peter Qiu
a9f9889218
hotspot2: hide Release 2 APIs
...
Bug: 37514629
Test: builds
Change-Id: Idcd684cf9846791cb02ae0f74ec35ff4850666f1
2017-05-01 16:22:24 -07:00
TreeHugger Robot
1e8f451bbf
Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev
2017-05-01 23:18:41 +00:00
TreeHugger Robot
0d6c3a691e
Merge "Rename to follow API council guidance." into oc-dev
2017-05-01 23:15:59 +00:00
Svetoslav Ganov
19ef3fceab
Merge "Addess API council comments" into oc-dev am: a9bb97993f
...
am: 58d3836914
Change-Id: I095d5c9a488db01bd3dcf6b3609aa4e928311ca9
2017-05-01 23:00:25 +00:00
Calin Juravle
6958495360
Merge "SystemApi for dex module registration"
2017-05-01 22:56:31 +00:00
Casey Burkhardt
ad217d1f86
Refactor accessibility button support detection
...
- Moves logic to detect devices capable of supporting the
accessibility button into AccessibilityManager from
SettingsLib to avoid issues with resource shifting in the
SUW binary
Bug: 37650567
Test: Existing Robolectric / Manual
Merged-In: Ibb2aaa3c2f79570df768cfa796fa890988ef82cc
Change-Id: I83bbecdf7836ae0de32ce7d39155ac0c111a8f15
2017-05-01 15:53:17 -07:00
Svetoslav Ganov
58d3836914
Merge "Addess API council comments" into oc-dev
...
am: a9bb97993f
Change-Id: I1e521c08500bcdbbfc7fd708baa4762dbb91e39a
2017-05-01 22:52:33 +00:00
Jeff Sharkey
16ec201af1
Merge changes from topic 'LOHSapi' into oc-dev am: 3ddc413b73
...
am: 5050b970bf
Change-Id: Ibbc1c8a17c51cda2797d4acb8b66ad6672011919
2017-05-01 22:51:57 +00:00
TreeHugger Robot
a9bb97993f
Merge "Addess API council comments" into oc-dev
2017-05-01 22:49:02 +00:00
Casey Burkhardt
2233fb13e0
Manually merge CL 2175149 to master for green build
...
Refactor accessibility button support detection
- Moves logic to detect devices capable of supporting the
accessibility button into AccessibilityManager from
SettingsLib to avoid issues with resource shifting in the
SUW binary
Bug: 37650567
Test: Existing SUW Robolectric
Change-Id: Ibb2aaa3c2f79570df768cfa796fa890988ef82cc
2017-05-01 15:45:32 -07:00
Jeff Sharkey
5050b970bf
Merge changes from topic 'LOHSapi' into oc-dev
...
am: 3ddc413b73
Change-Id: I35750976e1f34c1195c109863f9deb988f7e42ef
2017-05-01 22:38:31 +00:00
Joe LaPenna
2c60ef0fae
Video badging levels: @Deprecate and @remove
...
Video based badging is not going out in O. Hide video-terminology
constants.
Bug: 37687077
Test: make update-api;
Change-Id: Ibd3a732be11bcd0f6b1077943a34b77f7c971ee3
2017-05-01 15:38:17 -07:00
Jeremy Joslin
1b4fa91eda
Merge "Marking deprecated recommendation request code as @removed." into oc-dev am: 9be76f0129
...
am: ae52148dbd
Change-Id: Id9cc30f5e67cf2f9988774c39f0e224c3366796e
2017-05-01 22:35:20 +00:00