Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
560,773 Commits 3 Branches 0 Tags
45f1fa008cd3c97b47d5f73d610a5146151eac17
Commit Graph

560773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
45f1fa008c Merge "Add framework boot image" am: 08ff0a8639 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia39190ddae4119a364c62dbe5c1a0becd8d90226
 2021-01-28 16:06:35 +00:00
Paul Duffin
08ff0a8639 Merge "Add framework boot image" 2021-01-28 15:39:57 +00:00
Treehugger Robot
394138bd68 Merge "Remove obsolete OWNERS files" am: b57fa98f59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88b0a43792ff4b1c36950a6f5f35c131c6905d4d
 2021-01-28 15:06:36 +00:00
Paul Duffin
1128114af1 Add framework boot image 
Currently, it is just a placeholder that retrieves information about
the framework boot image from the dex_bootjars singleton.

Bug: 177892522
Test: m droid
Change-Id: Icd7943a37378a56c416e502aa29d6088c2f247d2
Exempt-From-Owner-Approval: https://crbug.com/gerrit/14008
 2021-01-28 14:53:49 +00:00
Treehugger Robot
b57fa98f59 Merge "Remove obsolete OWNERS files" 2021-01-28 14:28:55 +00:00
Treehugger Robot
5e78686425 Merge "ECDH SPI interface" am: e43b86d5b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95b8cb39fd5f57c08c43dbdcae1c0828e93f3666
 2021-01-28 13:40:31 +00:00
Junyu Lai
6373b3b084 Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: ce07556044 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549897

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30b0cc54c340150884bebfd289824f1e562eea88
 2021-01-28 13:25:50 +00:00
Treehugger Robot
e43b86d5b1 Merge "ECDH SPI interface" 2021-01-28 13:08:42 +00:00
Junyu Lai
ce07556044 Merge "[VCN01] Add NOT_VCN_MANAGED capability" 2021-01-28 13:04:59 +00:00
Neil Fuller
ab88c1e30a Remove obsolete OWNERS files 
The code has been moved (internally) under bug 175119330. The code that
was here now can be found in
com.android.server.timezonedetector.location instead.

Bug: 175119330
Test: treehugger only
Change-Id: I0446ea16921886ac826f25d624a1c61551d2313e
 2021-01-28 12:00:51 +00:00
Oliver Woodman
5fe83ca052 Merge "API to get SOC manufacturer and model" am: a6b77e3294 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518117

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib77e15b216e4e4c79b93586d5167bba92026aa29
 2021-01-28 10:00:21 +00:00
Oliver Woodman
a6b77e3294 Merge "API to get SOC manufacturer and model" 2021-01-28 09:07:56 +00:00
Treehugger Robot
cd65235a77 Merge "Note network interfaces based on transport" am: 8334a265ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae2ae51e3819b37cf2c85ce12715978d6ba68c55
 2021-01-28 08:32:23 +00:00
Treehugger Robot
8334a265ad Merge "Note network interfaces based on transport" 2021-01-28 07:45:20 +00:00
Lorenzo Colitti
f8bac85e95 Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 4452f55a2e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I385f93ef5fc3a627fcc2ae827c72e0785c464d8f
 2021-01-28 07:22:25 +00:00
Chiachang Wang
4b2d4e4e3b Merge "Replace hidden getFileDescriptor$()" am: 842319b819 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6f87447485fd0a4ee008bcabea80b4827fdd99b
 2021-01-28 07:15:15 +00:00
Lorenzo Colitti
4452f55a2e Merge "Fix legacy APIs when VPN switches to suspended underlying network." 2021-01-28 07:07:37 +00:00
Treehugger Robot
562a34498f Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: 23438d66dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ae1d067d23fb87d97f326f6da29ddf3a022a821
 2021-01-28 07:04:48 +00:00
Chiachang Wang
842319b819 Merge "Replace hidden getFileDescriptor$()" 2021-01-28 06:36:11 +00:00
Remi NGUYEN VAN
2c9ed7f32d Note network interfaces based on transport 
Instead of classifying interfaces by network type in BatteryStats,
classify them based on the transports array provided by the
NetworkAgent.

Network types are deprecated and transports should be used instead. This
change allows BatteryStats to stop depending on unstable APIs such as
isNetworkTypeMobile.

This change also updates nullability annotations in ConnectivityService
and NetworkAgentInfo to show that the NetworkCapabilities are non-null
(as provided by the network agent) when calling
noteNetworkInterfaceTransports.

Bug: 174436414
Test: atest
  atest ConnectivityServiceTest#testBatteryStatsNetworkType \
      --rerun-until-failure 40

Merged-In: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8

Change-Id: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8
 2021-01-28 15:10:54 +09:00
Treehugger Robot
23438d66dd Merge "[Mainline] Migrate TextUtils#emptyIfNull" 2021-01-28 06:05:08 +00:00
Etan Cohen
1e9a56a83f Merge changes I0eb0362e,Iec9b579d am: 6c0e8ad627 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556330

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib155ee03b68d11fb84524cfbd005d9e8a545d777
 2021-01-28 05:19:56 +00:00
Etan Cohen
6c0e8ad627 Merge changes I0eb0362e,Iec9b579d 
* changes:
  Grant shell permissions for restart WiFi subsystem to Shell to support CTS
  [WIFI] New permission to control restart of the WiFi subsystem
 2021-01-28 04:47:00 +00:00
Lucas Lin
9a1b958e67 Merge "Use createStringArray instead of readStringArray" am: 66cd788d4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38445a56180675c48055fc4256ea238c2b86fabe
 2021-01-28 04:31:18 +00:00
