Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
567,767 Commits 3 Branches 0 Tags
aab9659d41ff095a52e643522890205cf130f264
Commit Graph

567767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoey Chen
aab9659d41 Merge "[Telephony] Return if context is null when register TelephonyCallback" am: a805d39229 am: 51f11f9b0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644386

Change-Id: I8f6b72edbe920ae78b2a59dea4b3cd8e21ba47e1
 2021-03-19 10:46:18 +00:00
Zoey Chen
51f11f9b0b Merge "[Telephony] Return if context is null when register TelephonyCallback" am: a805d39229 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644386

Change-Id: I3290feb8ffea6f18240995c6d96c3893e2fa4b51
 2021-03-19 09:59:22 +00:00
Zoey Chen
a805d39229 Merge "[Telephony] Return if context is null when register TelephonyCallback" 2021-03-19 09:28:41 +00:00
Yo Chiang
bcd0c980ff Merge "Keystore 2.0: Fix infinit recursion." am: 544f3d5211 am: d68724597d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645913

Change-Id: Ibc53be4a881787c592a8b7869b8e7973d83ad5b5
 2021-03-19 09:02:32 +00:00
Chiachang Wang
6c7233c57e Merge "Send a Network instead of network id for wifi no internet dialog" am: 8ce1fa2313 am: dd535a61fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766

Change-Id: I1428a4bf9be18601ff70e8fc50e06fecac158a4b
 2021-03-19 09:02:20 +00:00
Aaron Huang
15587cc7c7 Merge "Remove hidden API usage from ProxyTracker" am: 3f4d2a6f67 am: 6ddd31dc3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646966

Change-Id: Idd7ae6ad01db35ed2ea47abab183ae423439ede9
 2021-03-19 09:02:08 +00:00
Lorenzo Colitti
ee70e4d92b Merge "Ensure all calls to getCallingUid use the version in mDeps." am: d610e43383 am: 3559535c50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635320

Change-Id: Ib427fa0d6d9b2ecf35e820db9eb1dc762a81bb3a
 2021-03-19 09:01:55 +00:00
Yo Chiang
d68724597d Merge "Keystore 2.0: Fix infinit recursion." am: 544f3d5211 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645913

Change-Id: I647135ccc2f45b50e828dbd4e0f1f2cfea1cef00
 2021-03-19 08:31:03 +00:00
Chiachang Wang
dd535a61fc Merge "Send a Network instead of network id for wifi no internet dialog" am: 8ce1fa2313 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766

Change-Id: I676152104fafb5c4e1b93f0e39fa39e43dd6891c
 2021-03-19 08:27:56 +00:00
Aaron Huang
6ddd31dc3a Merge "Remove hidden API usage from ProxyTracker" am: 3f4d2a6f67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646966

Change-Id: I2d609875a3a31586626a82dddbfcb015bf5ca0bf
 2021-03-19 08:27:14 +00:00
Lorenzo Colitti
3559535c50 Merge "Ensure all calls to getCallingUid use the version in mDeps." am: d610e43383 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635320

Change-Id: I6719b51b78ace57bc36f4dba738c0c420947a8bf
 2021-03-19 08:24:59 +00:00
Yo Chiang
544f3d5211 Merge "Keystore 2.0: Fix infinit recursion." 2021-03-19 08:10:39 +00:00
Janis Danisevskis
8758b2ceaf Keystore 2.0: Fix infinit recursion. 
Fix endless recursion when Cipher is initialized with
AndroidKeyStorePrivateKey.

Fixes: 183167349
Test: atest android.keystore.cts.AndroidKeyStoreTest#testKeyStore_Encrypting_RSA_NONE_NOPADDING
Change-Id: I5b4166fb1a4e298072f7156ba61a64966e86dc53
 2021-03-19 08:09:34 +00:00
Chiachang Wang
8ce1fa2313 Merge "Send a Network instead of network id for wifi no internet dialog" 2021-03-19 07:54:24 +00:00
Aaron Huang
3f4d2a6f67 Merge "Remove hidden API usage from ProxyTracker" 2021-03-19 07:50:27 +00:00
Lorenzo Colitti
d610e43383 Merge "Ensure all calls to getCallingUid use the version in mDeps." 2021-03-19 07:36:52 +00:00
Chalard Jean
7c204b87f1 Merge "Use the NetworkScore API in VPN" am: f88102ce0e am: 4b7c64df40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645286

