660339 Commits

Author SHA1 Message Date
Meng Wang
23005a10bc New SIMINFO DB columns for phone number
Bug: 193539271
Test: make
Change-Id: I3c152147ebbb73cd8318323e82853ec4e0c88e38
Merged-In: I3c152147ebbb73cd8318323e82853ec4e0c88e38
(cherry picked from commit 50b1bab0d73ea685a7eca10e20c739b93535273a)
2021-12-13 21:15:43 +00:00
Etienne Ruffieux
6123954747 Added SystemApi tag to BLUETOOTH_MAP permission.
In order for Bluetooth to be mainline compliant, we
need to update the hidden BLUETOOTH_MAP permission with
SystemApi tag.

Tag: #feature
Bug: 210470631
Test: build
Change-Id: I2033beafb1d7dda25ddcff1b14893ed576c36991
2021-12-13 19:15:36 +00:00
Treehugger Robot
f9ed5725da Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu" am: 6a8b9f3964
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899035

Change-Id: I658096512da1c4eaa6b60691f6f226b86adb44fe
2021-12-13 15:29:43 +00:00
Treehugger Robot
6a8b9f3964 Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu" 2021-12-13 15:04:23 +00:00
Taras Antoshchuk
59073f0652 Add APIs that allow to exclude routes from VPN
Add new methods to VpnService.Builder that allow to specify network
routes that should bypass the VPN. Implemented by using RTN_THROW
routes.

Bug: 186082280
Test: atest HostsideVpnTests
Test: atest VpnServiceBuilderTest
Change-Id: Ic3b10464a53a8b56334589acec8f27acdc180ff7
2021-12-13 11:11:00 +01:00
hupengcheng
b166fcedac Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest
For dual vibrator device, the AOSP code needs to be adjusted as follow.

Bug: 209932477
Test:
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateComposed
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorIsVibrating
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateMultiThread
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorVibratesNoLongerThanDuration
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateOneShot
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorStateCallback
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratePattern
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratePredefined
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateWaveform
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorCancel

Change-Id: I31afc8179acb4f7749b1208f3abd13a1941a01b2
2021-12-13 09:38:05 +00:00
Remi NGUYEN VAN
2e95b4aaa8 Remove Preconditions, Protocol @hide usage
Remove hidden API usage of the Preconditions and Protocol classes in
NsdManager.

NsdManager does not share its handler with other components, so it does
not need to use specific message IDs from Protocol.
Preconditions can also be easily replaced with stable API alternatives.

Bug: 190249673
Test: atest FrameworksNetTests CtsNetTestCases:NsdManagerTest
Change-Id: Ia173f99b82c90df702291c3690f4a7b047e90daa
2021-12-13 17:37:02 +08:00
paulhu
474a8aaffc Register NSD service from ConnectivityFrameworkInitializerTiramisu
INsdManager is going to move into connectivity mainline module
and it will be not visible to SystemServiceRegistry after
migration done. Thus, use ConnectivityFrameworkInitializerTiramisu
to register NSD service instead.

ConnectivityFrameworkInitializerTiramisu will be implemented in
the framework-connectivity-tiramisu bootclasspath JAR, which need
to be separated from the S+ framework-connectivity bootclasspath
JAR to be only loaded by the module on T+. So its methods cannot
be in the same class as ConnectivityFrameworkInitializer.

Bug: 206702844
Test: atest FrameworksNetTests CtsNetTestCases
Merged-In: Ibf89ab9a35e35dac4978ba70c7ab306b6155a4a3
Change-Id: Ibf89ab9a35e35dac4978ba70c7ab306b6155a4a3
2021-12-13 15:33:03 +08:00
Junyu Lai
9d08a3ff2a [MS03] Remove ServiceNotFoundException hidden API usage
Since ServiceNotFoundException is not a system API. Remove
the unsupported interface which uses this exception.
This is safe since the method annotated with maxTargetSdk = R
and from dashboard it is not using by anybody.

