Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
561,070 Commits 3 Branches 0 Tags
a30ce7ea41db832e284e941896d2d3a779d7c6bc
Commit Graph

561070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
a30ce7ea41 Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" am: 8cb6d95803 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564832

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71d036a1a33aff8097225877bd76c1950156e1bc
 2021-02-04 01:07:16 +00:00
Automerger Merge Worker
f306fb9957 Merge "Merge "Adding SimPhonebookContract" am: 110420fcae" into stage-aosp-master 2021-02-04 01:02:05 +00:00
Treehugger Robot
0e6db34869 Merge "Adding SimPhonebookContract" am: 110420fcae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d3041404cacf8bd5a269253808efd898d538fe3
 2021-02-04 00:58:32 +00:00
Treehugger Robot
9cfa8e79e0 Merge "Adding SimPhonebookContract" am: 110420fcae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I608d52e517edf7874c79538e8a99e3455cd27e9a
 2021-02-04 00:47:40 +00:00
Rubin Xu
5c04261dac Merge "Add DPM.hasKeyPair()" am: 46915d9a14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I738273da4664a6248f219688d9d90b76a6f04c11
 2021-02-04 00:40:07 +00:00
Brad Ebinger
8cb6d95803 Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" 2021-02-04 00:38:15 +00:00
Treehugger Robot
110420fcae Merge "Adding SimPhonebookContract" 2021-02-04 00:33:51 +00:00
Treehugger Robot
a42ad625ac Merge "OWNERS for InlineSuggestion* in view/inputmethod" am: 2745c788a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562186

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5055a233152ec44c8bc98561d8736d205c4e5b14
 2021-02-03 23:38:17 +00:00
Anton Hansson
09e7ab4ddb Merge "Update OWNERS to ref existing file" am: c3d4d00270 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd30278360b8ad629c5b297b126d882119bb1d33
 2021-02-03 23:24:00 +00:00
Treehugger Robot
f8a276f313 Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a35a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8742a4f74a0e5339af6d35f03a2d6173a700680
 2021-02-03 23:00:35 +00:00
Treehugger Robot
acb38137cd Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I568b51ac671aab2e0d5614fb65bdc3cc797268fa
 2021-02-03 22:45:42 +00:00
Rubin Xu
46915d9a14 Merge "Add DPM.hasKeyPair()" 2021-02-03 22:35:41 +00:00
Treehugger Robot
2745c788a0 Merge "OWNERS for InlineSuggestion* in view/inputmethod" 2021-02-03 22:14:04 +00:00
Songchun Fan
a184cbd7fb Merge "Fix system_server's main thread name." am: 7fa0e63bc3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06c78cb351f3fed294c28e664e9d337ff97de1fd
 2021-02-03 21:55:27 +00:00
Steven Moreland
5cb323c59e Merge "binder: race condition by parcel finalize" am: 52f933552a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553275

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf3ca22d17f839736dea857ee34ec451b4def685
 2021-02-03 20:59:40 +00:00
Anton Hansson
c3d4d00270 Merge "Update OWNERS to ref existing file" 2021-02-03 19:44:13 +00:00
Treehugger Robot
fbfe84846e Merge "NetworkRegistrationInfo: add Parcel recycle" am: 9b899f7253 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46c1b1f79926e999deec5639c4e2a18f973e854b
 2021-02-03 19:36:06 +00:00
Treehugger Robot
51bf93a35a Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." 2021-02-03 19:34:56 +00:00
Treehugger Robot
0f12a22aa6 Merge "AdvertiseData: fix nullable collection" 2021-02-03 19:10:59 +00:00
Henry Fang
f69aecc91a Merge "TvInputHardwareManager: always try patch recreate if null" am: 59349e6d71 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535783

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4cb4fc1c150698ef0f865e0733d417d2a187081f
 2021-02-03 19:09:26 +00:00
Songchun Fan
7fa0e63bc3 Merge "Fix system_server's main thread name." 2021-02-03 18:54:01 +00:00
jiangyou li
0a79ec1972 Fix system_server's main thread name. 
When BinderIncrementalService start, it call ps->giveThreadPoolName() change the thread name to Binder:%d_%X.
However BinderIncrementalService run in system_serve main thread, it need not change the thread name.

BUG: 171354331
Test: adb shell ps -T [pid]
check the main thread name of system_server

Change-Id: I53fc6e096cae78798bb0a2670dcf2d8b4da3f5b6
 2021-02-03 18:49:52 +00:00
Steven Moreland
52f933552a Merge "binder: race condition by parcel finalize" 2021-02-03 18:46:50 +00:00
Treehugger Robot
9b899f7253 Merge "NetworkRegistrationInfo: add Parcel recycle" 2021-02-03 18:31:07 +00:00
Henry Fang
59349e6d71 Merge "TvInputHardwareManager: always try patch recreate if null" 2021-02-03 18:16:01 +00:00
Treehugger Robot
0e30e1e432 Merge changes from topic "limited_use_keys" am: 892c82e0f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513132

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab72f38be68f1efe3f70e180ab270defb1277058
 2021-02-03 17:18:42 +00:00
Qi Wu
56e16a0208 Limited use key: feature flags. am: cd6c58acd8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52b94248ad9f27083cfe7c7e46243ec0ebe56699
 2021-02-03 17:14:16 +00:00
Janis Danisevskis
e359de094e Keystore 2.0: isKeystore2Enabled returned wrong value. 
Test: Keystore 2.0 is used by certain system apps (Settings, Keychain)
      when enabled.
Change-Id: Idc3f27577df684561d403047a1e611bdc1350409
 2021-02-03 08:44:14 -08:00
