Commit Graph

17240 Commits

Author SHA1 Message Date
Hall Liu
8c4179e88c Merge "Un-hide the MBMS streaming APIs"
am: a50e17aea2

Change-Id: Icd8ebf0e351914cdfb0f0c15343e2d2024706d6b
2017-07-28 02:40:20 +00:00
Hall Liu
2398921320 Un-hide the MBMS streaming APIs
Unhides the MBMS streaming APIs and modifies the vendor base classes to
no longer pass raw AIDLs to the vendor code.

Test: builds
Change-Id: I56030d646c2a1160277d85779c6ed431cda4efa7
2017-07-27 15:38:36 -07:00
Robert Quattlebaum
6b0e6946c3 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
am: 777c408a22

Change-Id: I3ae9566ca52b9dae87cace18b1e97897eb8de0ad
2017-07-18 23:33:08 +00:00
Treehugger Robot
777c408a22 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" 2017-07-18 23:09:58 +00:00
Przemyslaw Szczepaniak
40dfadda77 Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"
am: 29926838d4

Change-Id: I7c0f6b9c064ce7eba1eb0cd4c6bca7464ce24100
2017-07-17 10:48:50 +00:00
Przemyslaw Szczepaniak
29926838d4 Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" 2017-07-17 10:37:35 +00:00
Przemyslaw Szczepaniak
f36ecf37f3 Track libcore commit 58228b82c64808eddac02736f18f5003730443a0
Test: CtsLibcoreTestCases
Bug: 62949898
Change-Id: Icc41052e9476cc08bf3fa9579964f141d164c36c
2017-07-13 14:23:44 +01:00
Hall Liu
d45a007222 Merge "Implement getDownloadStatus and add permission"
am: 2fa880d016

Change-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959
2017-07-12 23:27:49 +00:00
Hall Liu
2fa880d016 Merge "Implement getDownloadStatus and add permission" 2017-07-12 23:18:37 +00:00
Robert Quattlebaum
d95f73c338 NetworkCapabilities: Unhide TRANSPORT_LOWPAN
This commit simply unhides the constant `TRANSPORT_LOWPAN` in the class
`android.net.NetworkCapabilities`, adding it to the public API.

Bug: b/63600204
Change-Id: I794635814c0bd3891cd22fcc1e31614e4d6ac654
2017-07-11 18:16:09 -07:00
Przemyslaw Szczepaniak
03e304e4e8 Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621"
am: c895fcef8f

Change-Id: I1aecc608b0eaa807489683526a9267003eb975b1
2017-07-10 13:40:49 +00:00
Przemyslaw Szczepaniak
44d7cd06d2 Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621
Test: Make
Bug: 62779247
Change-Id: I919df93b20e809f42a27225403e1549b763b0a60
2017-07-10 11:56:55 +00:00
Alex Light
c9b8de6136 Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am: a4267fd89f

Change-Id: If31e5d218bd00b3281923c80cd4f61ca734d4388
2017-07-06 21:10:11 +00:00
Hall Liu
55f557dc7c Implement getDownloadStatus and add permission
- Implement getDownloadStatus in the manager
- Remove DownloadStatus and add constants in its place to reflect the
status of a single file
- Add ACT_AS_EMBMS_MIDDLEWARE permission

Change-Id: Ica8b8a872a8088a2aaf56d40926051225aa39e87
2017-07-06 13:40:09 -07:00
Alex Light
f3aac96db4 Unhide InMemoryDexClassLoader ByteBuffer[] constructor
This constructor lets one give multiple dex files as byte buffers for
the InMemoryDexClassLoader.

Bug: 63390204
Test: Builds
Change-Id: I5b8a7860dbc365c0a51dbaf4540b9fa53c922546
2017-07-06 11:25:18 -07:00
Tobias Thierer
ddffcdb6bd Merge "Track update of org.json API"
am: c5a65bc152

Change-Id: I755b8be63f4a9dbe11d1c14c0d9f3f8cd3e93916
2017-07-05 22:33:10 +00:00
Tobias Thierer
ed45f4efb0 Track update of org.json API
This CL was generated by running "make update-api".

Bug: 62898477
Test: Treehugger
Change-Id: I50aac192fb5f9b4c032a46267d8d5e135dc69a3e
2017-06-27 16:54:27 +01:00
Svetoslav Ganov
50859b50a6 Merge "Ensure only test print services enabled - framework" into oc-dev
am: 053fb9120e

Change-Id: I70220ead15eabfe58727ab5c3b0a9c92e8c508a8
2017-06-08 16:04:17 +00:00
Svetoslav Ganov
2dcedc1276 Ensure only test print services enabled - framework
Test: cts-tradefed run cts-dev -m CtsPrintTestCas

bug:62232727

Change-Id: I1050272586d1c03dc1b1dfdb8b10e258912a249b
2017-06-07 18:50:05 -07:00
Alan Viverette
35eb249ebb Merge "Annotate test method visibility in WindowManager" into oc-dev
am: 0b83588177

Change-Id: I0393d702b3fd308dd16becefceea15f932fea599
2017-06-02 17:34:38 +00:00
TreeHugger Robot
0b83588177 Merge "Annotate test method visibility in WindowManager" into oc-dev 2017-06-02 17:26:54 +00:00
Alan Viverette
39259dd33c Annotate test method visibility in WindowManager
Change-Id: I36714b4eb39c937cc3c42fac604fd0fa9900ae47
Fixes: 62066862
Test: n/a
2017-05-31 15:06:09 -04:00
Peter Qiu
421018f44b Merge changes from topic 'hide_passpoint_r2' into oc-dev
am: 4bd47fce86

