27103 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
349a19d904 Merge "Remove @ModemCount enum definitions." 2020-04-07 23:45:33 +00:00
Xiangyu/Malcolm Chen
beccb937dd Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." 2020-04-07 23:45:00 +00:00
Eric Laurent
f340f3a01d Merge changes I3aab572e,Iff9abda2
* changes:
  [AudioServer][Strategies] Fix Min/Max index overwritting
  AudioSystem: add annotation on API used by CTS media
2020-04-07 21:08:45 +00:00
François Gaffie
adcbf9004a AudioSystem: add annotation on API used by CTS media
Add @TestApi for the class so some methods and
constants can be visible to test API.
  Also @hide for all other members of the class
that are not @TestApi, as they are exposed to the
test API visibility.

Bug: 136121584
Test: run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioProductStrategyTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupChangeHandlerTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testPermissionsForVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateProductStrategies
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateVolumeGroups
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributesWithInvalidAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testVolumeGroupCallback
Signed-off-by: François Gaffie <francois.gaffie@renault.com>

Change-Id: Iff9abda2cf971d9c234dcf7df7c2b9a4ad5294c3
Merged-In: Iff9abda2cf971d9c234dcf7df7c2b9a4ad5294c3
2020-04-07 18:07:26 +00:00
Daniel Bright
30970c1745 Merge "Remove simColors from public.xml and rename" 2020-04-06 19:49:55 +00:00
Malcolm Chen
4c96811356 Remove @ModemCount enum definitions.
Per API council's feedback, they are not needed. Replacing enums
with integers 0, 1, 2, 3.

Bug: 143652732
Test: build
Change-Id: Id9e87ea28a2f31e1aa842424770096e16f1cb208
Merged-In: Id9e87ea28a2f31e1aa842424770096e16f1cb208
2020-04-02 15:33:57 -07:00
Chalard Jean
90c292b13e Merge changes from topics "api-fix-networkagent", "satisfiedby"
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
2020-04-02 05:51:02 +00:00
Malcolm Chen
1cae35384b Hide APIs exposed for Telephony mainline which is no longer needed in R.
The APIs were added in b/144351078, b/148097978 and b/148116922.
b/151665796 is used to revert them.

Bug: 151665796
Bug: 144351078
Bug: 148097978
Bug: 148116922
Test: build
Change-Id: I08db8c5c0161747a7e775a8de0daa7077b513f10
Merged-In: I08db8c5c0161747a7e775a8de0daa7077b513f10
2020-04-01 12:46:51 -07:00
Brad Ebinger
c1d954c78e @hide some APIs that will not be used in Android R
Bug: 147319232
Bug: 148123085
Bug: 147732815
Test: atest CtsTelephonyTestCases
Merged-In: I623e52432fc820d302fcdbdb9a88a37deed455ae
Change-Id: I623e52432fc820d302fcdbdb9a88a37deed455ae
2020-04-01 10:58:42 -07:00
Daniel Bright
7abd26ae78 Merge "Undo isDataCapable as Public API" 2020-04-01 16:37:35 +00:00
Daniel Bright
1656c8f186 Merge "Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult" 2020-04-01 16:36:58 +00:00
Mohammad Islam
cf2865a167 Merge changes from topics "abort-individual-session", "apk-checkpoint", "rebrand-to-revert", "supportsCheckPoint"
* changes:
  Enable filesystem checkpoint for staged apk installation
  Allow staging multiple sessions with non-overlapping packages (apk+apex)
  Replace abortActiveSession in StagingManager with revertActiveSessions
  Allow StagingManager to abort individual staged session
  Prevent staging multiple sessions on devices not supporting checkpoint
  Rebrand the term "rollback" to "revert" for apexd
2020-04-01 13:05:58 +00:00
Chalard Jean
3d223986a6 Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
Merged-In: I076876a6662bde143ef7d315ce3767acafff93c1
2020-04-01 20:38:30 +08:00
Chalard Jean
47ce6894cc Address further API council comments.
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Copy from ag/10866511
Change-Id: I8a785ae0e74e659c317deaaa28c203356c7766ed
Merged-In: I8a785ae0e74e659c317deaaa28c203356c7766ed
2020-04-01 16:01:04 +08:00
Aaron Huang
e99aa91e87 Merge changes from topics "networkagent_api", "networkprovider_api"
* changes:
  Update the NetworkProvider API for council comments
  Update NetworkAgentConfig API for council comments
  Update the NetworkAgent API for council comments