Test: TH
Bug: 204830222
Change-Id: Ib8c0ce7b165732d24929851792d35371b90a5dfc
2021-12-13 06:26:07 +00:00
Himanshu Rawat
2da9375710 Global settings for Bluetooth (Settings.Global.BLUETOOTH_ON) must be set to BLUETOOTH_ON_BLUETOOTH whenever non-BLE MESSAGE_ENABLE is handled irrespective of the state.
Bug: 208777033
Test: Manual
Change-Id: I5b0460f7741cc80fae367bc1cbf4602087a10975
2021-12-13 03:29:14 +00:00
Hyunho
ebc8bf6daa IMS RCS UCE API Improvement
Changed API to receive uid as parameter when registering PublishStateCallback

Bug: b/203406296
Test: atest UceControllerManagerTest
Change-Id: I6f204b8875e0ae8cd4312cf9938ea9d673b31016
Merged-In: I6f204b8875e0ae8cd4312cf9938ea9d673b31016
2021-12-11 05:43:54 +00:00
joonhunshin
8aa17355a3 Support RCS master switch
Add flag which indicate RCS enable or disable by user in
RcsClientConfiguration class

BUG: b/202892135
Test: cts CtsTelephonyTestCases:RcsClientConfigurationTest
Change-Id: Ic4397cb167f38602883ba939b75e109edccfb028
Merged-In: Ic4397cb167f38602883ba939b75e109edccfb028
2021-12-11 03:54:13 +00:00
Junyu Lai
895f993439 Merge "[MS01] Move NetworkTemplate cloud backup functions to NetworkPolicy" am: 40eb40302d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878037

Change-Id: I86a23381b25fba2512c2ad1d3ffeb60d12947202
2021-12-10 22:30:19 +00:00
Junyu Lai
40eb40302d Merge "[MS01] Move NetworkTemplate cloud backup functions to NetworkPolicy" 2021-12-10 22:14:42 +00:00
Treehugger Robot
6d0a6803c9 Merge changes from topic "ms07-movestats" am: 942c713c9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895044

Change-Id: I85d704b09dac07e91b8400a2bbd15867e2b80d6d
2021-12-10 18:57:08 +00:00
Andy Hung
27383c906c Merge "SoundPool: Update queue only if streamID matches" am: f0f20c17e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905390

Change-Id: I2050c35086bf0bd3af5c600d06f399ead24417b3
2021-12-10 18:49:07 +00:00
Treehugger Robot
942c713c9d Merge changes from topic "ms07-movestats"
* changes:
  [MS07.1] Move NetworkStatsCollection/IdentitySet into frameworks
  [MS08] Move NetworkStats files to f/b/package/ConnectivityT
2021-12-10 18:48:52 +00:00
Andy Hung
f0f20c17e0 Merge "SoundPool: Update queue only if streamID matches" 2021-12-10 18:35:06 +00:00
Junyu Lai
650ee7a1d1 [MS01] Move NetworkTemplate cloud backup functions to NetworkPolicy
Since NetworkTemplate will be moved into the mainline module.
It is necessary to remove hidden BackupUtil usage from
NetworkTemplate. Also, it is also a hazard to maintain
compatibility for byte buffer interfaces.

Thus, move out these cloud backup functions to NetworkPolicy
to address these concerns.

Test: atest NetworkPolicyTest NetworkPolicyManagerServiceTest
Bug: 204830222
Change-Id: I3ec55f7e419ea13db535acff2457d8e7aaebdce8
2021-12-10 16:11:09 +00:00
Junyu Lai
fa86f6ab34 [MS07.1] Move NetworkStatsCollection/IdentitySet into frameworks
These files are needed for the data migration util system Api
interfaces to allow OEMs to construct NetworkStats* objects.
Thus, they need to be moved into android.net package, and some
of them will be exposed as @SystemApi in T.

Eventually these classes will be moved into the Connectivity
module, but in the mean time they will be temporarily moved to
f/b/package/ConnectivityT for the preparation stage.
However, the tests are already in the module. Therefore for
the S-derived branch, the test cannot see the renamed classes
since any framework CLs will not be auto-merged into this branch.
Thus, the tests need to stay disabled on the S-derived branch,
and will be re-enabled after all files are moved into the module.

Test: TH
Bug: 197717846

