Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
682,124 Commits 3 Branches 0 Tags
c80ff17275d48029ef9b6605d35b02a1fe56e407
Commit Graph

682124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
c80ff17275 Merge "Notify sysui of side swipe gestures that will show the bars transiently" into sc-v2-dev am: f80552b605 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16422448

Change-Id: Ic9b733c5273d1fe566da756584f499cfe34f5839
 2022-01-07 21:45:30 +00:00
Winson Chung
f80552b605 Merge "Notify sysui of side swipe gestures that will show the bars transiently" into sc-v2-dev 2022-01-07 21:28:16 +00:00
TreeHugger Robot
ca906a0f1d Merge "AudioService: logs for decision on ACTION_AUDIO_BECOMING_NOISY" into sc-v2-dev am: 3440697aed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16584443

Change-Id: If8b788620d17250dff60159eaa2d6b45db37922a
 2022-01-07 20:54:11 +00:00
Kevin Han
0a38009348 Merge "Don't hold hibernation lock when calling other services" into sc-v2-dev am: 17108cde7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16572063

Change-Id: I5442d98e6299d050c84c2d38dd522c6d6dcd2b6d
 2022-01-07 20:53:15 +00:00
TreeHugger Robot
3440697aed Merge "AudioService: logs for decision on ACTION_AUDIO_BECOMING_NOISY" into sc-v2-dev 2022-01-07 20:43:10 +00:00
Kevin Han
17108cde7a Merge "Don't hold hibernation lock when calling other services" into sc-v2-dev 2022-01-07 20:31:37 +00:00
TreeHugger Robot
5fa4798ec9 Merge changes I8cf2b091,I13c5986e,I12579263,I42635877,Ib3ff55ab into sc-v2-dev am: 1e2a3ecc4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576688

Change-Id: I7c366d5df178c5d23db739f59bc2a90853354585
 2022-01-07 20:02:36 +00:00
Joy Babafemi
ea582ced9d [DO NOT MERGE] Handle IllegalStateException in APM event handling. am: 60a456a0a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576688

Change-Id: If0517cac3a8955660e1276682efbc6825e751ed5
 2022-01-07 20:02:25 +00:00
TreeHugger Robot
1e2a3ecc4d Merge changes I8cf2b091,I13c5986e,I12579263,I42635877,Ib3ff55ab into sc-v2-dev 
* changes:
  [DO NOT MERGE] Handle IllegalStateException in APM event handling.
  DO NOT MERGE: Disable UWB in airplane mode.
  DO NOT MERGE: Clear calling context when adding UWB default setting.
  DO NOT MERGE: Set default UWB state on.
  DO NOT MERGE: Persist UWB State in AOSP stack.
 2022-01-07 19:46:08 +00:00
Matt Buckley
c83c35b7fd Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" am: f7a327e8d5 am: 086cbfd1bf am: 366582cbae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941194

Change-Id: I9cae0caca7360861d59be3daf5f8406c8598da2d
 2022-01-07 18:35:23 +00:00
