LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,655 Commits 2 Branches 0 Tags
925f8f07b394a5cdcc9a7214bed1d0fcd96e6aaf
Commit Graph

2655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
925f8f07b3 Merge "tethering: offload: Netlink Req" am: b90c974174 am: d45fd82ad0 am: 4d2944cda4 am: ee131d4c64 am: 52116b6880 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954

Change-Id: I414456f814a807a0a38cceb50164b6468adc2d10
 2020-06-24 04:24:45 +00:00
Lorenzo Colitti
52116b6880 Merge "tethering: offload: Netlink Req" am: b90c974174 am: d45fd82ad0 am: 4d2944cda4 am: ee131d4c64 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954

Change-Id: I6f6f6c437c989bce10c9dad1d1fa6ed395296649
 2020-06-24 04:07:02 +00:00
Lorenzo Colitti
ee131d4c64 Merge "tethering: offload: Netlink Req" am: b90c974174 am: d45fd82ad0 am: 4d2944cda4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954

Change-Id: I13fb2f296c8c026619e817e5fd8a16098d1dcc6c
 2020-06-24 03:51:47 +00:00
Lorenzo Colitti
4d2944cda4 Merge "tethering: offload: Netlink Req" am: b90c974174 am: d45fd82ad0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954

Change-Id: I5f976d70d87ef25ebb8e1483532781ac3d42425b
 2020-06-24 03:44:31 +00:00
Lorenzo Colitti
b90c974174 Merge "tethering: offload: Netlink Req" 2020-06-24 03:11:26 +00:00
Mark Chien
93743bb990 Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: fdf89ee7fb am: 45fa4f9c88 am: 5131fee94b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323

Change-Id: I2d3971390e897be6669d2f2d4b261eb73875c267
 2020-06-23 00:09:17 +00:00
Mark Chien
5131fee94b Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: fdf89ee7fb am: 45fa4f9c88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323

Change-Id: I4ee9d7c35c96e8632526184dd53c1206d8ba8f3f
 2020-06-23 00:01:46 +00:00
Mark Chien
45fa4f9c88 Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: fdf89ee7fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323

Change-Id: Ib53b8bb0f325661ed1919978220b3a4a503b9ae8
 2020-06-22 23:45:04 +00:00
Mark Chien
fdf89ee7fb Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323

Change-Id: Ib48182d51cc6e4586cb43f8ca51ea673ee14d1d7
 2020-06-22 23:43:43 +00:00
Dedy Lansky
6896f6193f Tethering: Add WiGig support 
This change is a combination of following changes:

1) Tethering: add TETHERING_WIGIG type
   Currently both WIFI and WIGIG use the same tethering type,
   TETHERING_WIFI. This causes conflicts between the frameworks,
   when both WIFI and WIGIG SoftAPs are started, one or both will
   not work.
   Fix this by using a seperate tethering type for WIGIG.

2) Tethering: remove TETHERING_WIGIG state machine on interface down
   The wigig state machine relies on a TETHERING_STATE_CHANGED broadcast
   that is sent when the tethering state machine is first created, during
   interface up. Currently the tethering state machine is not removed
   on interface down except for TETHERING_BLUETOOTH, and as a result
   wigig tethering only works the first time SoftAP is started.
   In order to fix this, remove the tethering state machine on interface
   down for TETHERING_WIGIG as well.

Bug: 143356416
Test: TetheringCoverageTests

Change-Id: Ic4d3aca0ed69234093af7f0206dab3335938c52a
 2020-06-22 21:17:46 +08:00
Automerger Merge Worker
cfdacf32f9 Merge "Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 am: c90944895f" into rvc-qpr-dev-plus-aosp am: c4956241fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: If4fde181600aa1f1d3ea0237fd76b2f6ca208b8c
 2020-06-22 09:31:36 +00:00
Wayne Ma
3b0270d9fc Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 31b6461408 am: ffdf42bc64 am: 9b00e3449c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: Id68ba2f6a1b4b941b70c73f9e51b06f8d8353b03
 2020-06-22 09:31:09 +00:00
