Commit Graph

26862 Commits

Author SHA1 Message Date
Automerger Merge Worker
e1d888d66b Merge changes from topics "caps_refactor", "phone-cap-revert" am: 1bd0e487cd
Change-Id: I7ab7fe2cceeeb57bb60fdab15eb3f96fb7b4d601
2020-02-27 06:05:45 +00:00
Sarah Chin
1bd0e487cd Merge changes from topics "caps_refactor", "phone-cap-revert"
* changes:
  Revert "Modify PhoneCapabilities for device capabilities"
  Revert "PhoneCapability cleanup"
2020-02-27 05:46:08 +00:00
Automerger Merge Worker
33086f9d78 Merge "Add methods to send connected/disconnected state." am: bdb86ff8ab
Change-Id: If69bd650e129dc9f058e47832d48651b9243a3bb
2020-02-27 03:23:48 +00:00
Aaron Huang
bdb86ff8ab Merge "Add methods to send connected/disconnected state." 2020-02-27 03:21:14 +00:00
Automerger Merge Worker
7e3f076b2c Merge "Add missing RequiresPermission annotations in BluetoothHidHost and BluetoothMap APIs, disallow null device input for setConnectionPolicy, getConnectionPolicy, and getConnectionState in BluetoothHidHost, and BluetoothMap implements AutoCloseable, its close() method is public, and utilizes a CloseGuard." am: a9e6a280f8
Change-Id: Iee457f25ea65b2507986f7e111341fc9924f56e3
2020-02-26 18:01:50 +00:00
Rahul Sabnis
f9e92a836f Add missing RequiresPermission annotations in BluetoothHidHost and
BluetoothMap APIs, disallow null device input for setConnectionPolicy,
getConnectionPolicy, and getConnectionState in BluetoothHidHost, and
BluetoothMap implements AutoCloseable, its close() method is public, and
utilizes a CloseGuard.

Bug: 149238030
Test: Manual
Change-Id: I8add9e26afcaf1a988c15e3cc7f8c446491f0686
2020-02-25 12:03:48 -08:00
Sarah Chin
64050ff818 Revert "Modify PhoneCapabilities for device capabilities"
This reverts commit e8b7635634.

Reason for revert: Change not supported by vendor

Bug: 149522248
Bug: 143238237
Change-Id: Iaf9eb6493b937545ba5f046912fc023887e7b566
Merged-In: I17315f5b99ad7c5a5a6d88ed21a825301fa8e5e5
2020-02-25 11:09:02 -08:00
Automerger Merge Worker
a48f383782 Merge "Re-expose raw data roaming state" am: efa17d986e
Change-Id: Idf670452a33814c760244217303069ba8c9add09
2020-02-24 23:46:44 +00:00
Sarah Chin
efa17d986e Merge "Re-expose raw data roaming state" 2020-02-24 23:35:22 +00:00
Automerger Merge Worker
96c4a23176 Merge "Expose getLteOnCdmaMode as isGlobalModeEnabled" am: b3a20cbfff
Change-Id: I4d7346e1f28cc5ca91838199da05c6c7c5536f72
2020-02-21 22:23:21 +00:00
Sarah Chin
78babb4ba9 Re-expose raw data roaming state
Re-expose raw data roaming state from modem
Revert logic in getDataRoamingFromRegistration and make @SystemApi

Test: atest ServiceStateTest, ServiceStateTrackerTest
Bug: 146000674
Change-Id: Ibe52c06a4a42bce0f83548355907459a5b152d9a
Merged-In: Ibe52c06a4a42bce0f83548355907459a5b152d9a
2020-02-21 22:09:49 +00:00
Sarah Chin
30a3111db8 Expose getLteOnCdmaMode as isGlobalModeEnabled
Rename and make @SystemApi