Lucas Lin
b82753716e Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: ec3f650de7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd01df52928e13717eae903c49e201f7bf39940e
 2021-01-28 04:28:10 +00:00
Lucas Lin
66cd788d4e Merge "Use createStringArray instead of readStringArray" 2021-01-28 04:04:10 +00:00
lucaslin
31d270a4d7 Use createStringArray instead of readStringArray 
To prevent ProxyInfo calling hidden API, use public one -
Parcel#createStringArray() instead.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I1a5376872d743e1863982bb95d579aeba7159d33
 2021-01-28 04:03:59 +00:00
Lucas Lin
ec3f650de7 Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" 2021-01-28 04:01:49 +00:00
Chiachang Wang
b219ee2cde Replace hidden getFileDescriptor$() 
It's the preparation for the incoming ConnectivityService
mainline. The mainline modules can not access hidden APIs.
Thus, the hidden APIs usage should be removed.

The getFileDescriptor$() in Socket or DatagramSocket is
hidden for internal usage. It should be used in a module and
not prefer to expose as an API. Thus, replace it with
ParcelFileDescriptor APIs to get the fd via
ParcelFileDescriptor.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I05b31a48315e7e6d95e22123103e544a7136a449
 2021-01-28 11:33:13 +08:00
Tianjie Xu
17cf7a6465 Merge changes I45054e68,I6f301314 am: 2befe56df0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a083699efe686d26c6f3bc1f163f94504f1595f
 2021-01-27 23:34:38 +00:00
Tianjie Xu
2befe56df0 Merge changes I45054e68,I6f301314 
* changes:
  Make the service timeout and blob lifetime configurable
  Call server based implementation to persist reboot escrow key
 2021-01-27 22:40:13 +00:00
Bob Badour
bfef457c52 Merge "Fix license_type. Contains GPL" am: 37f1ed3523 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557004

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46b07791efa3afc421fac3b11b28c5c901ba4d18
 2021-01-27 21:42:33 +00:00
Bob Badour
37f1ed3523 Merge "Fix license_type. Contains GPL" 2021-01-27 20:12:13 +00:00
Bob Badour
336e38d3f2 Fix license_type. Contains GPL 
See: http://go/android-license-checking-v2-lsc

Test: m all

Bug: 151953481
Bug: 151177513
Bug: 67772237

Exempt-From-Owner-Approval: janitorial work

Change-Id: I297f7e55415dcff0765b46841879b25c03c50aa9
 2021-01-27 12:09:16 -08:00
Daniel Bright
97f11a3ab2 Merge "Add S-NSSAI" am: d7d4b0ca85 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ae9b7dad9d7fb8f4f883bbf23f63e041a534200
 2021-01-27 19:03:39 +00:00
Andrei-Valentin Onea
e153c16320 Merge "Persist compat framework overrides across reboot" am: 51164692d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b63f99caa3c384b994ea043c032b59a18a210de
 2021-01-27 18:53:52 +00:00
Daniel Bright
d7d4b0ca85 Merge "Add S-NSSAI" 2021-01-27 18:48:54 +00:00
Benedict Wong
d3b37546db Merge "Implement DisconnectingState" am: 2cfb250d6d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547274

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I265cfe4d4cd4a2b8f13bd18e71baf7d18e144d03
 2021-01-27 18:41:41 +00:00
Andrei-Valentin Onea
51164692d0 Merge "Persist compat framework overrides across reboot" 2021-01-27 18:17:11 +00:00
Benedict Wong
2cfb250d6d Merge "Implement DisconnectingState" 2021-01-27 18:13:10 +00:00
Treehugger Robot
cb24b18b50 Merge "Watchdog: Rename properties to follow guidelines" am: 62bdf8c076 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50a67a9f9244e5d5f16b186a8f993baf8303c236
 2021-01-27 16:11:18 +00:00
Treehugger Robot
62bdf8c076 Merge "Watchdog: Rename properties to follow guidelines" 2021-01-27 15:43:17 +00:00
Woody Lin
bc8d470970 Watchdog: Rename properties to follow guidelines 
Bug: 141948707
Bug: 178498518
Change-Id: Iefbeae8da80308be148610dc87d20553a290f4c5
 2021-01-27 21:57:53 +08:00
Jeff DeCew
ce917a8f14 Merge "Add 'Android Resources' team as OWNERS of classes in android.util" am: 6671f75e1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8179b0b4136d9b7665a8fe270872b92dccac9231
 2021-01-27 13:33:35 +00:00
Jeff DeCew
6671f75e1d Merge "Add 'Android Resources' team as OWNERS of classes in android.util" 2021-01-27 13:18:49 +00:00
Treehugger Robot
b0989fd2d2 Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae15ffcf1fbf31ab004a36eb662f39e4439146d0
 2021-01-27 13:11:28 +00:00
Treehugger Robot
f9dbe61693 Merge "[FUI03] No-op refactoring of VpnInfo" 2021-01-27 11:47:34 +00:00
Bram Bonné
b3c666454e ECDH SPI interface 
Test: atest KeyAgreementTest
Bug: 171847641
Change-Id: I7cb0c713e3797bb738a6134c690824e762346d4f
 2021-01-27 10:54:47 +01:00
Howard Chen
adf0f11de8 Merge "Refine the DSU SD card support" am: da932b4a45 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fb1cea8aa1b83ee9218cfca9f88c02d3607ff4b
 2021-01-27 09:14:43 +00:00
Howard Chen
da932b4a45 Merge "Refine the DSU SD card support" 2021-01-27 08:40:34 +00:00