660308 Commits

Author SHA1 Message Date
Xin Li
72996f0670 Merge Android 12 QPR1
Bug: 210511427
Merged-In: Ibcfed4617dcaea3b81e5d3a3eb68e6494488c7f7
Change-Id: I43f94bca1c8db649bec91e0de1bd41c89ba8f1f7
2021-12-14 08:39:06 -08:00
William Escande
9bb1c2b1bf Pbap use profileConnector, resolveSystemService api fix
* All profiles use the BluetoothProfileConnector but not Pbap.
I reproduced the changes that were made in aosp/932813 for all other
profiles. This allow pbap to no longer call resolveSystemService.
* `Intent.resolveSystemService` is an hidden API and can no longer be
called from Bluetooth as we aim to become mainline. It's code is simple
enough to be copied.

Tag: #refactor
Bug: 200200870
Test: atest BluetoothInstrumentationTests
Merged-In: I838b910c633b3ca943fec01f3ccca466ff65f892

Change-Id: I838b910c633b3ca943fec01f3ccca466ff65f892
2021-12-14 16:01:01 +00:00
William Escande
634326680c Copy attributable to Bluetooth
Attributable is called by bluetooth and it's hidden.
By copying into bluetooth we are now allowed to call it
Bug: 210467788
Test: build
Tag: #refactor

Change-Id: I73ea07c9439988ab5477c82799f718c6d81513be
2021-12-14 16:22:07 +01:00
Alex Buynytskyy
99ada16f28 Merge "Allow shell/CTS to be package verifier." 2021-12-14 14:32:50 +00:00
Treehugger Robot
58093bfdec Merge "Move IpSec associated files to f/b/packages/ConnectivityT" 2021-12-14 08:28:46 +00:00
Jing Ji
09dcdad5eb Add settings to toggle the phantom process monitoring in dev options
For power users, the monitoring on phantom processes could be turned
off from the Settings->Developer Options->Feature flags.

Bug: 210353231
Bug: 205156966
Test: Manual
Test: atest AppChildProcessTest
Test: atest CtsAppTestCases:ActivityManagerTest
Change-Id: I05f5b43e281b98676c615d350c213620d3d72b5c
Merged-In: I05f5b43e281b98676c615d350c213620d3d72b5c
2021-12-14 06:42:43 +00:00
Aaron Huang
69faf5526d Refactor IpSecServiceConfiguration to Dependencies
IpSecService is going to be moved into ConnectivityService module,
so the hidden API usage should be removed.

NetdService.getNetdInstance is a hidden API, therefore the alternative
is to get the instance by Context.getSystemService.

Bug: 204153604
Test: FrameworksNetTests

Change-Id: I1bd8efc03c37654d12a8eadd3e78ed45e10b5691
2021-12-14 14:39:42 +08:00
Aaron Huang
2e19b7c297 Fix style errors for IpSec associated files
Bug: 204153604
Test: build pass.
Change-Id: I940de8bef7f693dcce8808148a975bea1f36712c
2021-12-14 14:36:59 +08:00
chenxinyu
a6c3e088c6 Delete skipCallbacks when Exception dispatchInputEvent beacuse calling finishInputEvent twice will cause 'Native Crash'
If there is an exception, finishInputEvent method will be called, then NativeInputEventReceiver also send finish signal,will cause a native crash,'Abort message: 'Could not find consume time for seq=xxxx'

[1] https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/jni/android_view_InputEventReceiver.cpp;l=441?q=InputEventRe&ss=android%2Fplatform%2Fsuperproject:frameworks%2F
[2] https://cs.android.com/android/platform/superproject/+/master:frameworks/native/libs/input/InputTransport.cpp;l=1259?q=InputTRAN&ss=android%2Fplatform%2Fsuperproject:frameworks%2F

