Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
566,221 Commits 3 Branches 0 Tags
506d5c92c38da970d11fa311dae72bf65b45e84d
Commit Graph

566221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rambo Wang
506d5c92c3 Merge changes from topics "ServiceState#dataRegState", "ServiceState#duplexMode" am: c289c9b0a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636779

Change-Id: Ie585b5c66b4e0f02e712fd4395a4f178ec908cba
 2021-03-24 01:57:17 +00:00
Rambo Wang
b336d92aa7 Public ServiceState#duplexMode in telephony provider am: 4481b5181e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1638159

Change-Id: I97b30b534e5d49078b3841125bbe033d1b370077
 2021-03-24 01:54:44 +00:00
Benedict Wong
cc103b3c7a Merge "Check carrier privilege permissions with package name" am: f1a81b04b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649652

Change-Id: I1f6533951cc30f07bc10ad7355ec1833590ca8db
 2021-03-24 01:51:14 +00:00
Rambo Wang
c289c9b0a2 Merge changes from topics "ServiceState#dataRegState", "ServiceState#duplexMode" 
* changes:
  Export ServiceState#DataRegState into telephony provider
  Public ServiceState#duplexMode in telephony provider
 2021-03-24 01:22:51 +00:00
Benedict Wong
f1a81b04b1 Merge "Check carrier privilege permissions with package name" 2021-03-24 01:19:35 +00:00
Benedict Wong
d68c1f6cb2 Check carrier privilege permissions with package name 
This change ensures that carrier privileges for the right packages are
always checked.

Bug: 183465199
Test: atest FrameworksVcnTests
Change-Id: If46c660e54870529868a7b4b1e271c9009b81d45
 2021-03-23 17:42:12 -07:00
Jordan Liu
52c4c695a8 Merge "Add resource to disable cb" am: d7858116ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650607

Change-Id: I84149e8db1bda3ee432f557ccdf5a5b70bfb7640
 2021-03-23 22:57:32 +00:00
Tianjie Xu
08b5ccae7d Merge "Clear caller id when reading device config" am: d0fe0c721d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651267

Change-Id: I31660fef5e49fe49364d265289aa1633898f85a9
 2021-03-23 22:54:10 +00:00
Jordan Liu
d7858116ca Merge "Add resource to disable cb" 2021-03-23 22:23:19 +00:00
Tianjie Xu
d0fe0c721d Merge "Clear caller id when reading device config" 2021-03-23 22:10:38 +00:00
Treehugger Robot
73ea991b80 Merge changes from topic "audiomanagertest_cts_dnd" am: abffe558e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623839

Change-Id: If541a02594455f78d30a4126396c4aa84fa24b6e
 2021-03-23 21:54:44 +00:00
Francois Gaffie
1b42ecc10a [Notification] Fix Notification channel Dnd bypass for multiusers am: 92a9f5fc1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605518

Change-Id: Icea0d4dd9bec99312c9d5d0b2e8d44d230081eb5
 2021-03-23 21:52:30 +00:00
Treehugger Robot
abffe558e3 Merge changes from topic "audiomanagertest_cts_dnd" 
* changes:
  [Notification] Fix NotificationManagerServiceTest
  [Notification] Fix Notification channel Dnd bypass for multiusers
 2021-03-23 20:48:21 +00:00
John Reck
7427d997f6 Merge "Fix thread-shared field evades lock acquisition reported by Coverity" am: 66fc99d578 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646974

Change-Id: Ie2fe000d93f3edd0e3c8ac0d049850d7c9510c01
 2021-03-23 20:08:12 +00:00
John Reck
66fc99d578 Merge "Fix thread-shared field evades lock acquisition reported by Coverity" 2021-03-23 19:55:30 +00:00
Janis Danisevskis
15d9a3ab42 Merge "Keystore 2.0: Add @IntDef for Keystore namespaces." am: faabd1a836 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649668

Change-Id: Iec2c037edbe72ef678c49e0a2d88d04d8ca98f9d
 2021-03-23 19:50:10 +00:00
Tianjie
18fb750cc5 Clear caller id when reading device config 
Reading the DeviceConfig with the gmscore call id will result in a
security exception.

Also clear the caller identity when before calling into locksettings
to armRebootEscrow. This is inline with the other usage for RoR
preparation.

Bug: 183475757
Test: trigger RoR from gmscore
Change-Id: Ifc65625fc7aba05d016c127cf6672922a5ffb000
 2021-03-23 12:36:14 -07:00
