drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
692,799 Commits 1 Branch 0 Tags
Commit Graph

692799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yan Yan
4b1c9ad3d0 Revert "Make VPN more testable and update NC during network change" 
Revert submission 2113906-mobike-ut

Reason for revert: b/235853154 Test files build failed on tm-mainline-prod
Reverted Changes:
I739016db1:Add unit tests for IKEv2 VPN setup and MOBIKE
Ic0f0c5496:Make VPN more testable and update NC during networ...

Change-Id: Ia598f1c0feb74ead57e3ce32413cc7da9dab73e5
 2022-06-13 19:51:52 +00:00
Cole Faust
dbff26398e Merge "Remove services.speech" am: 8a18f1ab63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107385

Change-Id: Idd10c0b852c5d4163acb15681e07beb0505996e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 18:02:21 +00:00
Yan Yan
4cdb702532 Merge "Make VPN more testable and update NC during network change" am: 9ff5caa8e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115938

Change-Id: I5d95accdad379394573e9c4de6d6d6d61d51a90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 18:01:49 +00:00
Cole Faust
8a18f1ab63 Merge "Remove services.speech" 2022-06-13 17:37:34 +00:00
Yan Yan
9ff5caa8e5 Merge "Make VPN more testable and update NC during network change" 2022-06-13 17:32:04 +00:00
Neil Fuller
5d23852150 Remove TZUvA feature. 
The feature was superseded by tzdata mainline module(s).

Bug: 148144561
Test: m
Test: see system/timezone
Change-Id: I5f67e34e9beb608d3cf3c4c072b268805865f6dd
Merged-In: I5f67e34e9beb608d3cf3c4c072b268805865f6dd
 2022-06-13 11:44:35 +00:00
Treehugger Robot
255f4d7911 Merge "Fix kotlin deprecation warnings" am: f9bf6544a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115256

Change-Id: I5a9011f30f9827fde42d1596035ab310355fbe68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 19:45:11 +00:00
Steven Moreland
69f8011ec8 Merge "Parcel: warnings for 'REPLY' statuses" am: d36a3f33e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117786

Change-Id: I953c099b4cdbc971362220ade5b2b9130c9edad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 19:40:22 +00:00
Treehugger Robot
f9bf6544a6 Merge "Fix kotlin deprecation warnings" 2022-06-10 19:00:22 +00:00
Steven Moreland
d36a3f33e2 Merge "Parcel: warnings for 'REPLY' statuses" 2022-06-10 17:40:52 +00:00
Almaz Mingaleev
30e58e0409 Merge "Do not preload ThreadLocalRandom class." am: 86085aae14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2121632

Change-Id: I374a79f7460e12d54013de2c07add15665560086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 17:04:28 +00:00
Almaz Mingaleev
86085aae14 Merge "Do not preload ThreadLocalRandom class." 2022-06-10 16:34:08 +00:00
Vali Dobrota
14203720c8 Merge "Remove obsolete owner of frameworks/base/config." am: 141c6a9f6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2122612

Change-Id: I98718f1c5b5962b03dbec69de324d873ad85054e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 15:52:58 +00:00
Vali Dobrota
141c6a9f6f Merge "Remove obsolete owner of frameworks/base/config." 2022-06-10 15:22:14 +00:00
Siarhei Vishniakou
1345d656a2 Require CONFIG_HID_PLAYSTATION for DualSense key layout 
Some olders kernels don't yet support HID_PLAYSTATION. While they are
working on supporting this driver, provide this temporary solution.

Before this patch, if the key layout is loaded, but there is no
HID_PLAYSTATION, then the mappings on the device will be incorrect.

With this patch, this key layout will not be loaded unless there is a
CONFIG_HID_PLAYSTATION enabled on the device.

Instead, when the main layout cannot be loaded, we make another attempt
to load a fallback layout. This way, the mappings on DualSense can be
correct even if the HID_PLAYSTATION module is not loaded.

In this CL, the fallback layout was tested using controllerTester.

Bug: 228005926
Test: tested mappings with a DualSense controller on a device that does
not have CONFIG_HID_PLAYSTATION

Merged-In: I7e46ae1943cd2c63b8c0b03fdf5d71adeea89f6f
Change-Id: I7e46ae1943cd2c63b8c0b03fdf5d71adeea89f6f
 2022-06-10 08:09:58 -07:00
Almaz Mingaleev
2a1c933d3e Do not preload ThreadLocalRandom class. 
ThreadLocalRandom.seeder field uses time in its initialization.
Preloading the class fixes initial state of ThreadLocalRandom,
which leads to the same sequence of generated numbers across
different app runs.