Change-Id: I57ec8a1b99f07d31f739470527fd2b88ff368431
 2021-03-19 06:44:58 +00:00
Tianjie Xu
70c9ef04f9 Merge "Report RoR metrics in recovery system" am: b079fe666f am: 7bbf62a939 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597519

Change-Id: Ia2f2f67c5b0362d2e2de5782e5ed3ebd72902516
 2021-03-19 06:44:49 +00:00
Paul Hu
9c7ea4db8a Merge "Remove hidden LinkProperties methods accesses" am: eed88a705d am: 65e6be618f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645287

Change-Id: Ib99ec3f77247d38f7e7c47898aa3e27ad2ed9a93
 2021-03-19 06:44:34 +00:00
Chalard Jean
37e8ecdb9a Merge "[NS02] Mix in validation of the score" am: 93a3f18a40 am: 5f96b8c585 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100

Change-Id: I9f628ce479db20f26a1ea1549ab11635613ccfa9
 2021-03-19 06:44:12 +00:00
Chalard Jean
4b7c64df40 Merge "Use the NetworkScore API in VPN" am: f88102ce0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645286

Change-Id: Ia7f2be585911611b3d0a807369a5ad1c3fe072a9
 2021-03-19 06:19:35 +00:00
Chalard Jean
f88102ce0e Merge "Use the NetworkScore API in VPN" 2021-03-19 06:16:37 +00:00
Tianjie Xu
7bbf62a939 Merge "Report RoR metrics in recovery system" am: b079fe666f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597519

Change-Id: I6da88dfdf9558de568f9aa2c30cfbfb159b1f669
 2021-03-19 06:13:04 +00:00
Paul Hu
65e6be618f Merge "Remove hidden LinkProperties methods accesses" am: eed88a705d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645287

Change-Id: I84395bcab438908b898231b7a77927923dcb05ad
 2021-03-19 06:09:04 +00:00
Chalard Jean
5f96b8c585 Merge "[NS02] Mix in validation of the score" am: 93a3f18a40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100

Change-Id: I229c3033a16d6b7f11f1b3f02351cc0d2153d199
 2021-03-19 06:05:28 +00:00
Aaron Huang
407610d73f Remove hidden API usage from ProxyTracker 
Connectivity mainline module cannot use HandlerExecutor because it
is a hidden API. So, replace it with alternative.

Bug: 177035719
Test: FrameworksNetTests
Change-Id: I228a8a2e3479b0af1e977d13f877a565f0789a7e
 2021-03-19 06:03:08 +00:00
Tianjie Xu
b079fe666f Merge "Report RoR metrics in recovery system" 2021-03-19 06:00:46 +00:00
Paul Hu
eed88a705d Merge "Remove hidden LinkProperties methods accesses" 2021-03-19 05:52:08 +00:00
Chalard Jean
93a3f18a40 Merge "[NS02] Mix in validation of the score" 2021-03-19 05:39:40 +00:00
Treehugger Robot
281f77c93c Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: 47157e7711 am: 4bdea2a29b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640985

Change-Id: I5c04566c379e2cad164d55050ffdc9152432dfd3
 2021-03-19 05:27:46 +00:00
Chalard Jean
b5dbd7f46d [NS02] Mix in validation of the score 
Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Change-Id: I9cac3a05ad0c4008599973b12d2c5e4c02233a5c
 2021-03-19 13:50:56 +09:00
Treehugger Robot
4bdea2a29b Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: 47157e7711 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640985

Change-Id: I26db95ad9d91dec40a62b7e4c4c0b77133ddb5d3
 2021-03-19 04:42:53 +00:00
TreeHugger Robot
7c330732a1 [automerger skipped] Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy" into rvc-qpr-dev am: 1c9ac73a78 -s ours 
am skip reason: skip tag Change-Id I3a5afddfc151e06f5deb0220620bbd40849626c4 with SHA-1 951ceccfd7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13896657

Change-Id: Idfbcc609fcab6c9f83cb91fc65c705dc0e761728
 2021-03-19 04:41:48 +00:00
