Commit Graph

2813 Commits

Author SHA1 Message Date
Jayachandran C
270197bc8d Remove usage of Telephonymanager getDefault() and from() hidden APIs
This CL replaces with getSystemService(TelephonyManager.class)

Bug: 140768340
Test: atest frameworks/base/tests/net
Change-Id: I0f14cc5440fa85c81ab90f3199e9e91c1b00f5e1
2019-11-15 19:26:33 -08:00
android-build-team Robot
39c4b46bc5 Snap for 6007460 from 2e951c12a2505816c933b1816b6ac412604fb36a to rvc-release
Change-Id: I4b1ef818b0f964cde24d37716104e69deffc3d54
2019-11-14 04:10:49 +00:00
Artur Satayev
8b319523fe [automerger skipped] Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." am: a98026f7aa am: 5f7358da57
am: 5103212960 -s ours
am skip reason: change_id Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6 with SHA1 817cc44c62 is in history

Change-Id: I1e9b0579e65071e042c4595083427bcc7889c15e
2019-11-13 14:05:06 -08:00
Artur Satayev
5103212960 Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." am: a98026f7aa
am: 5f7358da57

Change-Id: Ic691d764839ecf34daa8b53aa92497e013c9a2a7
2019-11-13 10:40:54 -08:00
Artur Satayev
5f7358da57 Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps."
am: a98026f7aa

Change-Id: Ia39fbc2200aa7262e4a05b0710b7a382bb01b276
2019-11-13 10:33:06 -08:00
Artur Satayev
122a87695f Add @UnsupportedAppUsage to test apis that are known to be used by apps.
go/testapi-enforcement

Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
2019-11-13 15:05:56 +00:00
Artur Satayev
817cc44c62 Add @UnsupportedAppUsage to test apis that are known to be used by apps.
go/testapi-enforcement

Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
2019-11-13 12:58:29 +00:00
android-build-team Robot
76d67ca0ff Snap for 5992631 from ceb15a54bcfbafa3d9a80c785c7e8fc581403c4a to rvc-release
Change-Id: I336793350f3e4bea994b74860621c84280b51abc
2019-11-07 04:14:57 +00:00
Joshua Baxter
c528439458 docs: fix a couple of minor typos am: 6eae9bbc0f am: 46cc54fd21 am: ffcb948028
am: a3ef3d991c

Change-Id: I7737e9479ef6adc1ebe4c0e828eb4516daf20c0d
2019-11-06 14:17:40 -08:00
Joshua Baxter
a3ef3d991c docs: fix a couple of minor typos am: 6eae9bbc0f am: 46cc54fd21
am: ffcb948028

Change-Id: Id084d29a91ae1a68176439c403e7475b2d497f9d
2019-11-06 14:05:28 -08:00
Joshua Baxter
46cc54fd21 docs: fix a couple of minor typos
am: 6eae9bbc0f

Change-Id: Id2139f5f685d2c4677d5e06ff7fda4b74e61a30c
2019-11-06 13:33:53 -08:00
Joshua Baxter
6eae9bbc0f docs: fix a couple of minor typos
test: make ds-docs
Change-Id: Ia68f66980e447209efb8102a156f78314c199f56
bug: 36979979
Exempt-From-Owner-Approval: docs-only change
2019-11-06 21:13:25 +00:00
Benedict Wong
ec2e2e2174 Use TransformRecord to get SPI instead of SpiRecord
IpSecService.applyTunnelModeTransform() currently does not take an
SpiRecord instance, yet implicitly requires that the SpiRecord instance
is still alive based on the stored SpiRecord resourceId in
the TransformRecord's IpSecConfig.

This check is unnecessary, as the SpiRecord has been subsumed into the
TransformRecord, and the kernel resources are kept alive whether or
not the SpiRecord is still held by the user.

This allows users of the IpSecManager API to allocate short-lived SPIs
during the creation of an IpSecTransform, without having to keep track
of both of them (even though the SPI is no longer usable).

The TransformRecord.getSpiRecord() call is already used in
multiple other places in the same method.