Bug: 234816154
Test: verified manually that TLR.current().nextInt does not return
the same sequence of numbers.

Change-Id: I80868217e02862e8d0a568ea096e22e919ec06e3
Merged-In: I80868217e02862e8d0a568ea096e22e919ec06e3
 2022-06-10 14:35:53 +01:00
Vali Dobrota
d3fbfb0ce6 Remove obsolete owner of frameworks/base/config. 
Test: N/A

Change-Id: I8e11b550c83e588b9a9aa38437843eae0b52ab9d
 2022-06-10 11:46:47 +01:00
Eric Biggers
2cf8cd28fa Merge "UserManagerService: fix comment for mRemovingUserIds" am: 030c47cbfb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115419

Change-Id: I15c99a6733086410943f4ecfca476006b46502c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 00:01:01 +00:00
Max Bires
215389da4b Merge "Fix comment in docs about ID attestation." am: 5592977b0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116413

Change-Id: Ia4a4520e7ac1b2fa038b4f366c84a8b6fd6ee8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 00:00:12 +00:00
Eric Biggers
030c47cbfb Merge "UserManagerService: fix comment for mRemovingUserIds" 2022-06-09 23:54:14 +00:00
Max Bires
5592977b0f Merge "Fix comment in docs about ID attestation." 2022-06-09 23:42:03 +00:00
Neil Vohra
a53421a150 Merge "Create Rubidium APCT directory (to avoid the presubmit warning in ag/18717650)." am: 9a5883470e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2120756

Change-Id: I5adc2bd26dd2df048509bfb3e5187b0db88a7b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 19:51:48 +00:00
Neil Vohra
9a5883470e Merge "Create Rubidium APCT directory (to avoid the presubmit warning in ag/18717650)." 2022-06-09 19:16:56 +00:00
Eric Biggers
5f2aa0bd19 Merge "Remove obsolete support for emulated FBE" am: d96c8701dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2101871

Change-Id: Ie9d19eb2636e4a81478305631adea335a076f96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 18:59:35 +00:00
Yan Yan
f1b3c75b2e Make VPN more testable and update NC during network change 
This commit:
- Updates the NetworkCapabilities with new underlying network during
  IKE Session re-establishment
- Create wrapper classes for IkeSession and NetworkAgent
- Allow injecting executor and NetworkAgent with
  the Dependencies class

Bug: 192077544
Test: atest VpnTest(new tests)
Change-Id: Ic0f0c54967f5f898f43ed126f4ef410adb2c1969
 2022-06-09 18:50:04 +00:00
Eric Biggers
d96c8701dd Merge "Remove obsolete support for emulated FBE" 2022-06-09 18:42:00 +00:00
Lucas Lin
6059e6c37c Merge "Add a retry mechanism when error is recoverable" am: b02eee5c35 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2087826

Change-Id: Ia6c4fe0bb35b85d99ecf32183d70f230b4dca50c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 17:58:57 +00:00
Lucas Lin
b02eee5c35 Merge "Add a retry mechanism when error is recoverable" 2022-06-09 17:37:44 +00:00
Avinash Malipatil
ea3e36e448 Merge "SIM slot not available error code added to UpdateAvailableNetworksResult" am: e9003d62f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2045107

Change-Id: I874e7d863e0261d4dd9bccd3a740f1534a0abed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 10:43:50 +00:00
lucaslin
8c37a315ff Improve the code of handleSessionLost() 
Bug: 229350078
Test: atest FrameworksNetTests:VpnTest
Change-Id: Ia5fee854fb6017c08b7b7fb7ad666eed9a932195
 2022-06-09 10:25:15 +00:00
lucaslin
b4e39c87c1 Add a retry mechanism when error is recoverable 
Have a retry delay arrays for getting the next retry delay, and
the max retry delay is 900 seconds, when the max retry delay is
reached, the retry mechanism will always use it delay the retry.

Bug: 229350078
Test: atest FrameworksNetTests:VpnTest
Change-Id: If0fe30f0b98b83a723e14ea8f6cd9a96c54e1691
 2022-06-09 18:24:21 +08:00
Avinash Malipatil
e9003d62f5 Merge "SIM slot not available error code added to UpdateAvailableNetworksResult" 2022-06-09 09:21:21 +00:00
Avinash Malipatil
13553c3ec6 SIM slot not available error code added to UpdateAvailableNetworksResult 
Bug: 227212990
Test: Build
Change-Id: Ib3be8e3ad81848d1bb811564ee8a0e8c2886a284
(Merged-In: Ib3be8e3ad81848d1bb811564ee8a0e8c2886a284)
 2022-06-09 06:17:45 +00:00