2020-04-01 05:33:28 +00:00
Sarah Chin
c9252b3591 Merge "Unexpose getDataRoamingFromRegistration API" 2020-03-31 23:44:35 +00:00
Sarah Chin
8e1c444d07 Merge "API Review: rename isGlobalModeEnabled" 2020-03-31 23:02:20 +00:00
Sarah Chin
2827393816 Merge "Un-deprecate SmsManager APIs" 2020-03-31 22:59:53 +00:00
Sarah Chin
96d59d7532 Merge "Add method to reset network types" 2020-03-31 22:02:20 +00:00
Daniel Bright
476f3dabf1 Remove simColors from public.xml and rename
* Renaming simColors back to sim_colors
* Remove simColors from public.xml
* Rename in symbols.xml

Bug: 143289541
Test: make
Merged-In: Ida5aafb2db2b47ac5fb0ac098927c0801a717d9b
Change-Id: Ida5aafb2db2b47ac5fb0ac098927c0801a717d9b
2020-03-31 14:12:11 -07:00
Daniel Bright
21a5e8f7a1 Undo isDataCapable as Public API
Test: make
Bug: 146206136
Change-Id: I8b6a7e001c114df5e90668738b2a2b978e8757fa
Merged-In: I8b6a7e001c114df5e90668738b2a2b978e8757fa
2020-03-31 20:54:22 +00:00
Daniel Bright
d410dc38e7 Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult
Fully rolled back comments and signature to original state before change

Test: bootup phone
Bug: 147854704
Change-Id: I5fcd71e1569e6b0e16cff5392239b89259ee1790
Merged-In: I5fcd71e1569e6b0e16cff5392239b89259ee1790
2020-03-31 20:53:54 +00:00
Sarah Chin
44f5fa209e Un-deprecate SmsManager APIs
MmsManager methods were removed for mainline, so unexposing these

Test: build
Bug: 144004293
Change-Id: I9714719f2d922cb027fa42a1aa535006dce7342c
Merged-In: I9714719f2d922cb027fa42a1aa535006dce7342c
2020-03-31 13:13:37 -07:00
Sarah Chin
bab3e662df Add method to reset network types
Test: build
Bug: 148218045
Change-Id: Ia6eaba4e40fe47e79f8a7b6bcbadc61151d84823
Merged-In: Ia6eaba4e40fe47e79f8a7b6bcbadc61151d84823
2020-03-31 12:57:03 -07:00
Sarah Chin
5fe2615046 Remove Mainline APIs for MmsManger and TelephonyManager
Test: build
Bug: 144004293
Bug: 147611125
Change-Id: I44682d1f33eee02d1dcf57f4de8ce2df0a9b126d
Merged-In: I44682d1f33eee02d1dcf57f4de8ce2df0a9b126d
2020-03-31 12:47:46 -07:00
Chalard Jean
8c56272f68 Update the NetworkProvider API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Copy from ag/10826397
Change-Id: I6b086572cfc72a0727f4510351cff0e74cbc4302
Merged-In: I6b086572cfc72a0727f4510351cff0e74cbc4302
2020-03-31 11:57:59 +00:00
Chalard Jean
d670534507 Update NetworkAgentConfig API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Copy from ag/10826396
Change-Id: Idca9f243a5c955f4caa30921ee520e1a93b0d11a
Merged-In: Idca9f243a5c955f4caa30921ee520e1a93b0d11a
2020-03-31 11:51:05 +00:00
Chalard Jean
d2b02d4c1c Update the NetworkAgent API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Copy from ag/10824609
Change-Id: I9a2691f783f4449348c3f767568e05620f0b9df5
Merged-In: I9a2691f783f4449348c3f767568e05620f0b9df5
2020-03-31 11:34:42 +00:00
Amit Mahajan
decc3085a1 Merge "Remove @SystemApi from some constants for R." 2020-03-30 19:48:35 +00:00
Remi NGUYEN VAN
c6ab1a994f Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
Amit Mahajan
1c87deaacf Remove @SystemApi from some constants for R.
These were exposed for telephony mainline. Will be revisited in S.

