Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
565,274 Commits 3 Branches 0 Tags
b331ee3ff7305b44ff7ccf0b5dcd1d9197064806
Commit Graph

565274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yan Yan
b331ee3ff7 Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: aef89adfdc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619903

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I435aebb51bd0bd0ed3eb68460eb864c1e78e1874
 2021-03-05 05:11:22 +00:00
Treehugger Robot
547c982b97 Merge "Fix CaptivePortalTest before R" am: 41dd05fdfb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29443e1af761cca33185638e5bd84771e0bc9192
 2021-03-05 05:03:21 +00:00
SongFerng Wang
6035378f91 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" am: b332627a15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic767a18207a6f551ac49167c81c30e2f22793acf
 2021-03-05 05:00:15 +00:00
Treehugger Robot
19c771ec4e Merge "Fix subject in self-signed certificates." am: a27ce04850 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fe8bf267a7a8174ce9ef6e36408c3815b16b4eb
 2021-03-05 04:56:31 +00:00
Brad Ebinger
b81ca0dc24 Merge "Parse params needed for SipDelegate routing" am: 9a13fb1dbf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d5ceb7b6d830e684d3b159e6f50bc8b41b70728
 2021-03-05 04:48:44 +00:00
Tianjie Xu
853862f7b0 Merge "Don't throw runtime exceptions in ResumeOnRebootServiceProvider" am: 8ad97c0d63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7977a64ae425335c5f54c98065b75ccfb12fe1f
 2021-03-05 04:46:02 +00:00
Brad Ebinger
a0f85ebf75 Merge "Define new permission to perform IMS RCS Reg actions and integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" am: ca282c8cbf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6d700bd7ac66bc6ffe2792ba67cebd15c826906
 2021-03-05 04:41:41 +00:00
Tianjie Xu
dc579c1960 Merge "Add a unittest to cover the retry of load escrow data" am: b13ad07770 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614001

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I649a0d2d392078c4f0c515c68e8998b2d0bebf22
 2021-03-05 04:37:56 +00:00
Christian Wailes
19fbe0bf82 Merge "Add ZYGOTE_OWNERS to fd_utils.* files." am: 61fb950795 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06e3ae0ba0ba4a708bfb554286403e6103ce26f2
 2021-03-05 04:34:42 +00:00
Christian Wailes
a534c95087 Merge changes I04ac8fba,Ia0a8548f am: db6628bb7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97994a12e2fb41db137b299c4e73cf02a1827871
 2021-03-05 04:31:56 +00:00
Yan Yan
aef89adfdc Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" 2021-03-05 02:30:21 +00:00
Treehugger Robot
41dd05fdfb Merge "Fix CaptivePortalTest before R" 2021-03-05 02:28:55 +00:00
SongFerng Wang
b332627a15 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" 2021-03-05 01:59:53 +00:00
Treehugger Robot
a27ce04850 Merge "Fix subject in self-signed certificates." 2021-03-05 01:16:54 +00:00
Brad Ebinger
9a13fb1dbf Merge "Parse params needed for SipDelegate routing" 2021-03-05 01:11:02 +00:00
Tianjie Xu
8ad97c0d63 Merge "Don't throw runtime exceptions in ResumeOnRebootServiceProvider" 2021-03-05 00:26:57 +00:00
Yan Yan
713ec685cb Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" 
This reverts commit 7f13ec417e.

Reason for revert:
1. The BUILD_VERSIONS.S is 1000, and thus it will prevent
   the code from requiring new algorithms on devices whose
   first sdk is 31 (e.g. cuttlefish), though these devices
   should be treated as first launched with SDK S.
2. It will break #testValidationForAlgosAddedInS, because
   the test code is using BUILD_VERSIONS.R to gate the test,
   which is inconsistent with the implementation.

Bug: 181887451
Test: atest IpSecAlgorithmTest
Change-Id: I5cd717c5ebd6086ae5cf9abf76311ae4fca0c6e9
 2021-03-05 00:15:15 +00:00
Brad Ebinger
ca282c8cbf Merge "Define new permission to perform IMS RCS Reg actions and integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" 2021-03-04 23:17:13 +00:00
Tianjie Xu
b13ad07770 Merge "Add a unittest to cover the retry of load escrow data" 2021-03-04 23:10:57 +00:00
Christian Wailes
61fb950795 Merge "Add ZYGOTE_OWNERS to fd_utils.* files." 2021-03-04 21:11:15 +00:00
Christian Wailes
db6628bb7d Merge changes I04ac8fba,Ia0a8548f 
* changes:
  Autoformatter changes.
  Inclusivity cleanup of the Zygote.
 2021-03-04 21:09:52 +00:00
Shawn Willden
c7de4a237a Fix subject in self-signed certificates. 
Bug: 180620122
Test: atest -c CtsKeystoreTestCases:android.keystore.cts.KeyPairGeneratorTest#testGenerate_EC_ModernSpec_Defaults
Change-Id: Ib74a3f0cea81faf741d49d868739cbedda77e8df
 2021-03-04 12:21:17 -07:00