Janis Danisevskis
faabd1a836 Merge "Keystore 2.0: Add @IntDef for Keystore namespaces." 2021-03-23 19:35:00 +00:00
James Lin
5b71319435 Merge "UCE OPTIONS APIs updated" am: fe4b99ee22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649287

Change-Id: I7042e315e506709441f0a906e6085fdbef6ddd92
 2021-03-23 19:19:06 +00:00
Zongheng Wang
52937545e4 Merge "Replace createSmsSubmitPdu with createFromNativeSmsSubmitPdu" am: ab2c1e5777 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649709

Change-Id: I8e87c29326fdfd38f47f9ec04ab371fffdd75ed3
 2021-03-23 19:11:15 +00:00
James Lin
fe4b99ee22 Merge "UCE OPTIONS APIs updated" 2021-03-23 18:47:44 +00:00
Zongheng Wang
ab2c1e5777 Merge "Replace createSmsSubmitPdu with createFromNativeSmsSubmitPdu" 2021-03-23 18:47:36 +00:00
Jack He
c1d92b8ddd Merge "ScanFilter.setDeviceAddress: Should send deviceAddress instead of mDeviceAddress to the next level" am: b4d4127efb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649650

Change-Id: I0d03d4dead5e30072b115feada9c199b15c46897
 2021-03-23 18:06:48 +00:00
Jack He
b4d4127efb Merge "ScanFilter.setDeviceAddress: Should send deviceAddress instead of mDeviceAddress to the next level" 2021-03-23 18:02:22 +00:00
Cody Kesting
c74b9c7ac9 Merge changes from topic "vcn-status-changed" am: 46c10cbc4d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633026

Change-Id: I09c2595dcdc111087894d4c3da95310d9dd91be8
 2021-03-23 17:57:23 +00:00
Cody Kesting
7af706d57d Reevaluate VcnGatewayConnections on receiving new configs. am: 3a51a7d152 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626326

Change-Id: Ifb0216369b5b92b9cfbf2425c80a16afbf23b1fb
 2021-03-23 17:53:12 +00:00
Chen Chen
feab55912c ScanFilter.setDeviceAddress: Should send deviceAddress instead of mDeviceAddress to the next level 
Bug: 183409081
Test: build and run

Change-Id: I2d25d21b0f143fc7362679e0094455c9132fda9d
 2021-03-23 17:43:36 +00:00
Cody Kesting
46c10cbc4d Merge changes from topic "vcn-status-changed" 
* changes:
  Rename VcnStatusCallback#onVcnStatusChanged.
  Reevaluate VcnGatewayConnections on receiving new configs.
 2021-03-23 17:10:51 +00:00
Jordan Liu
61c1f3c415 Add resource to disable cb 
Bug: 176557108
Test: manual
Change-Id: I060836c10b60638e4155670e16cf6475e6740665
Merged-In: I060836c10b60638e4155670e16cf6475e6740665
 2021-03-23 09:54:23 -07:00
Rambo Wang
cff9760e07 Export ServiceState#DataRegState into telephony provider 
Keep ServiceState#getDataRegState hide. Apps can get the same
info from telephony provider without loation permission.

Bug: 182601774
Test: atest com.android.phone.ServiceStateProviderTest
Change-Id: I1ba72a5b767761d2f7bd1b52459a0c9d101061a2
 2021-03-23 09:33:21 -07:00
Rambo Wang
4481b5181e Public ServiceState#duplexMode in telephony provider 
ServiceState#getDuplexMode is a public API. Expose the same
info through telephony provider to let applications retreive
it without location permission.

Bug: 182601774
Test: atest com.android.phone.ServiceStateProviderTest
Change-Id: I19128c938993f351533aca9a8e1a1356e21eb30e
 2021-03-23 09:27:42 -07:00
Francois Gaffie
978bb8f810 [Notification] Fix NotificationManagerServiceTest 
NotificationManagerServiceTest fails (10 failures) when launched
with different user as 0 (e.g. Automotive platform).
Test could be launched with "--user 0" to fix these test or test
can be adapted not to hardcode user id launching these test.

This CL makes the test adapative to the user id launching unit test.

Bug: 178032672

Test: adb shell am instrument -w -e class com.android.server.notification.NotificationManagerServiceTest com.android.frameworks.tests.uiservices

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: I1f124deafd50d257683667ef986b88df1e4b8a75
Merged-in: I1f124deafd50d257683667ef986b88df1e4b8a75
 2021-03-23 15:27:56 +00:00