TreeHugger Robot
1c9ac73a78 Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy" into rvc-qpr-dev 2021-03-19 04:16:53 +00:00
Treehugger Robot
47157e7711 Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" 2021-03-19 04:13:36 +00:00
Remi NGUYEN VAN
3e876a2147 Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e33269 am: 6d208315f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629260

Change-Id: I3cd53e2c9f9ed61153b083661ff0402cf1eb607b
 2021-03-19 03:44:03 +00:00
Remi NGUYEN VAN
6d208315f8 Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e33269 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629260

Change-Id: I78e28855dce5b38785ec60bf1c5489ebf2b98ded
 2021-03-19 03:07:53 +00:00
Remi NGUYEN VAN
7e26e33269 Merge "Add TEST_NETWORK_SERVICE to module API" 2021-03-19 02:32:00 +00:00
Paul Hu
7f507fe7fe Merge "Fix CS external dependencies on CarrierDefaultApp" am: 25be9509b8 am: e51271ca2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644389

Change-Id: Ieef1ccfc59761bbd570c457ef126d7f3489d424f
 2021-03-19 02:26:45 +00:00
Chalard Jean
a7a1251b04 Merge "Check for FEATURE_TELEPHONY instead of CM" am: 6df94880b3 am: 318bbccc3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639905

Change-Id: Idcb987bc2efef9fbbf947d5c7dc0630d7ad45ddc
 2021-03-19 02:26:22 +00:00
Chiachang Wang
4a013645cb Send a Network instead of network id for wifi no internet dialog 
It's a refactor work for incoming connectivity mainline. The
network information contained in the no internet notification
action was placed the target network id. The receiver which is
Settings will need to construct the network from the network id
using the hidden Network constructor. Since Network is moving
into module, Settings will not be able to access it. Apps should
use Network instead of network id, so just send the network
object to Settings.

Bug: 172183305
Test: manually test with no internet dialog and check the
      behavior and log
Test: atest FrameworksNetTests
Change-Id: I68acc70a26a27eeeb9ab7af068a459905839f942
 2021-03-19 02:08:01 +00:00
Paul Hu
e51271ca2f Merge "Fix CS external dependencies on CarrierDefaultApp" am: 25be9509b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644389

Change-Id: Ia2d8822d0230fd93893399bc5a61c9af7a355139
 2021-03-19 01:50:44 +00:00
Chalard Jean
318bbccc3e Merge "Check for FEATURE_TELEPHONY instead of CM" am: 6df94880b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639905

Change-Id: Ibf1b7ccf19781d8caa1bb27e335be2367a6fb658
 2021-03-19 01:46:23 +00:00
Paul Hu
25be9509b8 Merge "Fix CS external dependencies on CarrierDefaultApp" 2021-03-19 01:41:25 +00:00
Remi NGUYEN VAN
0afced9423 Merge "Add InetAddressCompat" am: b648508ccb am: 23511a3eba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289

Change-Id: I94fef501699aa01c997a03dd24a5a25442075af1
 2021-03-19 01:10:06 +00:00
Remi NGUYEN VAN
73d3166547 Merge "Move network selection utils to Connectivity" am: c9f553c7ed am: 295bcd9be7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291

Change-Id: Ia276fc1988baf3240f120682170d6c41ee01839e
 2021-03-19 01:09:30 +00:00
Treehugger Robot
6f06dae1c3 Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 am: 1ade004e0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646146

Change-Id: Ibf882ed499ada52633ce22b88c1af931f9064ce3
 2021-03-19 01:08:39 +00:00
Chalard Jean
6df94880b3 Merge "Check for FEATURE_TELEPHONY instead of CM" 2021-03-19 00:59:04 +00:00
Remi NGUYEN VAN
23511a3eba Merge "Add InetAddressCompat" am: b648508ccb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289

Change-Id: I6946ca309ae923a637f5e5f0ad73c91b26b3c376
 2021-03-19 00:39:34 +00:00
Remi NGUYEN VAN
295bcd9be7 Merge "Move network selection utils to Connectivity" am: c9f553c7ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291

Change-Id: I452591707a97b501f189fa9f61e90da842fa3734
 2021-03-19 00:35:03 +00:00