Neil Vohra
0e6dc97f89 Create Rubidium APCT directory (to avoid the presubmit warning in ag/18717650). 
Test: Presubmits

Change-Id: I13f8d4bdaeda3a348b7416b96a7e3836ef41b883
 2022-06-08 22:53:29 +00:00
William Escande
358a664344 statemachine migration from base to modules-utils 
Bug: 198418216
Tag: #refactor
Test: atest ModulesUtilsTests
Test: atest FrameworksUtilTests
Merged-In: I65303c131f6e867f6c44d14baa537560fa8bf857
Change-Id: I65303c131f6e867f6c44d14baa537560fa8bf857
 2022-06-08 21:15:14 +00:00
Treehugger Robot
94fe316bd1 Merge "EntropyMixerTest: convert to JUnit4" am: 7db3ab2c86 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2113726

Change-Id: Ia02f6513f9a15460fed2d8fafb4d9c7b6b7c1988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 20:38:49 +00:00
Treehugger Robot
7db3ab2c86 Merge "EntropyMixerTest: convert to JUnit4" 2022-06-08 20:10:45 +00:00
Eric Biggers
057c908ef4 UserManagerService: fix comment for mRemovingUserIds 
Correctly describe the purpose of mRemovingUserIds.

Bug: 234059731
Change-Id: I51f6b25469762304f747645521f77a7883944a05
 2022-06-08 17:41:43 +00:00
Treehugger Robot
2229532b00 Merge "Add rahulbanerjee to OWNERS" am: 9b44b28d96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116852

Change-Id: Ia188ba2555a00f6d0b7a14c1dec0afdc94499f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 17:12:15 +00:00
Treehugger Robot
9b44b28d96 Merge "Add rahulbanerjee to OWNERS" 2022-06-08 16:52:05 +00:00
Victor Chang
e73a4dc9ae Merge changes from topic "icu71" am: cbe922a79b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116805

Change-Id: I5da628f4684c2b650ddb8e38f17610542cad4b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 12:43:20 +00:00
Victor Chang
37e6dec90e Regenerate LocaleDataTables.cpp due to ICU 71 upgrade am: 593ae0b0c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117509

Change-Id: I348de14f71af1be8cfb0465564fd87f0f1c23c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 12:43:13 +00:00
Victor Chang
cbe922a79b Merge changes from topic "icu71" 
* changes:
  Update DateIntervalFormatTest due to ICU 71 upgrade
  Regenerate LocaleDataTables.cpp due to ICU 71 upgrade
 2022-06-08 12:26:15 +00:00
Treehugger Robot
8b6b4752ff Merge "Fix AutofillManager NPE" am: 8032074e61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115080

Change-Id: I13b8fb4699966bfc748b087030f8f25d64bec521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 10:40:17 +00:00
Treehugger Robot
8032074e61 Merge "Fix AutofillManager NPE" 2022-06-08 10:14:01 +00:00
Jimmy Chen
f46b780f16 p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test 
Bug: 230699791
Test: atest android.net.wifi.cts.ConcurrencyTest#testP2pSetWfdInfo
Change-Id: Ic25dc6d7b18bad38863acfd32d839155da28141b
 2022-06-08 15:38:18 +08:00
jiajia tang
1c53e50cf3 Fix AutofillManager NPE 
Bug: 228529893

Change-Id: I2de34b24752eed089ca5d1e34d216c87dc3bf2c6
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Merged-In: If56d690882e8d4ad0dba1534f127478089c4d04f
 2022-06-08 05:13:52 +00:00
Victor Chang
5344f27f2b Merge "Use python 3 in ./tools/localedata/extract_icu_data.py" am: 6f701fe9fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117508

Change-Id: I9f97d3bf1281b3622faf722d655ae1d0f2eb4698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 14:19:29 +00:00
Victor Chang
6f701fe9fb Merge "Use python 3 in ./tools/localedata/extract_icu_data.py" 2022-06-07 13:56:24 +00:00
Victor Chang
16d858764d Update DateIntervalFormatTest due to ICU 71 upgrade 
Bug: 232747988
Test: atest FrameworksCoreTests:android.text.format
Change-Id: I92585d2b47a15a808a84cdd34b8ac5d484e71880
 2022-06-07 14:20:08 +01:00