Yan Yan
df66b72918 Merge changes I65dbc509,I1e338d9c,Ib4a0ed69,Iac7077b4,I9c53d425, ... am: 067b3dffa4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1603710

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53ca8ed01491465bfbfcb9df42ddf6218cc1a326
 2021-03-04 19:10:07 +00:00
Cody Kesting
e37cfaa9f1 Merge changes from topic "vcn-status-cb" am: dcaf81ebff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597023

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93310f81fd85f7edd7bb16bb514c657658782479
 2021-03-04 18:59:12 +00:00
Yan Yan
067b3dffa4 Merge changes I65dbc509,I1e338d9c,Ib4a0ed69,Iac7077b4,I9c53d425, ... 
* changes:
  Support converting IKE ID to/from PersistableBundle
  Support converting EAP-TTLS to/from PersistableBundle
  Support converting EAP-SIM, AKA and AKA' to/from PersistableBundle
  Support converting EapSessionConfig to/from PersistableBundle
  Support converting TunnelModeConfigRequest to/from PersistableBundle
  Support converting TunnelModeChildSessionParams to/from PersistableBundle
  Support converting ChildSaProposal to/from PersistableBundle
  Support converting IkeSaProposal to/from PersistableBundle
 2021-03-04 18:30:17 +00:00
Cody Kesting
dcaf81ebff Merge changes from topic "vcn-status-cb" 
* changes:
  Call VcnStatusCallback#onVcnStatusChanged on register.
  Remove VcnStatusCallback#onEnteredSafemode().
  Expose APIs for VcnStatusCallback.
 2021-03-04 18:09:40 +00:00
Chalard Jean
6d2b11cf24 Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: 45d586c66c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic64d571ff8a1f2fdf6b15cde12c6b0a38b4a74b4
 2021-03-04 13:18:57 +00:00
Treehugger Robot
a2ca3e18cc Merge changes Ie8d98359,I4d5cadfd am: 69508ee6db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ec456b2f2fd88648461794dc2301a3825c3c155
 2021-03-04 13:16:29 +00:00
Lucas Lin
9943270a61 Merge "Use public API Network#getNetId() to get netid" am: 0292235a96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b68c194109a5839dfb11ed3fe9c3aa4a25a85bb
 2021-03-04 13:14:01 +00:00
Chalard Jean
45d586c66c Merge changes Ide2567b2,I0ee0ce92,Iac3f55af 
* changes:
  Fix a bug where callbacks would see blips
  Fix a bug where a request would not be refcounted
  Fix a bug where UID ranges would not be removed
 2021-03-04 13:12:20 +00:00
Chalard Jean
775feeb477 Fix a bug where callbacks would see blips 
When a new OemPreference object is set, the requests
tracking that default will be re-created to track the
new default. This is true regardless of whether that
particular default has changed.

Because the new copied request doesn't know about the
old satisfier, the rematch code will mistakenly think
this callback didn't have a network and will send a
spurious onAvailable to it.

This patch fixes this by simply copying the satisfier
together with the rest of the NRI. The matching code
will then understand the correct previous status.

As a drive-by fix, this also fixes the annotations on
the reassignment contents that can be null. They have
more complex interactions (not everything can be null
at the same time), but the old annotations were just
putting @NonNull on nullable stuff.
In the same line, while there used to be a case with
a satisfier but no request when the satisfier is the
no-service network, there may now be a case where the
old satisfier is known but the old request isn't.

Test: FrameworksNetTests
Test: TODO : need a unit test for this
Change-Id: Ide2567b226722ea9d35ebd8205943363e27647a2
 2021-03-04 13:11:59 +00:00
Nathalie Le Clair
4d657988ef Merge changes Ie0a7ec38,I5199dc85 am: da70abc9e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614041

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23ed35b13a8499a2dffb3727d8b6be15d41473bd
 2021-03-04 13:11:28 +00:00
Chalard Jean
b80f9b0097 Fix a bug where a request would not be refcounted 
This ends up crashing the system when the request
is unregistered, because the ref counter finds the
count associated with the relevant UID is zero.

Test: FrameworksNetTests
Test: TODO : this needs a new unit test
Change-Id: I0ee0ce925a826d35d8fd58cefb8a870e98ce9add
 2021-03-04 22:08:09 +09:00
Chalard Jean
06985411b7 Fix a bug where UID ranges would not be removed 
When a new preferences object is sent that no longer contains
a particular app, a new set of requests will be generated. All
requests corresponding to that app will be unregistered, and
no new ones will be filed since the preferences no longer
contain that app.

The place where the UID ranges are removed however is in
makeDefaultForApps(), which takes a request. As there no
longer is a default request for this app, makeDefaultForApps()
will never be called with a request for it, and the UID ranges
will never be removed.

This change applies an emergency fix with some side effects
when setting a new preference. This is acceptable, but should
ideally be fixed ; see TODO in the code for details.