Francois Gaffie
92a9f5fc1d [Notification] Fix Notification channel Dnd bypass for multiusers 
-Permission granted for a given package using shell cmd (user system)
are not sufficient due to a check of notification uid vs packagepreference uid.

-If the packagepreference is deleted then restored, the channel preference
are not taken into account.

Bug: 178032672

Test: CTS/AudioManagerTest

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: Ia26467f27b31bc048bdb141beac7d764fcb27f51
Merged-in: Ia26467f27b31bc048bdb141beac7d764fcb27f51
 2021-03-23 15:27:24 +00:00
Rambo Wang
11264381a4 Merge "Expose ServiceState#getDataNetworkType in telephony provider" am: 9446a5239f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639370

Change-Id: I15577030238d4e210f1a4f1f31abd937af4adf65
 2021-03-23 14:33:37 +00:00
Junyu Lai
228f0d9782 Merge "Remove the reference of new Network(int) in Vpn.java" am: 4e6166801e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649306

Change-Id: If453ebbf3b2ad8f3165196b84e52aadfcd3c7685
 2021-03-23 14:29:51 +00:00
Rambo Wang
9446a5239f Merge "Expose ServiceState#getDataNetworkType in telephony provider" 2021-03-23 14:26:52 +00:00
Junyu Lai
4e6166801e Merge "Remove the reference of new Network(int) in Vpn.java" 2021-03-23 14:00:35 +00:00
Jack Nudelman
d3b14cf1fe Merge "Require calling package to be allowlisted for thermal mitigation." am: fdad0e26a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634481

Change-Id: I4d0b7864a592a25874f9c3dbb783c4653fa5dd39
 2021-03-23 13:11:00 +00:00
Jack Nudelman
fdad0e26a7 Merge "Require calling package to be allowlisted for thermal mitigation." 2021-03-23 12:53:08 +00:00
Junyu Lai
ca8859da58 Merge "Fix cannot find removeUnwantedCapability on R device" am: 5b477acbbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649302

Change-Id: I11ee0a8d6388f78a9db90756c0cbee93c923e1b8
 2021-03-23 12:46:45 +00:00
Junyu Lai
5b477acbbe Merge "Fix cannot find removeUnwantedCapability on R device" 2021-03-23 12:16:18 +00:00
Chiachang Wang
885aad17b5 Merge "Correct the logic in NetworkCapabilitiesTest" am: 457f91decf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649297

Change-Id: I32bc9ee2db0b192513f782455a91d7336875a039
 2021-03-23 12:07:47 +00:00
Chiachang Wang
457f91decf Merge "Correct the logic in NetworkCapabilitiesTest" 2021-03-23 11:46:31 +00:00
Paul Duffin
e70b70a77b Merge "Remove unnecessary dependency on libcore-platform-compat-config" am: 82cd5382b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646303

Change-Id: I6f407f38de4393a040d92c7073e8d4bacd400fd9
 2021-03-23 11:40:54 +00:00
Chiachang Wang
d99881fb33 Merge "Add NetworkRequest.Builder creating from an existing instance" am: 9327a57876 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649294

Change-Id: Ib990cb25d50c11b103e248c0c13c584e78aa3450
 2021-03-23 11:36:07 +00:00
Treehugger Robot
8d2198902b Merge "Replace hidden API usages of NetworkCapabilities" am: 3972f1c61c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645302

Change-Id: I16b2a1e7aaec191dacbffa077ced459d1024370f
 2021-03-23 11:32:09 +00:00
Paul Duffin
82cd5382b7 Merge "Remove unnecessary dependency on libcore-platform-compat-config" 2021-03-23 11:17:06 +00:00
junyulai
7472deb59b Remove the reference of new Network(int) in Vpn.java 
Test: atest FrameworksNetTests
Bug: 182963397
Merged-In: I4176dd1298ad8d8e8407eb95b2e6cbb8faf4bc17
Change-Id: I4176dd1298ad8d8e8407eb95b2e6cbb8faf4bc17
  (cherry-picked from ag/13959430)
 2021-03-23 10:51:48 +00:00
Chiachang Wang
9327a57876 Merge "Add NetworkRequest.Builder creating from an existing instance" 2021-03-23 10:46:20 +00:00
Treehugger Robot
3972f1c61c Merge "Replace hidden API usages of NetworkCapabilities" 2021-03-23 10:07:46 +00:00