Change-Id: I95278a99cf2437ada28001161ceea17a1d32f2a4
2021-12-10 16:11:08 +00:00
Junyu Lai
d82296cf33 [MS08] Move NetworkStats files to f/b/package/ConnectivityT
NetworkStatsService is going to be moved into ConnectivityService
module. Move all related files to packages/ConnectivityT so that
it can be easily migrate these files to connectivity module
after clearing the hidden API usages.

Bug: 197717846
Test: TH
Change-Id: Iead00832b5eb7b1dc40a92027c5a14ae8316b16c
2021-12-10 16:11:08 +00:00
Zhomart Mukhamejanov
daa3f0519a Merge "Add javadoc to NetworkStats related classes." am: e51a1d0254
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1917019

Change-Id: Ic92ff264664e714cdcf0a8deadf0e9a254ce752e
2021-12-10 15:39:26 +00:00
Zhomart Mukhamejanov
e51a1d0254 Merge "Add javadoc to NetworkStats related classes." 2021-12-10 15:21:07 +00:00
Sorin Basca
8c95814002 Merge "Updating locked_region_code_injection to use ASM7" am: 96bbb00369
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250

Change-Id: Id20e3b36b6bbd23c6415b01cb58ef55b362242e6
2021-12-10 14:21:24 +00:00
Sarah Chin
5a5f5556a7 Add new fields to ApnSetting/DataProfileInfo
Add fields for lingering bearer bitmask and is always on
Update values for MTU V4 and MTU V6

Test: atest DataProfileTest
Bug: 198822816
Change-Id: Ia007f22a5c976fa139e61d981779a65b5e3ffd3e
Merged-In: Ia007f22a5c976fa139e61d981779a65b5e3ffd3e
2021-12-10 06:20:15 -08:00
Sorin Basca
96bbb00369 Merge "Updating locked_region_code_injection to use ASM7" 2021-12-10 13:57:51 +00:00
Himanshu Rawat
fcfa8b5345 Merge "Corrected comment on when BT is not disabled on entering airplane mode." am: 2a1dc3a8e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1916077

Change-Id: Ia8b880bf0220f915214ce98b3d55e04d65bf416a
2021-12-10 08:14:36 +00:00
Himanshu Rawat
2a1dc3a8e9 Merge "Corrected comment on when BT is not disabled on entering airplane mode." 2021-12-10 07:57:09 +00:00
Zhomart Mukhamejanov
4de1f6f5a6 Add javadoc to NetworkStats related classes.
Bug: n/a
Test: n/a
Change-Id: If7f4d68ea89adbcbc02c1e0a06a11f6330f5d8f3
2021-12-09 21:28:05 -08:00
Aaron Huang
c7b4a75b30 Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT" am: 610b585502
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914528

Change-Id: I9675aa02c8271ecc9d8d11c5cb544f56d8ff1f93
2021-12-10 02:30:08 +00:00
Treehugger Robot
d954a3dd2a Merge "Change isCISCentralSupported() to isLeAudioSupported() API" am: 62749e874a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906211

Change-Id: If15e595027c27dbd52c24795fa4e417fff83ca1a
2021-12-10 02:29:44 +00:00
Aaron Huang
610b585502 Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT" 2021-12-10 02:12:38 +00:00
Treehugger Robot
62749e874a Merge "Change isCISCentralSupported() to isLeAudioSupported() API" 2021-12-10 02:10:42 +00:00
Treehugger Robot
425b8699bb Merge "Don't require T to extend Parcelable or Serializable in Parcel" am: 6a2f196dca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914047

Change-Id: Ie78e98103a3313414fbef82a808e2a0b3fdeba91
2021-12-10 00:11:01 +00:00
Treehugger Robot
6a2f196dca Merge "Don't require T to extend Parcelable or Serializable in Parcel" 2021-12-09 23:48:45 +00:00
Evgenii Stepanov
215b89a5c4 Merge changes Ibf64db88,I033ee79c am: 689bba18b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1915510