Bill Yi
8ca829de8e [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: b99672c020 -s ours am: 84e861430f -s ours am: 92b4b0f20f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I232428ea53113f751280df92bbf77fb7a74d9070
 2022-01-07 18:34:08 +00:00
Matt Buckley
366582cbae Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" am: f7a327e8d5 am: 086cbfd1bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941194

Change-Id: Ia3dc04920b8941a9528547cf608099195bd948bf
 2022-01-07 18:17:35 +00:00
Bill Yi
92b4b0f20f [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: b99672c020 -s ours am: 84e861430f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01ca3dc594e0a18cbbd8f8196af3fb4a806df617
 2022-01-07 18:16:19 +00:00
Matt Buckley
086cbfd1bf Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" am: f7a327e8d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941194

Change-Id: Ifacb9e5cd98ddd1e5acd4757b9474c89fb1de3fc
 2022-01-07 17:50:51 +00:00
Bill Yi
84e861430f [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: b99672c020 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68d1975f5538f2a6aeb5dcc64a09d1f230af9aea
 2022-01-07 17:48:50 +00:00
Matt Buckley
f7a327e8d5 Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" 2022-01-07 17:48:45 +00:00
Matt Buckley
7153b105e7 Revert "Revert "Revert "Add APIs that allow to exclude routes fr..." 
Revert "Revert "Revert "Add VpnServiceBuilderShim for VpnService..."

Revert submission 1931760-reland-vpn-impl-part-2

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=test_suites_x86_64&lkgb=8053795&lkbb=8053908&fkbb=8053828, bug b/213588956.
BUG: b/213588956
Reverted Changes:
Ic8ed8fce7:Revert "Revert "Add CTS tests for exclude VPN rout...
I07104340a:Revert "Revert "Add VpnServiceBuilderShim for VpnS...
I7c69b7244:Revert "Revert "Add APIs that allow to exclude rou...

Change-Id: Ic72cafcf5c7e2c62236f1cef61b0764882bacaad
 2022-01-07 17:44:52 +00:00
Bill Yi
b99672c020 Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" 2022-01-07 17:29:10 +00:00
Seth Moore
a665f6bd93 Merge "Add missing </pre> to Javadoc" am: 076fb5e987 am: d084c0202a am: 33e0b830dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905490

Change-Id: I34e3c8d5e8b89ca9f27ea43d3f3331d5bf6ead14
 2022-01-07 17:21:06 +00:00
Taras Antoshchuk
c159f90aa8 Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee am: 464eb8bc19 am: accf4c69a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931085

Change-Id: I8e7f48702c2fca7af6279d4cc3f67f724ed2f758
 2022-01-07 17:20:29 +00:00
Seth Moore
33e0b830dc Merge "Add missing </pre> to Javadoc" am: 076fb5e987 am: d084c0202a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905490

Change-Id: I0dfcbf12f73733995f13ce67f820d9ca0e7d3215
 2022-01-07 17:06:18 +00:00
Taras Antoshchuk
accf4c69a5 Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee am: 464eb8bc19 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931085

Change-Id: Iffa989b5fe71ba259e1d4221ae203b746ad7ddd1
 2022-01-07 17:05:54 +00:00
Seth Moore
d084c0202a Merge "Add missing </pre> to Javadoc" am: 076fb5e987 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905490

Change-Id: Iff015f828a1e2be937d6ce9d27ec3c944dbc8c08
 2022-01-07 16:45:18 +00:00
Taras Antoshchuk
464eb8bc19 Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931085

Change-Id: Ic6b7dd2cd547b29e1407601d508f8256bfc878cb
 2022-01-07 16:44:00 +00:00
Seth Moore
076fb5e987 Merge "Add missing </pre> to Javadoc" 2022-01-07 16:40:32 +00:00
Jean-Michel Trivi
d6c2b4a468 AudioService: logs for decision on ACTION_AUDIO_BECOMING_NOISY 
Add logs in AudioDeviceInventory that show why the NOISY intent
is broadcast or not.

Bug: 211217374
Test: disconnect headphones during playback, grep logs for "AS\."
Change-Id: Idba16cf9aea92853f8f316734db0519cc075a67d
 2022-01-07 08:29:50 -08:00
Taras Antoshchuk
f4177e94ee Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" 2022-01-07 16:27:12 +00:00
Treehugger Robot
3168535d70 Merge "[MS39.1] Remove the looper from NetworkStatsSubscriptionMonitor" am: a8dd1f55ac am: f9d029bebd am: 8c60b78c1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936448

Change-Id: If55a1ef029f5c4f5637fff4954eb1429a613cea7
 2022-01-07 16:18:52 +00:00
Junyu Lai
25b501c6fa Merge "[MS17.1] Remove getNetworkTotalBytes dependencies from MultipathPolicyTracker" am: a668e90292 am: 3a8216bb34 am: e602202e7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931588

Change-Id: I5fe793238684471cfb085c553c81f5f4d8c777c0
 2022-01-07 16:18:29 +00:00
chapin
815d4cedea Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" am: 279b828fd8 am: 84913280a8 am: 35117a7596 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940083

Change-Id: I16e62355558973caf77b9a0ab7c00a273af756b2
 2022-01-07 16:17:00 +00:00
Treehugger Robot
495a05886f Merge "Add necessary parcelables of metadata" am: 8ed7defe20 am: 5c6ca53a00 am: 56cc4a092d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936186

Change-Id: Ib461951bdb6f41b85b1ae5387b4b3b51cee613a8
 2022-01-07 16:16:29 +00:00
Treehugger Robot
3fe0c62490 Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 am: bc8cdbeecb am: cb6617a563 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: I24ef55a8dc58e5917109c3993b02ddfe147e1064
 2022-01-07 16:15:23 +00:00
TreeHugger Robot
23e9f0b15a Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into stage-aosp-master am: 105f98c38c am: d31bba2d5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16582694

Change-Id: Iad60f80daa4503b149c18584c8a6fba2ca554526
 2022-01-07 16:14:56 +00:00
Treehugger Robot
8c60b78c1f Merge "[MS39.1] Remove the looper from NetworkStatsSubscriptionMonitor" am: a8dd1f55ac am: f9d029bebd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936448

Change-Id: I540d9d92a84c17c99a7708a7ab0d7ffd38de7eb5
 2022-01-07 15:57:30 +00:00
Junyu Lai
e602202e7d Merge "[MS17.1] Remove getNetworkTotalBytes dependencies from MultipathPolicyTracker" am: a668e90292 am: 3a8216bb34 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931588

Change-Id: I9f73846e8b4f0f372467cc6565b7a5ae3742c6c7
 2022-01-07 15:57:04 +00:00
chapin
35117a7596 Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" am: 279b828fd8 am: 84913280a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940083

Change-Id: Ic2e007688e9d6c85729d4e159d53dcd1eb2f3f03
 2022-01-07 15:55:38 +00:00
Treehugger Robot
56cc4a092d Merge "Add necessary parcelables of metadata" am: 8ed7defe20 am: 5c6ca53a00 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936186

Change-Id: I7e4c2d105ca8876e47162f1d1629c0b16937621b
 2022-01-07 15:55:01 +00:00
TreeHugger Robot
9e08f02dbb Merge "Fixed an issue where the user could be stuck with pulse expanding" into sc-v2-dev am: 3ba0620ec6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576585

Change-Id: I0918991d3982b919209b7cb70a3d8183960b5203
 2022-01-07 15:54:03 +00:00
Treehugger Robot
cb6617a563 Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 am: bc8cdbeecb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: I561e94026c5ab362638a1e1e387ca9e02afdeb13
 2022-01-07 15:53:51 +00:00
TreeHugger Robot
3ba0620ec6 Merge "Fixed an issue where the user could be stuck with pulse expanding" into sc-v2-dev 2022-01-07 15:28:38 +00:00
Treehugger Robot
f9d029bebd Merge "[MS39.1] Remove the looper from NetworkStatsSubscriptionMonitor" am: a8dd1f55ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936448

Change-Id: I4e9746ed1f88f226d6f081e23b7a76001819b0fc
 2022-01-07 15:02:37 +00:00
TreeHugger Robot
cfa5c420e3 Merge "Fix flaky test WindowInputTestsi#testTrustedOverlapWindow" into sc-v2-dev am: 651343388f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16544958

Change-Id: I4001fabda75da2bfc2da66eb7692cc021078e549
 2022-01-07 15:02:02 +00:00
TreeHugger Robot
651343388f Merge "Fix flaky test WindowInputTestsi#testTrustedOverlapWindow" into sc-v2-dev 2022-01-07 14:48:17 +00:00
Treehugger Robot
a8dd1f55ac Merge "[MS39.1] Remove the looper from NetworkStatsSubscriptionMonitor" 2022-01-07 14:42:52 +00:00
Junyu Lai
3a8216bb34 Merge "[MS17.1] Remove getNetworkTotalBytes dependencies from MultipathPolicyTracker" am: a668e90292 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931588

Change-Id: I4185965de644f1f05d1ab3851c219f9540793683
 2022-01-07 14:32:18 +00:00
chapin
84913280a8 Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" am: 279b828fd8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940083

Change-Id: Ia421bad5eb2b72abb737a39e76ab81013e3f0a1a
 2022-01-07 14:31:24 +00:00
Junyu Lai
a668e90292 Merge "[MS17.1] Remove getNetworkTotalBytes dependencies from MultipathPolicyTracker" 2022-01-07 14:17:03 +00:00
chapin
279b828fd8 Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" 2022-01-07 14:08:23 +00:00
TreeHugger Robot
d31bba2d5c Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into stage-aosp-master am: 105f98c38c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576463

Change-Id: I2539ffd6d175a1cda9100055f37a4b92184c6a83
 2022-01-07 14:05:53 +00:00
Treehugger Robot
5c6ca53a00 Merge "Add necessary parcelables of metadata" am: 8ed7defe20 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936186

Change-Id: I145c9b1dcf79b88f8e6508ef52830f22c919d4bf
 2022-01-07 13:26:34 +00:00