Treehugger Robot
892c82e0f2 Merge changes from topic "limited_use_keys" 
* changes:
  Add limited use keys related API into Keystore 2.0 SPI.
  Limited use key: feature flags.
 2021-02-03 16:42:01 +00:00
Jeff Sharkey
6b3ed78bf6 Merge "Add core notifications team as owners of internal notification widgets." am: 752040bead 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571164

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ced104b3622d406e0eefe64aa311ab5970ccc02
 2021-02-03 15:30:13 +00:00
Lorenzo Colitti
7c2b530a09 Merge changes Ifa2aa335,I09366a7f am: 708c77d236 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6a7c2ce8b46e448b3fa61c2ccc0050423521c52
 2021-02-03 15:25:38 +00:00
Jeff Sharkey
752040bead Merge "Add core notifications team as owners of internal notification widgets." 2021-02-03 14:49:54 +00:00
Lorenzo Colitti
708c77d236 Merge changes Ifa2aa335,I09366a7f 
* changes:
  Allow setting underlying networks when legacy lockdown enabled.
  Allow passing the underlying network to startLegacyVpn.
 2021-02-03 14:07:44 +00:00
Lorenzo Colitti
04cc4f7972 Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: 104426a03b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5aafc615748eb2f854afe04108ffa7bf6d1ff47b
 2021-02-03 13:32:46 +00:00
Lorenzo Colitti
104426a03b Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" 2021-02-03 13:05:35 +00:00
Lorenzo Colitti
559ba25636 Allow setting underlying networks when legacy lockdown enabled. 
Currently, if a legacy lockdown VPN is up, no VPN can set
underlying networks. This does not make much sense.

When legacy lockdown VPN is enabled, no other VPN is allowed to
call prepare() or establish(), so no other VPN can connect, and
if no VPN can connect, then no VPN can set underlying networks.
Therefore, disabling the ability to set underlying networks only
affects the legacy lockdown VPN itself.

This change is necessary because in a future CL, the legacy
lockdown VPN will start to inform ConnectivityService of its
underlying network.

Bug: 173331190
Test: tests in subsequent CLs in stack
Change-Id: Ifa2aa3351c2c8324571f96fda151864ed987ed5a
 2021-02-03 19:04:17 +09:00
Lorenzo Colitti
00aa2977b4 Allow passing the underlying network to startLegacyVpn. 
This will be used by a future change that makes the legacy
lockdown VPN pass the underlying network.

Bug: 173331190
Test: tests in subsequent CLs in stack
Change-Id: I09366a7f872ef3d4538962a75b0114a2ecb536e6
 2021-02-03 19:03:53 +09:00
Junyu Lai
f0b03b1763 Merge "[FUI21] Move scrubSubscriberId to utils class" am: f6c7f61d27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7afe5684997a5c47bcee269d2310fc61715ec13a
 2021-02-03 09:36:38 +00:00
Junyu Lai
f6c7f61d27 Merge "[FUI21] Move scrubSubscriberId to utils class" 2021-02-03 08:52:17 +00:00
Chalard Jean
435ab0ecb7 Merge "[NS] Tests : don't expect a score in NF#acceptRequest" am: 96a8d7f990 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0039fe7dc3ccbdabe2c2d74241029a1d62456a0
 2021-02-03 08:32:55 +00:00
Chalard Jean
96a8d7f990 Merge "[NS] Tests : don't expect a score in NF#acceptRequest" 2021-02-03 08:10:19 +00:00
Lorenzo Colitti
51376598b6 Revert "Refactor setCurrentProxyScriptUrl to a void method" 
This reverts commit 20384eeaf1.

Reason for revert: Broke HostsideVpnTests

Fix: 177943140
Change-Id: I23924181e46fd1f16a60ec420426d1ed39705050
 2021-02-03 07:25:29 +00:00
Qi Wu
cca3d81204 Add limited use keys related API into Keystore 2.0 SPI. 
Bug: b/174140443
Test: atest CtsKeystoreTestCases

The new CTS tests for this feature is introduced in aosp/1556464

Change-Id: I9620c4a3e5d2c10ed8a50d494e63eb2fb19dabef
Merged-In: I9620c4a3e5d2c10ed8a50d494e63eb2fb19dabef
 2021-02-03 07:17:04 +00:00
James Mattis
0a3ad27abb Merge "Adding support for multiple "default" networks" am: 8bb0310bbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifeab79368573449cad035de2209db9640f861de3
 2021-02-03 05:19:41 +00:00
Kevin Chyn
b3bb81d3fc Merge "Add team members to core/res/OWNERS" am: 06413eea7a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571375

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibda92da73404eac30d2c148c376cca5b066826dc
 2021-02-03 05:17:40 +00:00
Etan Cohen
e240627d4e Merge "[WIFI] Fix typo in permission type for RESTART_WIFI_SUBSYSTEM" am: b9fbc02c52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571129

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56b829e9eb85aa5fa65dfd03eb337796a8628d8c
 2021-02-03 05:14:30 +00:00
James Mattis
8bb0310bbe Merge "Adding support for multiple "default" networks" 2021-02-03 04:17:47 +00:00
Kevin Chyn
06413eea7a Merge "Add team members to core/res/OWNERS" 2021-02-03 04:07:48 +00:00
Etan Cohen
b9fbc02c52 Merge "[WIFI] Fix typo in permission type for RESTART_WIFI_SUBSYSTEM" 2021-02-03 04:07:03 +00:00
Junyu Lai
ce1b075b2b Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d
 2021-02-03 03:03:01 +00:00