Test: atest FrameworksTelephonyTests
Bug: 147335742
Change-Id: I2c5727bcc5fd0263acfe669177f43fda17650f41
Merged-In: I2c5727bcc5fd0263acfe669177f43fda17650f41
2020-02-20 16:55:02 -08:00
Automerger Merge Worker
1e8247d25d Merge "Add Vulkan dEQP level feature flag" am: 49fa6ba37f
Change-Id: Ibbaf55fe2126371392674b8abe3ae3013486b599
2020-02-20 21:24:20 +00:00
Treehugger Robot
49fa6ba37f Merge "Add Vulkan dEQP level feature flag" 2020-02-20 21:06:20 +00:00
Automerger Merge Worker
2860b52ecc Merge "Do not expose module IPsec(IKE) API from frameworks" am: 452e4df88c
Change-Id: I315293b8c99fdd2b7af3c83282084553dab920b8
2020-02-20 19:00:03 +00:00
Yan Yan
452e4df88c Merge "Do not expose module IPsec(IKE) API from frameworks" 2020-02-20 18:38:55 +00:00
Automerger Merge Worker
f2472fa7aa Merge "Stop exposing constructor of TetheringConstants" am: 5dd58dac7e
Change-Id: Iac2677ca21a0dfcbb3afa40a32d824977e3aaa7e
2020-02-20 12:56:32 +00:00
Chalard Jean
d0eb17eb76 Add methods to send connected/disconnected state.
Also add methods to set the legacy subtype and the APN name.
These have to be added together because they have to be used
together.

Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: Ie90b8d290eab490061d5cb066744b67d597b9469
Merged-In: Ie90b8d290eab490061d5cb066744b67d597b9469
(clean cherry-pick from internal branch)
2020-02-20 19:37:16 +08:00
markchien
d8cfb6ecc7 Stop exposing constructor of TetheringConstants
Fully-static utility classes must not have constructor.

Bug: 149430003
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I18e1129ef8717211d667ccd3b4110169dd7905b4
2020-02-20 16:11:35 +08:00
evitayan
5daf75d5b8 Do not expose module IPsec(IKE) API from frameworks
Module IPsec(IKE) will not be in bootclasspath or expose API
from frameworks/base anymore. Instead it will be built as a
java_sdk_library and expose APIs under its own directory.

This commit:
- Removes API from frameworks/base
- Adds ike to FrameworksNetTests manifest so that VpnTest is
  able to load it.

Bug: 145995723
Test: build, flash, boot
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Test: manually tested that FrameworksNetTests can use ike.jar
Change-Id: I37ba02eb3003ea28e66f50ca0b612597ef48f6d5
Merged-In: I37ba02eb3003ea28e66f50ca0b612597ef48f6d5
2020-02-20 05:51:35 +00:00
Roshan Pius
b2e49ac48b DO NOT MERGE: RELAND: NetworkRequest: Embed requestor uid & packageName
Add the requestorUid & requestorPackageName fields to
NetworkCapabilities. This is populated by CS when
a new network request is received.
These 2 requestor fields are also optionally used for network
matching. All of the regular app initiated requests will have the
requestor uid and package name set by connectivity service. Network
agents can optionally set the requestorUid and requestorPackageName
to restrict the network created only to the app that requested the network.

This will help removing the necessity for the various specifiers to embed
the uid & package name info in the specifier for network matching.

Note: NetworkSpecifier.assertValidFromUid() is deprecated & removed in
favor of setting the uid/package name on the agent to restrict the
network to a certain app (useful for wifi peer to peer API & wifi aware).

Bug: 144102365
Test: Verified that wifi network request related CTS verifier tests
pass.
Test: Device boots up and connects to wifi networks
Merged-In: I207c446108afdac7ee2c25e6bbcbc37c4e3f6529

Change-Id: I58775e82aa7725aac5aa27ca9d2b5ee8f0be4242
2020-02-19 23:12:32 +00:00
Automerger Merge Worker
329d286b88 Merge "Make get/setCallerNumberVerificationStatus final." am: 4cbb288657
Change-Id: I734a658b5849cc5bca14d1b7fbc7509971774ce0
2020-02-19 22:23:34 +00:00
Tyler Gunn
4cbb288657 Merge "Make get/setCallerNumberVerificationStatus final." 2020-02-19 22:03:52 +00:00
Automerger Merge Worker
32cdb7dcbb Merge "Rename KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL." am: 10f01e3c4c
Change-Id: I5d69ec2f11680ef25b06cd1e1b6460dd4b1e8523
2020-02-19 19:51:44 +00:00
Alastair Donaldson
1c0b692a0e Add Vulkan dEQP level feature flag
This change adds a feature flag that specifies the date associated
with the Vulkan dEQP tests that a device claims to pass.