Test: basic sanity
Bug: 148171847
Bug: 148171388
Merged-in: Ibdcac557cf35e723f09a7b7a2e59c7deae1fc94e
Change-Id: Ibdcac557cf35e723f09a7b7a2e59c7deae1fc94e
(cherry picked from commit c55b01552e72f2c908e0b99f74a3aecfacb6a9f9)
2020-03-27 17:38:33 -07:00
Aaron Huang
79c8147678 Merge "API review: access field by method" 2020-03-27 07:03:25 +00:00
Mohammad Samiul Islam
8c7142a658 Prevent staging multiple sessions on devices not supporting checkpoint
Bug: 141843321
Test: atest StagedInstallTest#testFailStagingMultipleSessionsIfNoCheckPoint
Change-Id: I118ae628649e9bef82641ef18841205091e98a6a
Merged-In: I118ae628649e9bef82641ef18841205091e98a6a
(cherry picked from commit cc4c7d8cc69a90762e88d307fed3331322385cc6)
2020-03-26 10:41:19 +00:00
Aaron Huang
acacd7190f Merge "Remove Context.NETWORK_POLICY_SERVICE from @SystemApi" 2020-03-26 06:48:51 +00:00
Sarah Chin
b93bf72090 Merge "API review: SubscriptionPlan#getNetworkTypes/setNetworkTypes" 2020-03-26 03:41:29 +00:00
Sarah Chin
a0e42af02c Merge "API review: setNetworkSelectionModeManual" 2020-03-26 02:19:57 +00:00
Sarah Chin
25e0cdc02a Merge "Revert "Expose hidden resources used in telephony/common"" 2020-03-26 02:19:36 +00:00
Sarah Chin
8c346470bd Merge "Unexpose unnecessary SysUI APIs" 2020-03-26 02:18:59 +00:00
Nathan Harold
388069c6c0 Merge "Convert getBands() to int[] from List<Integer>" 2020-03-26 01:32:54 +00:00
Brad Ebinger
e5c083c3ec Merge "Add new capability polling opt-in intent" 2020-03-25 23:13:03 +00:00
Shuo Qian
0d8a3bb0f6 Merge "Hide several System APIs" 2020-03-25 23:11:27 +00:00
Treehugger Robot
f1c0350c88 Merge "Hide startTethering with type function to module-lib only" 2020-03-25 08:53:02 +00:00
markchien
71a9d6f1c3 Hide startTethering with type function to module-lib only
Bug: 151918384
Test: m
Change-Id: Icef8b363aae97dd020d618bcb397f661aa6c4750
Merged-In: Icef8b363aae97dd020d618bcb397f661aa6c4750
2020-03-25 08:07:01 +00:00
Chalard Jean
9274cc5057 Create a builder for NetworkCapabilities.
Bug: 151322799
Test: FrameworksWifiTests
Change-Id: I69c00c9e3963950e55d7105d8825f7d3a3ec9b2f
Merged-In: I06eb97e50d5583579b3c26d1365d2dbaec8bfc99
(cherry picked from commit 9771f34dae9cdeb857636cac2b3c2d473713914e)
2020-03-25 13:27:04 +09:00
Chalard Jean
b2b692e157 Merge "Expose netId by adding getter API" 2020-03-25 02:23:03 +00:00
sqian
bc1f641138 Hide several System APIs
Test: Treehugger
Bug: 151241308
Change-Id: Ie611320f4651b83e0ced6f5c8fede34a8a0a41c1
Merged-In: Ie611320f4651b83e0ced6f5c8fede34a8a0a41c1
(cherry picked from commit 1e154a345c6ad62f84547ae27c70c24d2cfa0dcb)
2020-03-24 18:40:23 -07:00
Brad Ebinger
beb6c846ec Add new capability polling opt-in intent
Adds a new capability discovery opt-in intent,
which an application can use to prompt the user
to enable contact discovery.

Bug: 111305845
Test: atest CtsTelephonyTestCases; telecom test app
Merged-In: I42b9d7226a1296bc7e4e86a5ff6448bc8f23d3c0
Change-Id: I42b9d7226a1296bc7e4e86a5ff6448bc8f23d3c0
2020-03-24 15:10:34 -07:00
Treehugger Robot
7820030367 Merge "Allow staging multiple session with non-overlapping packages (apk-only)" 2020-03-24 16:53:39 +00:00
Aaron Huang
8e1ce70353 API review: access field by method
- InvalidPacketException, public field should be a method so
  add getter to get error code.
- KeepalivePacketData, public fields should be methods so
   add getter for fields.

Bug: 151322799
Test: atest FrameworksNetTests
      atest FrameworksWifiTests
      atest FrameworksTelephonyTests: some failure in CarrierAppUtilsTest
Copy from ag/10731108
Change-Id: Id01e6135193716cc21bba11da529bf1507a954f7
Merged-In: Id01e6135193716cc21bba11da529bf1507a954f7
2020-03-24 10:55:18 +00:00
Aaron Huang
52e578700c Remove Context.NETWORK_POLICY_SERVICE from @SystemApi
Hide Context.NETWORK_POLICY_SERVICE as it has no usage.

Bug: 151266974
Test: make checkapi, build
Copy from ag/10796415
Change-Id: I0586a5ef22f76fa1407219b96cb246f162f02947
Merged-In: I0586a5ef22f76fa1407219b96cb246f162f02947
2020-03-24 10:52:42 +00:00