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

566249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Janis Danisevskis
bbc3e7552a Merge "Keystore 2.0: Add onDeviceOffBody to AndroidKeyStoreMaintenance." am: e36f515441 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651545

Change-Id: I8f32ec1e083dc17d51911d6a493c7a74a32e8cea
 2021-03-24 18:39:28 +00:00
Janis Danisevskis
e36f515441 Merge "Keystore 2.0: Add onDeviceOffBody to AndroidKeyStoreMaintenance." 2021-03-24 18:32:35 +00:00
Yi Kong
5411289db2 Merge "profcollect: Broadcast intent when a profile report is ready to upload" am: 096f175b7f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649299

Change-Id: Ib99f51c22253a26b28f2f23565530a85c1a60e00
 2021-03-24 18:31:28 +00:00
Jayachandran Chinnakkannu
3e7751c427 Merge "Add 5G/NR QOS support" am: bd3a33ed9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762

Change-Id: Icd4c21b9731256c9b3d39bffc5fddc43276c5fda
 2021-03-24 18:26:19 +00:00
Treehugger Robot
de806ecda0 Merge "DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters" am: 59035dd21c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646730

Change-Id: Id5cd1023f628ed4274755bbc0d78aeaedfa89b8f
 2021-03-24 18:22:27 +00:00
Wonsik Kim
309d58c0cb DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters am: 197e1a7f5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646730

Change-Id: I741906abf08c9cec198478d50662cdba94580f95
 2021-03-24 18:17:43 +00:00
Treehugger Robot
13b4d67d40 Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: 8c03c2a82e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532

Change-Id: If272068940e9a06efbb40149e2b4dd5fbb1185d6
 2021-03-24 18:13:19 +00:00
Yi Kong
096f175b7f Merge "profcollect: Broadcast intent when a profile report is ready to upload" 2021-03-24 17:59:48 +00:00
Jayachandran Chinnakkannu
bd3a33ed9f Merge "Add 5G/NR QOS support" 2021-03-24 17:44:48 +00:00
Treehugger Robot
59035dd21c Merge "DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters" 2021-03-24 17:36:33 +00:00
Treehugger Robot
8c03c2a82e Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." 2021-03-24 17:22:50 +00:00
Treehugger Robot
6c65088897 Merge "Don't try to report non-existent stats" am: 8c9b5df98a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649153

Change-Id: Id29d2368b9ee734b870134edcfa65b517d05a801
 2021-03-24 16:43:28 +00:00
Sudheer Shanka
d533fa78b1 Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager. 
These constants will now be including all the reasons for why an
uid's network access can be blocked, instead of only the
restrictions that could be imposed by NPMS.

Bug: 183473548
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Merged-In: I4c544415e12adf442fd2415c371b1b70a39c3aa4
Change-Id: I6dcea43fbefa9eac8b5a971b822a5be5422a54b4
 2021-03-25 01:33:26 +09:00
Treehugger Robot
8c9b5df98a Merge "Don't try to report non-existent stats" 2021-03-24 16:12:45 +00:00
Yi Kong
61db7cd45e profcollect: Broadcast intent when a profile report is ready to upload 
The feature is guarded by profcollect_native_boot/upload_report and is
turned off by default.

Test: manual, fake-ota
Bug: 79161490
Change-Id: I0fc59e662a5ae821f66e72ec11f189a842244960
 2021-03-25 00:03:24 +08:00
Charles Chen
06b102a70d Merge "Add OWNERS for ComponentCallbacksController" am: 4eca6d0c5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642179

Change-Id: I9e032b1715e0e30f868428ff5d5ab2351a3222e2
 2021-03-24 10:28:17 +00:00
Charles Chen
4eca6d0c5c Merge "Add OWNERS for ComponentCallbacksController" 2021-03-24 10:05:52 +00:00
Lucas Lin
9214c04e45 Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" am: ac06b167f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649305

Change-Id: I4a4bb433b565539d33dfeb515a277b0b61a2aa91
 2021-03-24 04:44:17 +00:00
Lucas Lin
ac06b167f9 Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" 2021-03-24 04:02:56 +00:00
Chiachang Wang
c24bbc6449 Merge "Remove the hidden NetworkRequest usage" am: b2d5ab569c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649296

Change-Id: I88ec60e29e8a9e9b5511ce6b77bb7ec8bc7cbec8
 2021-03-24 03:19:00 +00:00
Wonsik Kim
197e1a7f5e DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters 
Bug: 183242434
Test: atest android.media.cts.MediaCodecTest
Change-Id: Iaef8f8aef564dc8cda84a83f6cc628d87649b43d
 2021-03-24 02:51:59 +00:00
Chiachang Wang
b2d5ab569c Merge "Remove the hidden NetworkRequest usage" 2021-03-24 02:41:27 +00:00
Janis Danisevskis
fd5cba4483 Keystore 2.0: Add onDeviceOffBody to AndroidKeyStoreMaintenance. 
Also have KeyStore.onDeviceOffBody call
AndroidKeyStoreMaintenance.onDeviceOffBody.

Test: N/A
Bug: 171305684
Change-Id: I0b01764bfc4c5828d17ccfffb4f8dad5f3bcea6d
 2021-03-23 19:18:55 -07:00
Jayachandran C
af09816c25 Add 5G/NR QOS support 
Bug: 155176305
Bug: 182317794
Test: atest ConnectivityServiceTest
      atest QosCallbackTrackerTest

Change-Id: Idf6d8a7c3b80bc50a2c1244ceaefea9381d40c2f
 2021-03-23 19:14:21 -07:00
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