Change-Id: I5558464cf53cdbab4241706eb62c5fcc3a91afaf
2021-12-09 21:24:39 +00:00
Evgenii Stepanov
689bba18b3 Merge changes Ibf64db88,I033ee79c
* changes:
  Pass MTE RuntimeFlags to AppZygote.
  Revert "Pass MTE RuntimeFlags to AppZygote."
2021-12-09 20:52:08 +00:00
Etienne Ruffieux
320e2a12de Merge "Added missing equals override in new Transport Data classes" am: e97c024d9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1913506

Change-Id: I6fcda04bc055fbe4f416322948f07adce05b48a4
2021-12-09 18:45:46 +00:00
Etienne Ruffieux
e97c024d9a Merge "Added missing equals override in new Transport Data classes" 2021-12-09 18:26:45 +00:00
Cole Faust
b691d9ce36 Merge "Add instructions on how to annotate an AIDL interface" am: b6df9fb2e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1912992

Change-Id: Ibb49b112a88bbd866b5fd32be86a0961fbfa4531
2021-12-09 18:14:46 +00:00
Andy Hung
151117ec0b SoundPool: Update queue only if streamID matches
SoundPool API commands are based on an atomic
compare-StreamID if match then operate (see compare-exchange).

Test: soundpool_stress
Test: atest SoundPoolAacTest
Test: atest SoundPoolHapticTest
Test: atest SoundPoolMidiTest
Test: atest SoundPoolOggTest
Bug: 201233890
Bug: 201262390
Change-Id: I63cc07d581a0ac1d5440852bfe0c75edc9d73e75
2021-12-09 10:03:26 -08:00
Cole Faust
b6df9fb2e8 Merge "Add instructions on how to annotate an AIDL interface" 2021-12-09 17:52:31 +00:00
Hao Ke
31fa514400 Don't require T to extend Parcelable or Serializable in Parcel
This is because we want to support the use-case where the caller
enforces a specific class type that doesn't implement Parcelable
or Serializable but the child classes written on the payload implement them.

One such use-case that needs this before migrating is
https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/com/android/internal/infra/AndroidFuture.java;l=596;drc=2d6a545e3042d7cc91b54746e774681a05e0ff22:
we need to enforce Throwable class but it doesn't implement Parcelable itself,
while its children written on the wire are expected to.

Test: atest -d android.os.cts.ParcelTest
Bug: 195622897
Change-Id: I150416d0cfb0b87ddbaff1041d8d60aa205f6f39
2021-12-09 15:40:04 +00:00
Aaron Huang
127b4ccee5 Merge "Create ConnectivityT directory" am: 43981a856d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914534

Change-Id: I28470c62f728e39a093c76ebdfed6f071bbe819b
2021-12-09 11:42:02 +00:00
Aaron Huang
43981a856d Merge "Create ConnectivityT directory" 2021-12-09 11:03:45 +00:00
Bernardo Rufino
91e53b04aa Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)" am: 2ee662c767
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910046

Change-Id: I3f12c9a32b1b2146ec83f0a04eb5768cafd2eecd
2021-12-09 10:54:30 +00:00
Bernardo Rufino
2ee662c767 Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)" 2021-12-09 10:35:34 +00:00
Victor Chang
4bd88f5cd6 Merge changes from topic "icu70" am: da0880a0fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914692

Change-Id: Ibbdc18a918397f831eac512394bd31e9f1038c18
2021-12-09 10:20:52 +00:00
Victor Chang
da0880a0fe Merge changes from topic "icu70"
* changes:
  Update DateIntervalFormatTest due to ICU 70 data change
  Regenerate LocaleDataTables.cpp due to ICU 70 upgrade
2021-12-09 10:03:02 +00:00
Aaron Huang
185b02f1bc Move f/b/packages/Nsd files to f/b/packages/ConnectivityT
Move Nsd files to ConnectivityT so that nsd, ipsec,
ethernet and netstats files can live in the same
directory and it will be easier to move everything
in frameworks/base/packages/ConnectivityT to
packages/modules/Connectivity after fixing all of the
hidden API usages.

Bug: 204153604
Test: FrameworksNetTests
      CtsNetTestCases
Change-Id: I411e242e8739d15920cfc2fe274115f7f39bd89f
2021-12-09 16:22:00 +08:00