Change-Id: I71fe905c7842384d7700f02f923b12cdae9bf594
2017-05-30 18:55:37 +00:00
TreeHugger Robot
4bd47fce86 Merge changes from topic 'hide_passpoint_r2' into oc-dev
* changes:
  hotspot2: hide Release 2 APIs
  Voice Messaging Intent API.
2017-05-30 18:47:12 +00:00
Peter Qiu
ff323d3ce9 hotspot2: hide Release 2 APIs
These APIs are based on the design of the legacy OSU app.  Since
the app will be redesigned, hide these APIs for now.

Bug: 38260972
Test: build
Change-Id: I56b9c27305624306773284a7cc1721606037462d
2017-05-30 09:47:43 -07:00
Renat Aksitov
931983d607 Voice Messaging Intent API.
Removing EXTRA_SENDER_ACCOUNT_HASH, needs more work.

Bug 37747843

Test: make -j11 docs

Change-Id: I3046611510f85cf69ceff7c2274cda3b692581b9
(cherry picked from commit 2c4201448e)
2017-05-30 09:47:42 -07:00
Jiaquan He
74282f0745 Check state_focus in foreground.
am: 0bdf1c9c76

Change-Id: Ie7b36dfa723a110d553c2f6a5926314758e0da53
2017-05-27 00:19:35 +00:00
TreeHugger Robot
759669988b Merge changes from topic 'highlight_fixed' into oc-dev
* changes:
  Check default focus highlight for ImageView.
  Check state_focus in foreground.
2017-05-27 00:11:10 +00:00
Tony Mak
754f6e22b0 Merge "Remove the old version of setAffiliationIds" into oc-dev
am: 8d902a9e28

Change-Id: I219958d5f9d74845b0ec03f88903ea6b9ec345c6
2017-05-26 13:06:23 +00:00
Jiaquan He
0bdf1c9c76 Check state_focus in foreground.
This commit checks whether the state_focus is specified in the
foreground of a view. If it is, the default focus highlight won't
show up.

Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases -t
android.view.cts.View_DefaultFocusHighlightTest#testIsDefaultFocusHighlightNeeded
Bug: 37288730
Change-Id: I5256eb656c1b8729d685edb914e867ee9a3a92a4
2017-05-24 16:13:38 -07:00
Tony Mak
8c6969b69b Remove the old version of setAffiliationIds
Test: Can build

Build: 37622682

Change-Id: I07e630e96f5aed5d450652c465e00ffed13a2a2c
2017-05-17 15:20:04 +00:00
Hugo Benichi
0eec03f75c Address ConnectivityManager API comments.
This patch is a cherry pick of the two following commits:
  - 15fd4395e1 which addresses several
    issues in the public api of ConnectivityManager.
  - e2d48ff57c which fixes the documentation
    of several methods in ConnectivityManager public api.

Because the first commit change the public api that is referenced in
the documentation fixed by the second commit, it is not possible to one
without the other. In both cases trying to cherry pick only one of them
results in a build error.

The first commit was submitted successfully on an internal branch before
the checks done in the built got stricter.

Bug: 36370941
Test: marlin builds and boots
Change-Id: I86dcf056e6b165e527c3ee88dbabc2764ac09a08
Merged-In: I693ee5270bf186c88c7c5056293519f7237504ff

(cherry picked from commit 15fd4395e1)
2017-05-17 21:48:05 +09:00
Jeremy Joslin
964cddccda Merge "Remove deprecated recommendation request code." into oc-dev
am: b2bd32929b

Change-Id: I0efb561f7829598eb5a509474e1a6e54e00bb93d
2017-05-16 19:02:40 +00:00
TreeHugger Robot
b2bd32929b Merge "Remove deprecated recommendation request code." into oc-dev 2017-05-16 18:44:28 +00:00
Ian Pedowitz
b6290ff39e Merge "Revert "Revert "O is API 26""" into oc-dev
am: 655ab3f59b

Change-Id: I28655c728468f2348b2ba83b77f2aae3d7b22c06
2017-05-16 04:02:51 +00:00
Ian Pedowitz
9ebb128c40 Merge "Revert "Revert "Resource ID fixup.""" into oc-dev
am: a11196074b

Change-Id: I1ea7b4a17bf7ba6de43db52e996aff4c56dc3bf0
2017-05-16 04:00:05 +00:00
Ian Pedowitz
655ab3f59b Merge "Revert "Revert "O is API 26""" into oc-dev 2017-05-16 03:33:05 +00:00
Ian Pedowitz
a11196074b Merge "Revert "Revert "Resource ID fixup.""" into oc-dev 2017-05-16 03:32:33 +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
Jeremy Joslin
9407a9490b Remove deprecated recommendation request code.
Removed all deprecated code related to network recommendation
requests.

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: runtest frameworks-services -c com.android.server.NetworkScorerAppManagerTest
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t com.google.android.gts.netrec.NetRecHostTest
Bug: 37357264
Change-Id: I81bb6ff6236b249b8e14058c1bfdb938451a75b0
2017-05-11 15:43:57 +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
Jordan Liu
5b07cb3542 Add key for carrier_volte_provisioned
Add the key to CarrierConfigManager and remove old configs.

Bug: 29873049
Change-Id: Icf3075fe39d3466732ea81738cb29c512f840401
Merged-In: Icf3075fe39d3466732ea81738cb29c512f840401
2017-05-10 17:40:19 -07: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
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
967869d0ed Revert "Revert "O is API 26""
This reverts commit 12025857cd.

Bug: 37480230
Bug: 37355569
Change-Id: I315b8c18a79d0dcd6be84c3d2af120b073144a9e
2017-05-04 00:10:04 +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