Commit Graph

98005 Commits

Author SHA1 Message Date
Sarah Chin
09a2ff81c7 Merge "Added a new capability for temporarily unmetered network." am: c5c7994da9
Change-Id: I94eb37627875f96c7e70a5df9d273266bc4def66
2020-05-07 06:01:20 +00:00
Jack Yu
de8b8c39e2 Added a new capability for temporarily unmetered network.
Added a new network capability TEMOPORARILY_NOT_METERED to support
the case that a network can temporarily become unmetered. This
allows carriers to deploy unmetered 5G network. When devices
camp on 5G network, this capability will be dynamically added
to the network and will be removed once leaving 5G coverage.

Bug: 153081494
Test: Manual
Change-Id: I10e26cb0852e67f614e7b9c4e49f95e078602e21
Merged-In: I10e26cb0852e67f614e7b9c4e49f95e078602e21
2020-05-06 13:13:45 -07:00
Christopher Tate
72dbe56d76 DO NOT MERGE - Kill apps outright for API contract violations
...rather than relying on in-app code to perform the shutdown.

Bug: 128649910
Bug: 140108616
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Change-Id: I94d9de50bb03c33666471e3dbd9c721e9278f7cb
Merged-In: I94d9de50bb03c33666471e3dbd9c721e9278f7cb
(cherry picked from commit 45a53e6cb8)
(cherry picked from commit e737c1bc6295286a1a44979d2281c3eb637fe8b1)
2020-05-06 19:59:20 +00:00
Bill Yi
4806cccece Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" 2020-05-06 15:59:08 +00:00
Andrew Sapperstein
df8396f2c3 Fix last broken @see links in aosp.
Seems that the doc-comment-check-docs wasn't in presubmit.

Bug: 6963924
Bug: 155825675
Test: make doc-comment-check-docs
Change-Id: I018a50cd76b0fd5f8c3642efa1374e53f1b746a6
Merged-In: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
2020-05-05 22:16:10 -07:00
Andrew Sapperstein
50dd1eaaeb Fix last broken @see links in aosp.
Seems that the doc-comment-check-docs wasn't in presubmit.

Bug: 6963924
Bug: 155825675
Test: make doc-comment-check-docs
Change-Id: I018a50cd76b0fd5f8c3642efa1374e53f1b746a6
Merged-In: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
2020-05-06 01:55:04 +00:00
Treehugger Robot
d14004d53b Merge changes from topic "ctor-refs" am: 1ac3746aa8
Change-Id: I974af9e767cb3683a4b5afedf4e30d2f33c88477
2020-05-05 21:12:08 +00:00
Andrew Sapperstein
23d5746e06 Fix broken @see tags in public documentation. am: 1f6e22cbd8
Change-Id: I04a78c9ba3770a4d651177aae697890094a52add
2020-05-05 21:12:04 +00:00
Treehugger Robot
1ac3746aa8 Merge changes from topic "ctor-refs"
* changes:
  Update inner class constructor refs to use proper syntax.
  Fix broken @see tags in public documentation.
2020-05-05 21:00:06 +00:00
Bill Yi
b61408add5 Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE
Change-Id: I7ce0992bd12158655c0f4833fd924c8012386996
Merged-In: I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b
Merged-In: Icd731877c220b0e3b39258812030313cbaba90c0
2020-05-05 20:34:22 +00:00
Anton Hansson
7cf9711b10 Merge "Stop building against core_platform where possible" am: 6e5cb61c2a
Change-Id: I6e100e0c5caae80b4adb62bdc0028fb56f2d7490
2020-05-05 18:08:14 +00:00
Anton Hansson
6e5cb61c2a Merge "Stop building against core_platform where possible" 2020-05-05 17:50:22 +00:00
Adrian Roos
16c424fa7d Merge "Suppress existing CallbackMethodName lint" am: 91d1ca097a
Change-Id: I9f7f6cd6fe5f2a27b1993a27128617eea98b2bcc
2020-05-05 14:07:56 +00:00
Adrian Roos
bc04e9c172 Suppress existing CallbackMethodName lint
Bug: 149430296
Change-Id: I787437f0bcb2391064564036c22688132b7450a8
Merged-In: I17258fb333a9bee7eae8ad6488ffeb35dee72ac6
Exempt-From-Owner-Approval: Fixing API lint
2020-05-05 13:38:41 +00:00
Anton Hansson
0a3b7ad5ba Stop building against core_platform where possible
This is not a stable API surface, so modules shouldn't be building
against it. Compiling against core_platform also disables link-checking,
which can hide other problems.