Bug: 136573508

Change-Id: I0cec29fe5f69f228faaa2298b7f5b65bcf988dba
Merged-In: I0cec29fe5f69f228faaa2298b7f5b65bcf988dba
2020-02-19 19:17:50 +00:00
Tyler Gunn
10f01e3c4c Merge "Rename KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL." 2020-02-19 18:53:23 +00:00
Automerger Merge Worker
5116697dce Merge "Enable compat checking & lint for module_lib api" am: 0e9166f15b
Change-Id: Iba12d70334a211e03531af8537659c1322b2757e
2020-02-19 16:38:21 +00:00
Anton Hansson
626afea1bd Enable compat checking & lint for module_lib api
These were previously turned off as there were no previous
releases to compare it to. Check in empty files as comparison.

The new tethering APIs fail lint -- I have filed a release
blocking bug to get these cleaned up.

Bug: 149430003
Bug: 147559833
Test: m module-lib-api-api-lint
Test: m module-lib-api-check-last-released-api (with+without incompatibilities)
Change-Id: I2b171dc836ca121502fb345d8dd512a05c566a49
Merged-In: I2b171dc836ca121502fb345d8dd512a05c566a49
(cherry picked from commit 79e35c3beb)
2020-02-19 14:58:44 +00:00
Automerger Merge Worker
101b4e2bb5 Merge "Use framework-tethering-stub instead of framework-tethering" am: 3e4ab5c2b5
Change-Id: I2caaa5f804a510bcc18822b784c129e9b058ea03
2020-02-19 09:54:51 +00:00
Mark Chien
3e4ab5c2b5 Merge "Use framework-tethering-stub instead of framework-tethering" 2020-02-19 09:46:24 +00:00
markchien
8cf2a5588b Use framework-tethering-stub instead of framework-tethering
The non-updatable part of the platform now is built with
framework-tethering-stub, which is a stub library of
framework-tethering.

Bug: 147200698
Test: m
Change-Id: I97ef83f7f9b4c1376f373713036f5256318f1050
Merged-In: I97ef83f7f9b4c1376f373713036f5256318f1050
2020-02-19 15:10:44 +08:00
Automerger Merge Worker
65de31ca5d Merge "USB: [API feedback] Add bitmask @IntDef annonation to setCurrentFunctions" am: 2f9800a47d
Change-Id: Iaf10cf1c347b93eb87fa476d59b41fa35022cd80
2020-02-19 03:15:57 +00:00
James Wei
2f9800a47d Merge "USB: [API feedback] Add bitmask @IntDef annonation to setCurrentFunctions" 2020-02-19 03:04:09 +00:00
Automerger Merge Worker
191127c556 Merge "Declare a public field for new Japanese Era Reiwa" am: 857636e059
Change-Id: I623b5af1467b4f511d0d7a7c69b58f1768493fe0
2020-02-19 01:41:27 +00:00
Treehugger Robot
857636e059 Merge "Declare a public field for new Japanese Era Reiwa" 2020-02-19 01:30:47 +00:00
nchalko
e982fa4084 Merge "Add encoding information to TvTrackInfo" am: f3681741e3
Change-Id: Id263372457ab5849cdadd3f6788c64ad462310fe
2020-02-18 21:11:28 +00:00
Kyeongkab.Nam
ada0f3079c Add encoding information to TvTrackInfo
Add TIF API for getting encoding in order for TV App to use it.

