Benedict Wong
2a42aa8921
Merge "Add clarifying comments on for IPsec forward policies" am: 1a88665f3c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702525
Change-Id: I7267d331065ceadb830a14170920810f053eacb8
2021-05-11 17:17:53 +00:00
Benedict Wong
1a88665f3c
Merge "Add clarifying comments on for IPsec forward policies"
2021-05-11 17:00:57 +00:00
Treehugger Robot
f98d2cc9fc
Merge changes I87740397,I0cc4538b,Iaceb2b7c am: 56ba9447cf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700306
Change-Id: I4bc1321f1e1c687ce6d29376d73531919da6b545
2021-05-11 16:38:32 +00:00
Kweku Adams
8cdf84ddf6
Use BatteryManagerInternal to determine low battery. am: 937355815f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702028
Change-Id: I6b22d6b361ec9066b1266db0cb048a5d31610ea5
2021-05-11 16:33:25 +00:00
Tim Murray
67538e727a
BackgroundDexOptService: defer post-boot job further am: b42d33ec7b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700305
Change-Id: Ifa48a29de706f08a78ec38f21d307d4616dd0d4a
2021-05-11 16:31:03 +00:00
Collin Fijalkovich
2cf6388ff3
Merge "Compile libhwui.so with 2MB section alignment." am: 919e8c1ba3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685430
Change-Id: I5c07336f4f20128e5ba3de9dd77303a2f21e3d57
2021-05-11 16:21:01 +00:00
Treehugger Robot
56ba9447cf
Merge changes I87740397,I0cc4538b,Iaceb2b7c
...
* changes:
Wait for BOOT_COMPLETE event before scheduling the bootDexoptJob
Use BatteryManagerInternal to determine low battery.
BackgroundDexOptService: defer post-boot job further
2021-05-11 16:18:00 +00:00
Treehugger Robot
43927fdefc
Merge "Fix the path of boot image profile and preloaded classes for frameworks." am: 0e52d9c6f9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698770
Change-Id: If22a276324bb680cdcbd5a2f05fac1d65047f76d
2021-05-11 16:16:55 +00:00
Collin Fijalkovich
919e8c1ba3
Merge "Compile libhwui.so with 2MB section alignment."
2021-05-11 16:13:58 +00:00
David Su
9e29893e5a
Merge "Emphasize possibility of multiple networks with same transport" am: f9c9dba0fb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459
Change-Id: I5ce97c2040817b68c6b70640db22d5d04bb304f3
2021-05-11 16:10:55 +00:00
Treehugger Robot
0e52d9c6f9
Merge "Fix the path of boot image profile and preloaded classes for frameworks."
2021-05-11 15:56:46 +00:00
David Su
f9c9dba0fb
Merge "Emphasize possibility of multiple networks with same transport"
2021-05-11 15:51:28 +00:00
Anton Hansson
8f1928f4ca
Merge "Apply the same filtering for docstubs and jarstubs" am: 46dff8e09f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700027
Change-Id: Ie8bd1bc14f50744f85f4860944d84128b7fca83f
2021-05-11 11:58:30 +00:00
Anton Hansson
46dff8e09f
Merge "Apply the same filtering for docstubs and jarstubs"
2021-05-11 11:24:14 +00:00
Anton Hansson
06e56695cc
Merge "Use filegroups for test-{base,mock,runner} srcs" am: af9b5f0a04
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700026
Change-Id: I6e67d5d69e4863472eec70454cb9b338c40209a5
2021-05-11 10:29:02 +00:00
Lucas Lin
78619286d3
Merge "Replace hidden API with public API" am: 7283a692b0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696668
Change-Id: I4eaeb64157a95e91ca7af93c08a603483ceb9334
2021-05-11 10:26:24 +00:00
Anton Hansson
af9b5f0a04
Merge "Use filegroups for test-{base,mock,runner} srcs"
2021-05-11 10:09:00 +00:00
Anton Hansson
03c08d1f14
Merge "Fix incorrect package in PackageChangeReceiver" am: 0ee8641209
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699739
Change-Id: Iaa83eecc886429b13ac569eae80a16b058670b20
2021-05-11 10:06:13 +00:00
Lucas Lin
7283a692b0
Merge "Replace hidden API with public API"
2021-05-11 09:52:50 +00:00
Anton Hansson
0ee8641209
Merge "Fix incorrect package in PackageChangeReceiver"
2021-05-11 09:46:29 +00:00
Anton Hansson
e3eefd6d2e
Merge "Inline two constants from CorePlatform" am: dbf1544b68
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727
Change-Id: I9888625f7e797b23b1a860cb6f076a6860428f27
2021-05-11 09:25:17 +00:00
Anton Hansson
dbf1544b68
Merge "Inline two constants from CorePlatform"
2021-05-11 09:00:57 +00:00
Treehugger Robot
6edf32bd8e
Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE" am: b369ebee31
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1701245
Change-Id: Ica5e6524d2fc45db65500d36e31604deb08632a8
2021-05-11 08:03:32 +00:00
Treehugger Robot
b369ebee31
Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE"
2021-05-11 07:32:37 +00:00
Tianjie Xu
e3e7ed125e
Merge "Check null for before using LockSettingsService" am: 964fccfefd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674887
Change-Id: I90dee9936f4ad8ef17fcb4850e0e29de63411416
2021-05-11 05:43:25 +00:00
Benedict Wong
af9b507963
Merge "Add log prefixes to uniquely identify each VCN/gwConn" am: fae9ba6535
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700307
Change-Id: I7096daeb9d45dcedbebf5c95b9c681c1e1c78935
2021-05-11 05:37:35 +00:00
Benedict Wong
f980436b32
Merge changes from topic "vcn-fwd" am: d7d2d2a15b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047
Change-Id: I7f02785727c73c27ac498ad4663f25252242c6e0
2021-05-11 05:26:46 +00:00
Tianjie Xu
964fccfefd
Merge "Check null for before using LockSettingsService"
2021-05-11 04:50:15 +00:00
Benedict Wong
fae9ba6535
Merge "Add log prefixes to uniquely identify each VCN/gwConn"
2021-05-11 01:34:58 +00:00
Benedict Wong
d7d2d2a15b
Merge changes from topic "vcn-fwd"
...
* changes:
Apply transform to FWD policy if configured to provide tethering
Add internal support for IPsec forward policies
2021-05-11 01:30:31 +00:00
Benedict Wong
9bde08840f
Add clarifying comments on for IPsec forward policies
...
This change adds clarifying comments for the usage of the forward
policies in IPsec, and corrects a comment to properly specify the
permissions allowed.
Bug: 185495453
Test: Comment-only changes
Change-Id: I6d36522c344c41b0ebd90d46b216d115b678dd31
2021-05-10 18:26:02 -07:00
Tianjie
31b3cbf029
Check null for before using LockSettingsService
...
If the locksettings service fails to start, the resume on reboot
APIs will throw a nullptr exception in RecoverySystemService. Add
some check to prevent crashing the system server.
Bug: 184596745
Test: build
Change-Id: I5b1781612ec8d855d94b2828b5b5cfee9a84aebe
2021-05-10 18:01:16 -07:00
Calin Juravle
f0d01f45b1
Wait for BOOT_COMPLETE event before scheduling the bootDexoptJob
...
Also, clean up logging and transition to Slog.
Test: manual
Bug: 179094324
Change-Id: I87740397b6f8fc85faf4bbb2222434f90ebad554
2021-05-10 15:22:39 -07:00
Kweku Adams
937355815f
Use BatteryManagerInternal to determine low battery.
...
BatteryManagerInternal calls into BatteryService, which has its own
logic for identifying low battery. BatteryService's low battery logic
takes a user's setting into account. Switch to using BatteryService's
logic so we can standardize on battery low logic.
Bug: N/A
Test: Android builds
(cherry-pick from commit de95150c42 )
Merged-In: I0cc4538bb80ce21e42721eccf6b6671d52a24084
Change-Id: I0cc4538bb80ce21e42721eccf6b6671d52a24084
2021-05-10 15:19:43 -07:00
Benedict Wong
30b760733b
Merge "Add additional logging to improve debugability of VcnManagementService" am: 3996048bad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692661
Change-Id: I1597db8e8f437b797abdb70253f7b7a0fc6b77dd
2021-05-10 21:44:38 +00:00
Brad Ebinger
e8d7017b66
Merge "Add the REGISTRATION_TECH_NR Tech type" am: 0ad0a88143
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699607
Change-Id: I2009c95ad2d87b4d3a23fbe62de32d1081874dc4
2021-05-10 21:37:35 +00:00
Benedict Wong
3996048bad
Merge "Add additional logging to improve debugability of VcnManagementService"
2021-05-10 21:22:23 +00:00
Benedict Wong
d155b44859
Add log prefixes to uniquely identify each VCN/gwConn
...
This change adds additional logging prefixes to uniquely identify
connections and vcn instances to allow for better debugging.
Test: atest FrameworksVcnTests
Change-Id: Ied1aa2b2502c9cbe59358755eb65ed369fdbd987
2021-05-10 14:17:30 -07:00
Brad Ebinger
0ad0a88143
Merge "Add the REGISTRATION_TECH_NR Tech type"
2021-05-10 21:02:25 +00:00
Siim Sammul
0e29db726c
Merge "Create BinderLatencyObserver to collect binder call latency stats. Pushing these as a metric will come in a future change." am: 60cd2fa626
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697178
Change-Id: I025d7728e7cc5dd6a3491d254013f7832ea4b01d
2021-05-10 20:44:20 +00:00
Rahul Sabnis
27918f0cf2
Merge "Update docs for BluetoothDevice#fetchUuidsWithSdp to reflect that if the device is bonding, we either broadcast cached UUIDs or wait for SDP to be performed after the device is bonded." am: d8c539d8b8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698769
Change-Id: I80a142b64d16b00e973112e35dae2c5d962839b8
2021-05-10 20:34:06 +00:00
Automerger Merge Worker
c8c54db537
Merge "Merge "Enforce system/root/shell for dexopt operation." am: c900ba3cd6" into stage-aosp-master
2021-05-10 20:04:27 +00:00
Calin Juravle
669ca39862
Merge "Enforce system/root/shell for dexopt operation." am: c900ba3cd6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699071
Change-Id: Ic3d4d4cfbfff9019f3223a0c89ac7fa65a1d845a
2021-05-10 20:00:41 +00:00
Calin Juravle
274d5098fe
Merge "Enforce system/root/shell for dexopt operation." am: c900ba3cd6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699071
Change-Id: Iae5a23f356eb8d8f6179e940e362dce2eb140392
2021-05-10 19:57:10 +00:00
Automerger Merge Worker
bbffe8e909
Merge "Merge "AudioFormat: Retrieve sample rate capability from framework" am: ba32f57428" into stage-aosp-master
2021-05-10 19:56:48 +00:00
Andy Hung
89ce768aa1
Merge "AudioFormat: Retrieve sample rate capability from framework" am: ba32f57428
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700287
Change-Id: I35be9d48f84dea6d8a9cb356873ea30725288ebf
2021-05-10 19:44:48 +00:00
Andy Hung
a40baa4af7
Merge "AudioFormat: Retrieve sample rate capability from framework" am: ba32f57428
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700287
Change-Id: I2d56a1931bb32ef1890125bd7692dc3edc5f788b
2021-05-10 19:43:31 +00:00
Siim Sammul
60cd2fa626
Merge "Create BinderLatencyObserver to collect binder call latency stats. Pushing these as a metric will come in a future change."
2021-05-10 18:10:58 +00:00
Jay Patel
67143814c2
Merge "AudioSystem: update framework channel capabilities" am: 249034de9d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754
Change-Id: I8de728097196b1acece91c1651d2ead7c6323f44
2021-05-10 17:42:44 +00:00
Rahul Sabnis
d8c539d8b8
Merge "Update docs for BluetoothDevice#fetchUuidsWithSdp to reflect that if the device is bonding, we either broadcast cached UUIDs or wait for SDP to be performed after the device is bonded."
2021-05-10 17:41:36 +00:00