Bug: 137191822
Test: m
Change-Id: I7ce7dad8c02b094c565daf8c178bc6f89bb610ef
Merged-In: I7ce7dad8c02b094c565daf8c178bc6f89bb610ef
(cherry picked from commit 791551a70f)
2020-05-05 12:18:11 +01:00
Tarundeep Singh
12c27fc9ba RESTRICT AUTOMERGE Use HdmiProperties class for all properties that start with ro.hdmi am: 36b8f991e1
Change-Id: Ib4e587751012010a206587ac582c0286fe54f6fc
2020-05-05 02:43:47 +00:00
Tarundeep Singh
36b8f991e1 RESTRICT AUTOMERGE Use HdmiProperties class for all properties that start with ro.hdmi
RESTRICT AUTOMERGE so this does not go to RVC-DEV,  it is already in master.

Bug: 141581191
Test: m services.core
Change-Id: Ieb32135d30b60ad04d5f3e673391e469c83b7f84
Merged-In: Ieb32135d30b60ad04d5f3e673391e469c83b7f84
2020-05-04 20:59:07 +00:00
Andrew Sapperstein
2e5f38e0bf Update inner class constructor refs to use proper syntax.
Previously, we generally required fully qualified names for referring
to inner class constructors (like #Notification.Builder()) despite that
not being valid javadoc. Now, we properly support #Builder() syntax and
the old syntax will error.

Bug: 6963924
Test: make doc-comment-check-docs
Change-Id: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
Merged-In: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
2020-05-01 00:43:54 +00:00
Andrew Sapperstein
1f6e22cbd8 Fix broken @see tags in public documentation.
These were previously being suppressed by doclava but with this change,
all failures are fixed and the suppression logic has been removed.

To fix the issues, there were a few possible changes made:
- broken reference to a public API (such as incorrect parameters): fixed
- unnecessary @link inside an @see tag: fixed
- @see referring to an @hide or @SystemApi: reference removed
- broken references to inner class constructors
 - worked around by fully qualifying the constructor

Bug: 6963924
Test: make doc-comment-check-docs
Change-Id: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
Merged-In: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
2020-05-01 00:42:22 +00:00
Rambo Wang
9544c8a20b Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: b86d989fce
Change-Id: Ia4f99dcf6c86a356c1490b6500dd5e5016ff7257
2020-04-30 15:19:24 +00:00
Rambo Wang
b86d989fce Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" 2020-04-30 15:07:18 +00:00
Rambo Wang
6fc5438dfd Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier
MatchAllNetworkSpecifier is a subclass of NetworkSpecifer. The method
satisfiedBy should be renamed to canBeSatisfiedBy together with other
subclass of NetworkSpecifer in b/152238712.

Add annotation @Overide for the method to make sure it will not get
ignored when refactor in the future.

Bug: 154956584
Test: atest android.net.MatchAllNetworkSpecifierTest
Change-Id: Ibe32fd50fae43aa635c1c0dad66eaea82011c8b7
2020-04-30 15:06:35 +00:00
Treehugger Robot
edc94080d9 Merge "API to get hardware variant (SKU)" am: c042e44813
Change-Id: I82d12a6808ab8b178d3aee75a99ebd9c8fc7189c
2020-04-29 21:32:17 +00:00
Treehugger Robot
c042e44813 Merge "API to get hardware variant (SKU)" 2020-04-29 21:29:37 +00:00
Treehugger Robot
c451ad69d1 Merge "Update cleanupAppliedPayload comment." am: 14c78c2a55
Change-Id: I283fec0c9058d279b47f1c664005546eb8550ede
2020-04-28 21:33:02 +00:00
Treehugger Robot
14c78c2a55 Merge "Update cleanupAppliedPayload comment." 2020-04-28 21:16:24 +00:00
Hall Liu
d4e270a8ef Merge "Unhide and update documentation for DisconnectCause" am: 61a728aebf
Change-Id: I71927e12920c3d6951159250ee0e34bd6241f0c9
2020-04-28 18:00:11 +00:00
Benedict Wong
331c924374 Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" am: 7e2fe6eeee
Change-Id: Ib3e7bea4ad17eaf0b64bc157ed682c672a17f79a
2020-04-28 17:59:07 +00:00
Hall Liu
61a728aebf Merge "Unhide and update documentation for DisconnectCause" 2020-04-28 17:57:53 +00:00
Benedict Wong
7e2fe6eeee Merge "Add filtering for IPsec algorithms in IKEv2 VPNs" 2020-04-28 17:33:46 +00:00
Hall Liu
6884145ba3 Unhide and update documentation for DisconnectCause
Unhide several constants and update the documentation for
android.telephony.DisconnectCause to reflect where it's being used.

Fixes: 154826441
Test: build
Change-Id: Ib3177367519a704bb469bc494f686c96fb516b85
2020-04-27 17:57:17 -07:00
Yifan Hong
d3abb6d385 Update cleanupAppliedPayload comment.
ServiceSpecificException might be thrown, but it is not
actionable by the caller. Hence hide the comment.

Fixes: 151156841
Test: none
Change-Id: I07836fe2c5cc361fa81f6fc24851ad2b0721591b
2020-04-27 13:30:09 -07:00
Robin Lee
18556095b9 API to get hardware variant (SKU)
Bug: 151157621
Test: atest android.os.cts.BuildTest
Change-Id: I39b97f5ca3db25724bc50e7f0bbd177f6dc8cc02
2020-04-27 18:54:04 +00:00
Philip P. Moltmann
c5299c7c3a Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b
Change-Id: I3ddd8954cf8443f549f7965cc43f2600bf92a80b
2020-04-22 15:09:28 +00:00
Philip P. Moltmann
6bb9c7bdc4 Set attributionTag for noteOp(WRITE_SETTINGS) calls
Test: atest FrameworksNetTests TetheringTests:TetheringServiceTest
Bug: 136595429
Merged-In: I33f787644c44d7b0e5ce17a433820cfcd985cdfb
Change-Id: Ic3d937e7bb5141798234ed5b2852c1f768e97495
2020-04-20 18:00:03 -07:00
Jack Yu
236f201986 Merge "Renamed DisplayInfo to TelephonyDisplayInfo" am: 506655294e
Change-Id: I39b47bbeaac751705a015a24f87dcf2215149e83
2020-04-20 21:20:01 +00:00
Jack Yu
ecfb37b868 Renamed DisplayInfo to TelephonyDisplayInfo
To reduce ambiguity with android.view.DisplayInfo.

Test: Telephony sanity tests + unit tests
Bug: 151101989
Merged-In: Ic507b6bf082ca5510ff6d1dcde501f5be9ef074f
Change-Id: Ic507b6bf082ca5510ff6d1dcde501f5be9ef074f
(cherry picked from commit ac3ca33567)
2020-04-20 09:22:33 -07:00
Amit Mahajan
6ee24b1e39 Merge "Remove permission requirement for SMS_DB_LOST intent." am: 26fc0b143d
Change-Id: I8360680dd030733299aabef23ad756640b566179
2020-04-16 20:18:16 +00:00
Amit Mahajan
e253c746b4 Remove permission requirement for SMS_DB_LOST intent.
So that messaging app can listen to it for debuggability.

Test: basic sanity
Bug: 152559647
Merged-in: Ie1b980a6bfbbc7887948cfc41e4928e9f160da98
Change-Id: Ie1b980a6bfbbc7887948cfc41e4928e9f160da98
(cherry picked from commit 6eb456615f)
2020-04-15 17:15:11 -07:00
Benedict Wong
2ed005834f Add filtering for IPsec algorithms in IKEv2 VPNs
This commit adds support for validating and filtering IPsec algorithms.
Without a public API exposing IKEv2 algorithms (and their respective
public APIs), the allowedAlgorithms can only filter the proposals for
IPsec (Child) SA algorithms.

Additionally, this removes the HMAC_SHA1 from the IKE SA's integrity
algorithm proposals due to insecurity

Bug: 153701879
Test: FrameworksNetTests passing, new tests added
Change-Id: I7e61a1612692db275b751330af5bacbf86836a8c
2020-04-14 18:07:36 -07:00
Chalard Jean
2e2b52d5d8 Merge "Allow testing of signal strength" am: 2f46cd181a
Change-Id: I2300fe5c9be8a781fea67358c5e1774872b29f7c
2020-04-13 17:32:30 +00:00
Chalard Jean
833b0bcbf5 Merge "Add instrumentation to test NetworkAgent." am: 40517308f2
Change-Id: I799ad6fa5d6f1bf522414081bac75c952ad2baf7
2020-04-13 15:05:03 +00:00
Chalard Jean
ca241694cb Allow testing of signal strength
- Let any process with NETWORK_SETTINGS register for signal strength
  wakeup.
- Allow agents registering test networks to assign them a signal
  strength.

Test: NetworkAgentTest
Bug: 139268426
Change-Id: I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21
2020-04-13 21:55:32 +09:00
Chalard Jean
eea3b016ce Add instrumentation to test NetworkAgent.
Test: NetworkAgentTest, new tests using this API
Bug: 139268426
Change-Id: Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5
2020-04-13 15:44:07 +09:00
Hall Liu
051340e548 Merge changes from topic "phonestatelistener-limit-rvc-dev" am: cc8b84c221
Change-Id: I23df0fed3c46b2aeb3bf561e82460ffc41a6928c
2020-04-11 00:56:02 +00:00
Hall Liu
cc8b84c221 Merge changes from topic "phonestatelistener-limit-rvc-dev"
* changes:
  Add gating, logging for PhoneStateListener's limit
  Institute limit on PhoneStateListener
2020-04-11 00:36:13 +00:00
Xin Li
f68e6a03f1 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master 2020-04-10 18:42:15 +00:00
Treehugger Robot
668661d94c Merge "Fix a theoretical NPE" am: c312053b39
Change-Id: Idf4cb0acbfb9bc8fef43d42be477778e8ec2fc09
2020-04-10 16:44:25 +00:00
Treehugger Robot
c312053b39 Merge "Fix a theoretical NPE" 2020-04-10 16:25:07 +00:00
Chalard Jean
3854ed0c53 Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627
Change-Id: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
2020-04-10 23:08:00 +09:00