Signed-off-by: chenxinyu <chenxinyu7@xiaomi.com>
Change-Id: Ib834e2a960741f7fa33a0661c67f305af0db517a
Merged-In: Ib834e2a960741f7fa33a0661c67f305af0db517a
2021-12-14 06:24:23 +00:00
Aaron Huang
a09ac8b57b Move IpSec associated files to f/b/packages/ConnectivityT
IpSecService is going to be moved into Connectivity mainline module.
Move all ipsec associated files to packages/ConnectivityT so that
it can be easily migrate these files to connectivity module after
clearing the hidden API usages.

Bug: 204153604
Test: build pass
      FrameworksNetTests
      CtsNetTestCases
Change-Id: I562b47f18e345988a2638cf886f86818f9144b91
2021-12-14 14:06:44 +08:00
Tej Singh
9622192b37 Create cpp aidl_interface for libstatsbootstrap
Create aidl_interface for files needed for libstatsbootstrap.

Bug: 206644307
Test: manually verified atoms could be logged
Change-Id: Ic970e99b588c9e1494a390f6c18e7925e199d5a4
2021-12-13 19:12:12 -08:00
Treehugger Robot
14c8d5f0a6 Merge "ImsServiceEntitlement default values missing" 2021-12-14 03:09:15 +00:00
Paul Hu
5b78f171ec Merge "Remove Preconditions, Protocol @hide usage" 2021-12-14 02:52:11 +00:00
Alex Buynytskyy
b4dc01e32a Allow shell/CTS to be package verifier.
Bug: 204810986
Test: device boots
Test: atest PackageManagerShellCommandTest ChecksumsTest
Change-Id: I0b379714a946c18afdeca4ec02469d26646544df
2021-12-14 01:18:16 +00:00
Ady Abraham
3e7b0969ab RefreshRatePolicy: set both min and max refresh rate when camera is used
If app is using Camera, we set both the min and max refresh rate to the camera's
preferred refresh rate to make sure we don't end up with a refresh rate lower
than the camera capture rate, which will lead to dropping camera frames.

Bug: 206056272
Change-Id: I5b6c49242fb6b87d662d26a29b2f159c052d386c
Test: android.hardware.cts.CameraGLTest
2021-12-13 23:55:04 +00:00
Meng Wang
ea1adfc0e5 ImsServiceEntitlement default values missing
ImsServiceEntitlement.* configs and their default values
were added in S at
commit e600a8e4e8615410f2f45a4c35f2250d6b1b32b1.

Somehow the default values are missing now. Add back.

Bug: 210485357
Change-Id: I98d943394ed308956c5271b8efaa5094d15dc8ca
Merged-In: I98d943394ed308956c5271b8efaa5094d15dc8ca
(cherry picked from commit 33c6221c5bf0bf966cd6f2da956c1b566be54ce4)
2021-12-13 23:35:41 +00:00
Hui Wu
a6324ff99e Add new MANAGE_CLOUDSEARCH permission for the cts test
Bug: 210528288
Test: cts test runs only with this CL
Change-Id: Ie4d262beb3b5054f4a9cf26001113ceabb5d793e
2021-12-13 23:30:47 +00:00
Etienne Ruffieux
655d7f9857 Merge "Added SystemApi tag to BLUETOOTH_MAP permission." am: e44cf60fe5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918634

Change-Id: Ibcfed4617dcaea3b81e5d3a3eb68e6494488c7f7
2021-12-13 23:03:44 +00:00
Etienne Ruffieux
e44cf60fe5 Merge "Added SystemApi tag to BLUETOOTH_MAP permission." 2021-12-13 22:42:44 +00:00
Rahul Sabnis
ac6e0c91b3 Remove unused references to android.app.ActivityThread in
BluetoothAdapter

Tag: #feature
Bug: 210468546
Test: Manual
Change-Id: Ia473afe6bcf4d0824e2fd2c6ca2ce562d0ecbde3
2021-12-13 14:32:46 -08:00
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