Test: FrameworksNetTests
Test: TODO : Need a unit test for this
Change-Id: Iac3f55af5d00d174460e1d4cdd31f581835dbaa6
 2021-03-04 22:08:09 +09:00
Treehugger Robot
69508ee6db Merge changes Ie8d98359,I4d5cadfd 
* changes:
  Fix a bug in RequestReassignment#toString
  Cleanup some of the PANS code
 2021-03-04 12:39:04 +00:00
Lucas Lin
0292235a96 Merge "Use public API Network#getNetId() to get netid" 2021-03-04 11:05:55 +00:00
Nathalie Le Clair
da70abc9e1 Merge changes Ie0a7ec38,I5199dc85 
* changes:
  Handle messages in standby for DeviceDiscoveryAction
  Prevent periodic actions from starting twice
 2021-03-04 11:01:12 +00:00
Remi NGUYEN VAN
bf186a8669 Fix CaptivePortalTest before R 
The last change broke the test on Q and R. Fix it to check
Q and R behavior properly, so the test can be run in presubmit
on such devices too.

Bug: 181844595
Change-Id: I99847ea30d49d690d9011d4763a7345126807119
Test: atest CtsNetTestCasesLatestSdk
 2021-03-04 10:45:02 +00:00
SongFerngWang
e206456a16 Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType 
- Add more reasons of allowed network type
  - ALLOWED_NETWORK_TYPES_REASON_USER
  - ALLOWED_NETWORK_TYPES_REASON_CARRIER
- Add @systemApi for below
  - ALLOWED_NETWORK_TYPES_REASON_USER
  - ALLOWED_NETWORK_TYPES_REASON_POWER
  - ALLOWED_NETWORK_TYPES_REASON_CARRIER
  - setAllowedNetworkTypesForReason API
  - getAllowedNetworkTypesForReason API
  - getAllowedNetworkTypesBitmask API
- Add Public for below
  - CARRIER_NR_AVAILABILITY_NONE
  - CARRIER_NR_AVAILABILITY_NSA
  - CARRIER_NR_AVAILABILITY_SA
  - KEY_CARRIER_NR_AVAILABILITY_INT
- @Deprecated API
  - setPreferredNetworkTypeBitmask
  - getPreferredNetworkTypeBitmask
  - setAllowedNetworkType
  - getAllowedNetworkType
- Add a new way to notify allowedNetworkType at PhoneStateListener
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT

Bug: 161434786
Test: atest TelephonyManagerTest#testSetAllowedNetworkTypesForReason
(PASS)
atest TelephonyManagerTest#\
testSetAllowedNetworkTypesForReason_moreReason
(PASS)
atest PhoneStateListenerTest#\
testOnAllowedNetworkTypesChangedByRegisterPhoneStateListener
(PASS)

Change-Id: I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd
Merged-In: I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd
 2021-03-04 14:58:54 +08:00
Treehugger Robot
fd426e18cd Merge "Remove unused errorMessage" am: 78a488cd10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c9d4dd0c721c1bb0340e52f4af1c6813efa4ee7
 2021-03-04 06:29:43 +00:00
Treehugger Robot
78a488cd10 Merge "Remove unused errorMessage" 2021-03-04 06:03:56 +00:00
Treehugger Robot
8397f20aff Merge "Remove @hide CollectionUtils in QosCallbackTracker" am: 12acf15141 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc65c4fb9c354b00ea98552021860170189ce15c
 2021-03-04 05:02:00 +00:00
Treehugger Robot
12acf15141 Merge "Remove @hide CollectionUtils in QosCallbackTracker" 2021-03-04 04:22:18 +00:00
Aaron Huang
3f93679709 Merge "Remove PersistableBundle(Bundle) usage from ConnectivityService" am: e32c7c482e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56756f9e45baa506cb304bd6c560c4129df7417a
 2021-03-04 04:04:25 +00:00
Aaron Huang
e32c7c482e Merge "Remove PersistableBundle(Bundle) usage from ConnectivityService" 2021-03-04 03:50:50 +00:00
Paul Hu
0e37e30151 Merge "Replace ConnectivityManager hidden symbols on framework" am: 1297f90193 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83a8eb6c8cefd7f84448ad14acd97e6582a4d1e4
 2021-03-04 03:11:45 +00:00
Remi NGUYEN VAN
739f8a3fb1 Merge "Add Build.IS_DEBUGGABLE to public API" am: 9c16d8e25d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I939354b4a5de3d4ecbab9e43438c39cd3aed9ae0
 2021-03-04 03:08:57 +00:00
Paul Hu
1297f90193 Merge "Replace ConnectivityManager hidden symbols on framework" 2021-03-04 03:07:08 +00:00
Sudheer Shanka
028e394c23 Merge "Add new network process capability." am: ae0fa6d359 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47466241367f39cb9540df3fffab59df6354401b
 2021-03-04 03:06:06 +00:00
Remi NGUYEN VAN
9c16d8e25d Merge "Add Build.IS_DEBUGGABLE to public API" 2021-03-04 03:02:56 +00:00