Wayne Ma
3b775c82bd Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 am: a896f25304 am: 827aab1906 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: If7ceba040765291a499d8d2f04075acceeff2401
 2020-06-22 09:30:54 +00:00
Automerger Merge Worker
c4956241fb Merge "Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 am: c90944895f" into rvc-qpr-dev-plus-aosp 2020-06-22 09:18:01 +00:00
Wayne Ma
9b00e3449c Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 31b6461408 am: ffdf42bc64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: I93edd058819a5bd584f11d772661f2e0c0e01e67
 2020-06-22 09:17:53 +00:00
Wayne Ma
d344a6efe5 Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 am: c90944895f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: I96c9559551c9ecb0e9d3a8d8c9ef5ab036b1919c
 2020-06-22 09:17:44 +00:00
Wayne Ma
827aab1906 Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 am: a896f25304 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: I7103b19f0352879595f05f08fe19df82ce5b411a
 2020-06-22 09:17:43 +00:00
Wayne Ma
ffdf42bc64 Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 31b6461408 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: Ib6cc939508bacb6771a8022de7733530a241f8f5
 2020-06-22 09:09:16 +00:00
Wayne Ma
a896f25304 Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: I39dec2d8f085dc8aeb93387bc3cdd36fd25d7000
 2020-06-22 09:03:59 +00:00
Wayne Ma
31b6461408 Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: I81e0304f0560cbd070c5bb49967a8b6bf3e5d58a
 2020-06-22 08:51:46 +00:00
Wayne Ma
4b0912d248 Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261

Change-Id: If4a423ffe3cdd4f0f615aace774e2606deada766
 2020-06-22 08:51:43 +00:00
waynema
b7048af0a9 Add framework-statsd dependency and make framework-statsd visible to 
Tethering package.

Tethering needs StatsEvent and StatsLog which are in
framework-statsd.stubs.module_lib to write metrics.

Bug: 153942334

Test: make
Change-Id: I8ba142a9b3678de36e6c4880a64e992e00680f38
 2020-06-22 06:57:51 +00:00
Remi NGUYEN VAN
419b298d6f Merge "Use unstable networkstack AIDLs in development branches" into rvc-dev-plus-aosp am: 6534f90a6c am: fa4f5aa996 am: 8a0acb5335 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863640

Change-Id: I03e05b0c7200ce0daa5e11ba4caa00d19a89f6cc
 2020-06-22 05:06:33 +00:00
Remi NGUYEN VAN
8a0acb5335 Merge "Use unstable networkstack AIDLs in development branches" into rvc-dev-plus-aosp am: 6534f90a6c am: fa4f5aa996 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863640

Change-Id: I214309f201c0c7ed9a71eeb6ff2656055c72b72d
 2020-06-22 04:55:36 +00:00
Remi NGUYEN VAN
fa4f5aa996 Merge "Use unstable networkstack AIDLs in development branches" into rvc-dev-plus-aosp am: 6534f90a6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863640

Change-Id: I85837943c4dd9e5119a7457cae1a02dc6e0a2c2b
 2020-06-22 04:46:10 +00:00
