Commit Graph

17188 Commits

Author SHA1 Message Date
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
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
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
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
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
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
d1832d7bf8 Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
am: ba9b2ce254

Change-Id: I787a726517687d1cec60a0f96d3abef3229a5dcc
2017-05-01 23:37:00 +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
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
TreeHugger Robot
a9bb97993f Merge "Addess API council comments" into oc-dev 2017-05-01 22:49:02 +00: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
Jeff Sharkey
3ddc413b73 Merge changes from topic 'LOHSapi' into oc-dev
* changes:
  WifiManager: expose base LOHS apis
  WifiManager: update API for LOHS
2017-05-01 22:35:05 +00:00
Jeremy Joslin
ae52148dbd Merge "Marking deprecated recommendation request code as @removed." into oc-dev
am: 9be76f0129

Change-Id: I22805cb4f58481fc7ab1176e470cf4a2981101c5
2017-05-01 22:22:44 +00:00
Jeff Sharkey
28b08173da Merge "hotspot2: update method name for timestamp related APIs" into oc-dev
am: b6f66cf931

Change-Id: I9855d7d255e8180992e55f8695439a1463b51f00
2017-05-01 22:09:28 +00:00
TreeHugger Robot
9be76f0129 Merge "Marking deprecated recommendation request code as @removed." into oc-dev 2017-05-01 22:05:29 +00:00
Jeff Sharkey
b6f66cf931 Merge "hotspot2: update method name for timestamp related APIs" into oc-dev 2017-05-01 21:57:38 +00:00
Adam Powell
f05458cf7e Hide FragmentContainer#instantiate for API 26
Bug 37638617

Change-Id: I065cd31d6ce987155669f72eff0e0d6d8a9430ab

Test: none; hiding API only
2017-05-01 14:26:54 -07:00
Jeff Sharkey
f29d19610d Rename to follow API council guidance.
Test: builds, boots
Bug: 37422404
Change-Id: Idcec897e775f2613805a86209615e389b63bd78d
2017-05-01 15:09:46 -06:00
Svetoslav Ganov
e6b4614d88 Addess API council comments
Test: manual

bug:37322491

Change-Id: I2017e667c5452c7ef7c56ec19c594e685700b33a
2017-05-01 13:42:04 -07:00
Rebecca Silberstein
1668d9732a WifiManager: expose base LOHS apis
This CL exposes a minimal set of APIs to start LocalOnlyHotspot.  This
includes the call to start the hotspot along with the objects necessary
to get updates and unregister the hotspot request.

Bug: 31466854
Bug: 37073685
Test: make update-api
Test: make
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I5e9a6a842c0b9233ebf99317f61e0b36192d5be7
2017-05-01 12:45:45 -07:00
Jeff Sharkey
e13d60764c Merge "Updates based on API council guidance." into oc-dev
am: 3ba7117164

Change-Id: I75953e083e10972dcc44c431ff84bf3977e8d442
2017-05-01 18:43:12 +00:00
Jeff Sharkey
3ba7117164 Merge "Updates based on API council guidance." into oc-dev 2017-05-01 18:36:25 +00:00
Jeff Sharkey
edfa1561c5 Merge "Rename restartOnConfigChanges to recreateOnConfigChanges." into oc-dev
am: a5e8bfe999

Change-Id: I4921365f720b18d3488da06cbe94a536e6489478
2017-05-01 18:35:01 +00:00
Jeff Sharkey
a5e8bfe999 Merge "Rename restartOnConfigChanges to recreateOnConfigChanges." into oc-dev 2017-05-01 18:22:37 +00:00
Jeff Sharkey
f0d14afa61 Merge "Change String to CharSequence in #loadSummary." into oc-dev
am: 63827ce61b

Change-Id: Ic7a72161a671de50ade75e670e269523dd78f7fe
2017-05-01 18:10:36 +00:00
Jeff Sharkey
edf5315427 Merge "Removing unnecessary asset." into oc-dev
am: 45eed80587

Change-Id: I52336e75ff507b186ba74b4e5b25ac796fe6dd07
2017-05-01 18:06:24 +00:00
Jeff Sharkey
63827ce61b Merge "Change String to CharSequence in #loadSummary." into oc-dev 2017-05-01 17:52:26 +00:00
Jeff Sharkey
45eed80587 Merge "Removing unnecessary asset." into oc-dev 2017-05-01 17:48:28 +00:00
Jeremy Joslin
2caddc5ef4 Marking deprecated recommendation request code as @removed.
Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: Built & ran
Bug: 37357264
Change-Id: I6d55fbad87b11c99e7ddac07cfaa82efeee33187
2017-05-01 10:42:32 -07:00
Matthew Snider
fa88787309 Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev
am: ef08871d6b

Change-Id: Ib173b22981d9081c184b024d54671729ec081d11
2017-05-01 16:46:17 +00:00
Matthew Snider
ef08871d6b Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev 2017-05-01 16:42:24 +00:00
Peter Qiu
967501ec98 hotspot2: update method name for timestamp related APIs
Bug: 37514629
Test: build
Change-Id: Iadd8b7a9ea98bc01f796a261293f87173ba1d52f
2017-05-01 09:41:14 -07:00
Jeff Sharkey
f89879a133 Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev
am: 080e16575a

Change-Id: I8e81a2f5361d2fc6ab61cb38f69fe1e0eb867e63
2017-05-01 16:11:00 +00:00
Jeff Sharkey
080e16575a Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev 2017-05-01 16:05:35 +00:00
Winson Chung
5cf8f94273 Removing unnecessary asset.
Bug: 37743450
Test: None, just removing asset
Change-Id: Icbf8c2fd08b3f0ad52ced3dcd8766cd9d055d5fb
2017-05-01 08:53:27 -07:00