Test: build
Bug: 112835103
Change-Id: I975dda20f129cb05d55eb59a1a60bcdb22b2533e
Merged-In: I975dda20f129cb05d55eb59a1a60bcdb22b2533e
2020-02-18 17:45:00 +00:00
Nikita Iashchenko
73d22d5abc Declare a public field for new Japanese Era Reiwa
Integrate OpenJDK commit for new Japanese Era name:

 * 8174268: Declare a public field in JapaneseEra for the era starting May 2019
   http://hg.openjdk.java.net/jdk/jdk/rev/6a4abdb6749c

Bug: 149437171
Test: CtsLibcoreTestCases CtsLibcoreOjTestCases
Merged-In: I1cbc9a12744d3cea214ee3b4a2872a9ad144e147
Change-Id: I1cbc9a12744d3cea214ee3b4a2872a9ad144e147
2020-02-18 16:34:04 +00:00
Chiachang Wang
c4f123463a Merge "Add NETWORK_SETTINGS to SystemApi" am: 0ab508981a
Change-Id: Ie81ece88b9375ffd465c8bb68b17a0c4500dd025
2020-02-17 11:22:30 +00:00
Remi NGUYEN VAN
318a6b763c Add NETWORK_SETTINGS to SystemApi
The permissions are checked by Tethering; mainline modules should be
able to do permission checks based on these permissions.

Bug: 135411507
Test: m
Test: make test-api-stubs-docs-update-current-api \
      system-api-stubs-docs-update-current-api
Change-Id: I10eb0273461063149a8d0eec92e2aaadea0680bd
Merged-In: Ia617ea56aba18f98371d7dbd546679e0327bfacd
2020-02-17 11:04:38 +00:00
James Wei
77dc3e9ff2 USB: [API feedback] Add bitmask @IntDef annonation to setCurrentFunctions
Bug: 148285097
Test: Manual test: USB function switch: MTP, PTP, RNDIS, MIDI
Test: atest UsbTests
Test: atest UsbManagerTests
Change-Id: I27f8097b0a8174f7c1d14b856442e8962b56a906
2020-02-14 17:44:43 +08:00
Paul Hu
06c0f60a2b Merge "Add ACTION_TETHER_SETTINGS" am: 77e6024c01
Change-Id: Ibde5dfa7be0bd3e2db664b49f3a65eb618da933d
2020-02-14 08:19:04 +00:00
Paul Hu
77e6024c01 Merge "Add ACTION_TETHER_SETTINGS" 2020-02-14 08:05:33 +00:00
Zoey Chen
8811b44dd1 Merge "[Settings] Expose @hide APIs as @SystemApi" am: 3091498e78
Change-Id: Ia1fabd4b306f9af5fd0d9f37d7c2f051fc055da6
2020-02-14 07:01:50 +00:00
Zoey Chen
3091498e78 Merge "[Settings] Expose @hide APIs as @SystemApi" 2020-02-14 06:49:45 +00:00
Roshan Pius
3819be4271 Merge "RELAND: NetworkRequest: Embed requestor uid & packageName" 2020-02-14 01:57:49 +00:00
Tyler Gunn
a131d6ee5f Make get/setCallerNumberVerificationStatus final.
Make new APIs final.

Test: make -j update-api
Test: run unit tests
Bug: 149316218
Change-Id: Ib3d4ceacff451ac646a504ab02f0242852228a32
2020-02-13 14:53:28 -08:00
Tyler Gunn
be363243eb Rename KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL.
Per API feedback, rename to KEY_ALLOW_HOLD_VIDEO_CALL_BOOL and update
the API docs for clarity.

Test: Rebuild code.
Test: Run telephony unit tests.
Bug: 149299319
Change-Id: I36574865829951a3561f6445e3e83c78c48c4573
2020-02-13 11:13:47 -08:00
Automerger Merge Worker
1ce250aaea Merge "API Review cleanups." am: f2a5615087
Change-Id: I516e72d3f32c40ff480e55ceed222aea7d5ce9b3
2020-02-13 18:19:51 +00:00
Tyler Gunn
f2a5615087 Merge "API Review cleanups." 2020-02-13 18:16:25 +00:00