Remi NGUYEN VAN
6534f90a6c Merge "Use unstable networkstack AIDLs in development branches" into rvc-dev-plus-aosp 2020-06-22 04:32:42 +00:00
Mark Chien
8f21023b42 [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours am: df63d22cbe -s ours am: f523ae5bbd -s ours am: 918f37142d -s ours 
am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 017bfba0d8 is in history

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

Change-Id: Ifda18ab56e79043cee031440d2f0ad6b22cfc8dd
 2020-06-20 05:11:02 +00:00
markchien
1fa26354c0 [automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 902043f5c3 am: f7d9dd76ab -s ours am: 1f5c10559b -s ours am: e3c5268531 -s ours am: 631e3434f8 -s ours 
am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 217d7b01f8 is in history

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

Change-Id: I0f79720573d67384da0f1e687665aea48b2daace
 2020-06-20 05:10:49 +00:00
Mark Chien
918f37142d [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours am: df63d22cbe -s ours am: f523ae5bbd -s ours 
am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 017bfba0d8 is in history

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

Change-Id: I05bbffec3b2ae92a254c5f66ad90b5dd85babb5b
 2020-06-20 04:58:44 +00:00
markchien
631e3434f8 [automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 902043f5c3 am: f7d9dd76ab -s ours am: 1f5c10559b -s ours am: e3c5268531 -s ours 
am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 217d7b01f8 is in history

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

Change-Id: I7c1fdc3e1cfefd33cbbc8bc61c4b0c8ea569530e
 2020-06-20 04:58:41 +00:00
Mark Chien
f523ae5bbd [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours am: df63d22cbe -s ours 
am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 017bfba0d8 is in history

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

Change-Id: I3c929eb2c80666d88ba8780b8761237b6945f308
 2020-06-20 04:39:06 +00:00
markchien
e3c5268531 [automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 902043f5c3 am: f7d9dd76ab -s ours am: 1f5c10559b -s ours 
am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 217d7b01f8 is in history

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

Change-Id: Id123e9df66ca3a13dd39ff8b5c39bb2560e23863
 2020-06-20 04:39:03 +00:00
Mark Chien
df63d22cbe [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours 
am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 017bfba0d8 is in history

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

Change-Id: Ie251a5e4cbfc78f8b26ae32a12679dd08bd348d9
 2020-06-20 04:32:35 +00:00
markchien
1f5c10559b [automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 902043f5c3 am: f7d9dd76ab -s ours 
am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 217d7b01f8 is in history

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

Change-Id: I259c3a257511436baac8894c7677dbd3090941ab
 2020-06-20 04:32:18 +00:00
markchien
4c9428a135 Protect invalid entitlement app configuration 
There is a protection in Settings that Settings would gray out if
tethering requires entitlement check but the entitlement app is
invalid. Tethering resource is moved from framework to tethering
module, so Settings can not fetch entitlement app name anymore.

In this change, tethering module would check whether entitltement app
package name is exsited if entitlement check is needed. Tethering would
be not supported (Settings tethering option would be hidded) if
entitlement app is not installed.

After moving the protection into tethering module,
TetherUtil#isProvisioningNeeded is no longer needed. Because The
only use case is Settings wants to gray out tethering setting
when entitltement check is needed but entitlement app is invalid.

Bug: 146918263
Test: atest TetheringCoverageTests
Change-Id: I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6
Merged-In: I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6
 2020-06-20 10:19:25 +08:00
markchien
902043f5c3 Pass entitlement configuration to Settings for entitlement check 
Tethering resource configuration is move from framwork to tethering
module. Since tethering resource would not be accessible from outside
of tethering module, EntitlementManager would tell Settings the
entitlement configuration via intent extra when run entitlement check.

Bug: 146918263
Test: atest TetheringTests
Change-Id: I6f23553bb1da5f0b767f920b32a86fafb9e00b9e
Merged-In: I6f23553bb1da5f0b767f920b32a86fafb9e00b9e
 2020-06-20 10:19:21 +08:00
Automerger Merge Worker
e1dd54f6d4 Merge "Merge "[automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca -s ours am: 962cf025d9 -s ours" into rvc-d1-dev-plus-aosp am: d8cdf78876 -s ours" into rvc-qpr-dev-plus-aosp am: a49a8c5581 -s ours 
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 675697222a is in history

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

Change-Id: I15d6fb91873d5305afca8f7533baeb1f90d17b53
 2020-06-19 09:16:58 +00:00
TreeHugger Robot
aa30d07004 [automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca am: ebcd7131a1 -s ours am: 693729a12c -s ours am: bbc97757db -s ours 
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 9807816e09 is in history

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

Change-Id: I585bb40dac9e150138e9f50832056a436361f2b6
 2020-06-19 09:16:32 +00:00
Automerger Merge Worker
b0ee37e42a Merge "[automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca -s ours am: 962cf025d9 -s ours" into rvc-d1-dev-plus-aosp am: d8cdf78876 -s ours 
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 675697222a is in history

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

Change-Id: I7f2940caf545fc5b231674f550cc7f6e9a841955
 2020-06-19 08:54:07 +00:00
TreeHugger Robot
bbc97757db [automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca am: ebcd7131a1 -s ours am: 693729a12c -s ours 
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 9807816e09 is in history

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

Change-Id: Id407fcc682b6692e8a790bfbe45fb8ef968e7fbc
 2020-06-19 08:53:51 +00:00
Automerger Merge Worker
d8cdf78876 Merge "[automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca -s ours am: 962cf025d9 -s ours" into rvc-d1-dev-plus-aosp 2020-06-19 08:40:53 +00:00
TreeHugger Robot
e634bb0f0c [automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca -s ours am: 962cf025d9 -s ours 
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 9807816e09 is in history

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

Change-Id: Id6c49df1433c8210b28ac1397b72cdcf58afbbe6
 2020-06-19 08:40:49 +00:00
TreeHugger Robot
693729a12c [automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca am: ebcd7131a1 -s ours 
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 9807816e09 is in history

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

Change-Id: If485617d584ccc0f27b699da095d4e1844af39dd
 2020-06-19 08:40:41 +00:00
TreeHugger Robot
962cf025d9 [automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca -s ours 
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 9807816e09 is in history

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

Change-Id: I6bb2a35f0f74cbd4bfe9b3a82c322c56b804d034
 2020-06-19 08:28:32 +00:00
TreeHugger Robot
ebcd7131a1 Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908430

Change-Id: I2a5179ac64f00bf6a4254ded6318d6f1c6f9fd6c
 2020-06-19 08:28:26 +00:00
Automerger Merge Worker
d3ea14b39f [automerger skipped] Merge changes from topic "am-0f53dad1f009493ea42909cd982cb371" into rvc-qpr-dev-plus-aosp am: 1f765af2d8 -s ours 
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 9644bc01dd is in history

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

Change-Id: I2fb71a62012b552f56b3fa0935801a3950c2e14c
 2020-06-19 07:24:25 +00:00
Automerger Merge Worker
f16e770721 [automerger skipped] Merge changes from topic "am-c6168f81c15b4bdc8b95f05dbf2b9ba8" into rvc-d1-dev-plus-aosp am: 3c23410f09 -s ours am: f326d9de7b -s ours 
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 9644bc01dd is in history

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

Change-Id: If5412dd79954536f3b2d903ff0e3d5eaa40f35b1
 2020-06-19 07:23:52 +00:00
TreeHugger Robot
462bf5477c [automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 -s ours am: b207e9c9de -s ours am: f170953343 -s ours am: 8a513e070e -s ours 
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 00ea6cecd8 is in history

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

Change-Id: Ie4299cfa86d76b1c47476863f36b7c23718f7c7f
 2020-06-19 07:23:17 +00:00
Automerger Merge Worker
1f765af2d8 Merge changes from topic "am-0f53dad1f009493ea42909cd982cb371" into rvc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 am: d8a97e64b5 am: d861765f0e -s ours
  [automerger skipped] Memory leak due to no stop for IpNeighborMonitor. am: 93e59ee726 am: f56b2d478a am: ebc04eff8c -s ours
 2020-06-19 07:10:43 +00:00
TreeHugger Robot
c3262bd1a5 [automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 am: d8a97e64b5 am: d861765f0e -s ours 
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 9644bc01dd is in history

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

Change-Id: I969dcaa3bfd88f5cda6abd8f30f24ff34bbd396f
 2020-06-19 07:10:26 +00:00