Bug: 142072071
Test: New tests added, passing.
Change-Id: I1959f3080946267243564459ff4207647922566e
2019-10-18 21:04:59 +00:00
android-build-team Robot
b850744ac7 Snap for 5870090 from 125791ef592115e3b36006a780206656b7ae12e8 to rvc-release
Change-Id: I2b4ebd84c290ef9f83eef86773ba8f6280252c2b
2019-09-12 03:26:20 +00:00
Xin Li
d639a99b8c [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: e569a024aa -s ours am: 8f2cea24e0 -s ours
am: c22db3e73a -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history

Change-Id: I712ca737683eb8ecf584fdfbdf0378afce7fa0ca
2019-09-11 15:42:29 -07:00
Xin Li
8f2cea24e0 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: e569a024aa -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history

Change-Id: I6c6c0cd8aa4ac5968252f29c1e45f0e0768f5204
2019-09-11 13:59:58 -07:00
Xin Li
e569a024aa Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
android-build-team Robot
1d8c814617 Snap for 5860386 from 4827332e4fc5eb67608c8444829253c982ce613b to rvc-release
Change-Id: Id6f05f06eaebb44a44baf911a962d06c41339593
2019-09-07 23:14:51 +00:00
Xin Li
da8bfb7dc1 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ec3f3fbce6 -s ours am: 03f35832bf -s ours am: 2d4b126a81 am: 68d50f9b95
am: 04504fa3bb -s ours
am skip reason: subject contains skip directive

Change-Id: Ied21f8bfc652bbb33b4bb703927a2b77ef4b54b3
2019-09-05 15:33:25 -07:00
Xin Li
68d50f9b95 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ec3f3fbce6 -s ours am: 03f35832bf -s ours
am: 2d4b126a81

Change-Id: Ibf2eaa45d685bba0b3472b510a13e2c78a5f2277
2019-09-05 14:44:40 -07:00
Xin Li
2d4b126a81 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ec3f3fbce6 -s ours
am: 03f35832bf -s ours
am skip reason: subject contains skip directive

Change-Id: I112f6ad00252d63046d6732a5c0fa72e7ff64e9c
2019-09-05 14:06:52 -07:00
Xin Li
ec3f3fbce6 DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I9e3c4fe5406c9913d50fe3b07d7f7cef7a246b96
2019-09-04 13:33:59 -07:00
android-build-team Robot
1ffd775b1d Snap for 5845878 from e229469af3a58bde5be8c81d513d0ac507d22815 to rvc-release
Change-Id: I68b6878a88c51ba4cf946fc483c7cad8462e8ea9
2019-08-31 23:05:55 +00:00
Aurimas Liutikas
a124df140e [automerger skipped] Merge "Add missing nullability annotations." am: 9b361c2674 -s ours am: b3c5131dcb -s ours am: 48d66161b9 -s ours am: f4f18c5a47 -s ours
am: 5403265dc0 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: I917109b14ba43c16af4c5977d8653e38a4900472
2019-08-30 13:03:09 -07:00
Aurimas Liutikas
f4f18c5a47 [automerger skipped] Merge "Add missing nullability annotations." am: 9b361c2674 -s ours am: b3c5131dcb -s ours
am: 48d66161b9 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: If5de5ce42bdec77db69dc229a2f5c7367b28a560
2019-08-30 12:33:40 -07:00
Aurimas Liutikas
48d66161b9 [automerger skipped] Merge "Add missing nullability annotations." am: 9b361c2674 -s ours
am: b3c5131dcb -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: I729acc32ce9625df646bf0a820f9f4d95a9d60cf
2019-08-30 12:08:42 -07:00
Aurimas Liutikas
b3c5131dcb [automerger skipped] Merge "Add missing nullability annotations."
am: 9b361c2674 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 3a78d9db46 is in history

Change-Id: I7b2712e4ab3635f94f8257d88f24c20bc68a3ac0
2019-08-30 11:49:09 -07:00
Aurimas Liutikas
d81733edf9 [automerger skipped] Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be am: 88be2b2667 am: aa02c3d5b8
am: 488d37b2d0 -s ours
am skip reason: change_id I109260842cfc25f06e40694997fcbb4afa02c867 with SHA1 8ff316034a is in history

Change-Id: Ifdf538d94799e4978a0b62fac63bd128fc2e1b5b
2019-08-30 09:04:37 -07:00
Aurimas Liutikas
aa02c3d5b8 Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be
am: 88be2b2667

Change-Id: I202951d51820be47b9195734601830553215bdd7
2019-08-30 08:43:01 -07:00
Aurimas Liutikas
88be2b2667 Merge "Add missing nullability annotations." into stage-aosp-master
am: 85c0a5a2be

Change-Id: Ic9ea2b9840fbb678bbb6ab77038415581feba918
2019-08-30 08:35:52 -07:00
Aurimas Liutikas
8bc65d215c Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:16:24 +00:00
Aurimas Liutikas
8ff316034a Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-29 17:15:44 -07:00
Aurimas Liutikas
3a78d9db46 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:14:44 +00:00
android-build-team Robot
30ebc7aab2 Snap for 5811156 from 17828faf0e87ffbbfa97a979d459ceeaea0e3805 to rvc-release
Change-Id: I55cbae53075652049aabddca428bc3110550d0af
2019-08-17 23:02:26 +00:00
Xin Li
df3d718d4d [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 111584b14c -s ours am: d7dec84e0c am: 52a49fafb8
am: 3716431550 -s ours
am skip reason: subject contains skip directive

Change-Id: I9a9ad1d7396ff0d6ef39ccfb03cd50161e61ea8a
2019-08-15 18:46:30 -07:00
Xin Li
52a49fafb8 [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 111584b14c -s ours
am: d7dec84e0c

Change-Id: Ib875870cdd045beff56e16ff2357df404ae76270
2019-08-15 17:29:17 -07:00
Xin Li
d7dec84e0c [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
am: 111584b14c -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb510ec02656e59b851599f88ae31c6e10377fca
2019-08-15 16:35:23 -07:00
Xin Li
111584b14c DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
Bug: 134405016
Change-Id: I303c0268e8e454b0f0f460eb286812a50c9add88
2019-08-14 12:04:06 -07:00
android-build-team Robot
278f426118 Snap for 5788400 from 2d1d48895d53c2ac62e37f1a79ef3a4ab88d3eaa to rvc-release
Change-Id: Id6ede413206a3aa60e0dc47386a9c9f811b7ab4f
2019-08-08 03:10:49 +00:00
Remi NGUYEN VAN
803a958445 Merge "Extract test utilities for ConnectivityService" am: b7d270a73e am: b374d3953c am: 0e84cb5bfa am: 1563afc646
am: e2967d9830

Change-Id: I0bb8a965d11e9f16ac70f62a2319e1dc8e7544df
2019-08-06 16:31:01 -07:00
Remi NGUYEN VAN
1563afc646 Merge "Extract test utilities for ConnectivityService" am: b7d270a73e am: b374d3953c
am: 0e84cb5bfa

Change-Id: Ib760ef922a440d54bab8c1647d8444ab2a717094
2019-08-06 15:57:04 -07:00
Remi NGUYEN VAN
0e84cb5bfa Merge "Extract test utilities for ConnectivityService" am: b7d270a73e
am: b374d3953c

Change-Id: Idfea637a9fd071c8fa62798bf8e3b9f241bc6348
2019-08-06 15:33:53 -07:00
Remi NGUYEN VAN
b374d3953c Merge "Extract test utilities for ConnectivityService"
am: b7d270a73e

Change-Id: I0ac2a480f961bb6fd1d83dedad6a7942ee03858f
2019-08-06 14:58:43 -07:00
Remi NGUYEN VAN
a18a355536 Extract test utilities for ConnectivityService
The utilities help using ConnectivityService in tests, and will be used
to write integration tests for ConnectivityService.

Test: atest FrameworksNetTests
Change-Id: Ie895ad05139cd5768d3d8a9bd5589d72571f47e6
2019-08-01 16:32:30 +09:00
android-build-team Robot
a9380bb8f7 Snap for 5726925 from 61b85236c9f09813fcb33a11af8e3b20b3f3d7e2 to rvc-release
Change-Id: I8a67d65734e9cbddf53611fe612fe4fa83214614
2019-07-13 23:04:13 +00:00
Xiangyu/Malcolm Chen
6af6fd916e Merge changes from topic "135105735" into qt-r1-dev am: 896cdfa547
am: e0f8c07335

Change-Id: I02bdf3635298cc331e5b3bd794df772b759463ab
2019-07-12 11:03:22 -07:00
Xiangyu/Malcolm Chen
e0f8c07335 Merge changes from topic "135105735" into qt-r1-dev
am: 896cdfa547

Change-Id: Ie661fdc8a29645fa1b319cf1db8a896a8d21deae
2019-07-12 10:43:52 -07:00
Malcolm Chen
5069dbeaab Use new API to get mergedSubscriberIds based on grouping.
In addition, make mMergedSubscriberIds a list to fit usage of multi-SIM
devices.

Bug: 135105735
Bug: 137137221
Test: manual
Change-Id: I364262559789112f35b88f4c298463bf4af2e82a
2019-07-11 13:19:54 -07:00
Xin Li
cc39893d2b [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: a1e7984084 -s ours am: c565453be9 -s ours am: 1f8ab532af
am: 625b0e195b -s ours
am skip reason: subject contains skip directive

Change-Id: I826119b834739848220e8b243e5c1fbe6cbde2a3
2019-07-10 23:24:38 -07:00
Xin Li
625b0e195b [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: a1e7984084 -s ours am: c565453be9 -s ours
am: 1f8ab532af

Change-Id: I96ecd52959d20c7ebbbf662889ea2babd6e21b1b
2019-07-10 22:50:22 -07:00