Nate Myren
4a58495383
Merge "Add Api to get permission group info from PermissionController" into sc-dev am: 41886ea17c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14038044
Change-Id: I35bafecbb81b3e6a385af14f8fc24c41d89f1559
2021-04-01 15:44:26 +00:00
Nate Myren
41886ea17c
Merge "Add Api to get permission group info from PermissionController" into sc-dev
2021-04-01 15:21:09 +00:00
TreeHugger Robot
30d38b7558
Merge "Add more modifiable parameters to DeviceConfig." into sc-dev am: 926b04d868
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14019213
Change-Id: Ic5effe3b722890785a627eeced76f375d6adc908
2021-04-01 15:03:24 +00:00
Jamie Garside
855cc98803
Merge "Open bouncer on screen side of swipe in one-handed mode." into sc-dev am: ee55a8451a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13996770
Change-Id: Idae02c6a4ef5b913e1f6c87950c6719511831f0e
2021-04-01 15:03:10 +00:00
Miranda Kephart
38cd5741d4
Merge "Send ACTION_UP event when aborting a key gesture" into sc-dev am: 2acdea2e0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14036697
Change-Id: I6d9979981c0a53d9337730e42af589e7dcfaf24d
2021-04-01 15:02:56 +00:00
Daniel Sandler
8f9df578ef
Merge "Defend against null intents in CameraIntents." into sc-dev am: 45dbeea371
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14060118
Change-Id: I2c45fbaeaa2b65a54091fdc6decce39e29e5e67a
2021-04-01 15:02:41 +00:00
Jeff DeCew
25fef5e39f
Merge "Notification color fixes" into sc-dev am: 9c95884765
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14020165
Change-Id: I7251d0ec6a087cb7ba388fef9deba555d4b22cf0
2021-04-01 15:02:09 +00:00
TreeHugger Robot
926b04d868
Merge "Add more modifiable parameters to DeviceConfig." into sc-dev
2021-04-01 14:58:23 +00:00
Jamie Garside
ee55a8451a
Merge "Open bouncer on screen side of swipe in one-handed mode." into sc-dev
2021-04-01 14:57:11 +00:00
Miranda Kephart
2acdea2e0e
Merge "Send ACTION_UP event when aborting a key gesture" into sc-dev
2021-04-01 14:49:29 +00:00
Daniel Sandler
45dbeea371
Merge "Defend against null intents in CameraIntents." into sc-dev
2021-04-01 14:43:08 +00:00
Jeff DeCew
9c95884765
Merge "Notification color fixes" into sc-dev
2021-04-01 14:34:45 +00:00
Kholoud Mohamed
b4c37004ff
Merge "Remove DATA_SHARING_RESTRICTION_CHANGED broadcast" into sc-dev am: 58d0a2a950
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14018894
Change-Id: Ib13d7fb130863a36e01856b1c49fa2277fac0d8c
2021-04-01 14:24:11 +00:00
TreeHugger Robot
f20af5fef3
Merge "Update description for skip ownership screen extra" into sc-dev am: c11d161d3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14051145
Change-Id: Idf578041ad0e06f98f826d50cc1fc6dee9c3ee14
2021-04-01 14:23:29 +00:00
Flavio Fiszman
d62b73945d
Merge "Uses PeopleStoryIconFactory in config activity" into sc-dev am: 8b236d0cc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14055405
Change-Id: I999cc3e56f8883b90a35af92daac922f122dbe1e
2021-04-01 14:23:04 +00:00
Aaron Huang
364da77c9f
[automerger skipped] Merge "Expose BIP and VSIM relavent definitions" am: ef74312993 am: 112185f2fa am: f4c048af1c -s ours am: b7279f2dce -s ours
...
am skip reason: skip tag Change-Id I41e881c6fe39e92d5cdac2d0a02fa8a8e814c9c5 with SHA-1 13989ac6fd is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223
Change-Id: Icfea361bc65656fa12096d51b3a82a8482dfb960
2021-04-01 14:22:32 +00:00
Aaron Huang
b271d19873
[automerger skipped] Merge "Move deduceRestrictedCapability to libs/net and rename it" am: c6725ad2bb am: b1d55e7fb0 am: 8e7a6b58d0 -s ours am: 1fb95d5323 -s ours
...
am skip reason: skip tag Change-Id I77970b3a5e5e0e9d263639694b1f06519169bf64 with SHA-1 cb16330091 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999
Change-Id: I2dc9b9a575535175afa2228fd9effe7b98b6db32
2021-04-01 14:21:48 +00:00
Treehugger Robot
527da75a4c
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 7226ad3729 am: a087245e03 am: 3dd40d172b am: 9864e155a8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661581
Change-Id: Ic621a484909047fa86a94729ae4ea9307f4175da
2021-04-01 14:21:27 +00:00
Kholoud Mohamed
58d0a2a950
Merge "Remove DATA_SHARING_RESTRICTION_CHANGED broadcast" into sc-dev
2021-04-01 14:21:00 +00:00
TreeHugger Robot
c11d161d3a
Merge "Update description for skip ownership screen extra" into sc-dev
2021-04-01 13:56:12 +00:00
Flavio Fiszman
8b236d0cc4
Merge "Uses PeopleStoryIconFactory in config activity" into sc-dev
2021-04-01 13:52:19 +00:00
Aaron Huang
b7279f2dce
[automerger skipped] Merge "Expose BIP and VSIM relavent definitions" am: ef74312993 am: 112185f2fa am: f4c048af1c -s ours
...
am skip reason: skip tag Change-Id I41e881c6fe39e92d5cdac2d0a02fa8a8e814c9c5 with SHA-1 13989ac6fd is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223
Change-Id: I82342526cd5d9983d0459b4da014dc8e9bda9482
2021-04-01 13:49:44 +00:00
Aaron Huang
1fb95d5323
[automerger skipped] Merge "Move deduceRestrictedCapability to libs/net and rename it" am: c6725ad2bb am: b1d55e7fb0 am: 8e7a6b58d0 -s ours
...
am skip reason: skip tag Change-Id I77970b3a5e5e0e9d263639694b1f06519169bf64 with SHA-1 cb16330091 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999
Change-Id: I6a434d0839828f3c2692a5cc8d523dbddc92b4ef
2021-04-01 13:47:59 +00:00
Treehugger Robot
9864e155a8
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 7226ad3729 am: a087245e03 am: 3dd40d172b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661581
Change-Id: I99cb5fd94c4ee02688709ad00e3ffbc3e2f388e7
2021-04-01 13:47:07 +00:00
Stanislav Zholnin
ef67a8b033
Add more modifiable parameters to DeviceConfig.
...
Make list of ops tracked and op flag modifiable using
device_config.
Test: in development
Bug: 176965672
Change-Id: I82a20be94d73dbe8cf710e5aebe718c9a5b41a25
2021-04-01 14:33:34 +01:00
Tom Natan
c91918c627
Merge "Add OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD to PlatformCompatChangeRule." into sc-dev am: d127729958
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14019212
Change-Id: I6059691ce0a8c6c4742819c54eb61c02476d5f59
2021-04-01 13:14:22 +00:00
TreeHugger Robot
b9d87a19c5
Merge "Fix a comment typo" into sc-dev am: 2416f4a689
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14063005
Change-Id: Ieddc8c61ad97b919742a7b978cff21c1262fc3b9
2021-04-01 13:13:44 +00:00
Jamie Garside
63fcd2a00a
Open bouncer on screen side of swipe in one-handed mode.
...
This detects where the swipe to open the bouncer comes from when the
device is in left-handed mode, and moves the bouncer to that side.
Currently, this is just a simple case of opening it on the screen half
where the first swipe was, rather than following the finger during the
swipe or anything like that.
Bug: 170858298
Test: atest SystemUITests
Change-Id: I4b18cee7d56fedf792a1923e316778bda077e75f
2021-04-01 13:08:10 +00:00
Aaron Huang
f4c048af1c
Merge "Expose BIP and VSIM relavent definitions" am: ef74312993 am: 112185f2fa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223
Change-Id: Ibab74f3bcf6c804a31be54d4b7183ea75a6e172e
2021-04-01 13:04:07 +00:00
Aaron Huang
8e7a6b58d0
Merge "Move deduceRestrictedCapability to libs/net and rename it" am: c6725ad2bb am: b1d55e7fb0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999
Change-Id: Idc33279ef58a6c2bc971271ccf85cafa264b1d1d
2021-04-01 13:03:23 +00:00
Treehugger Robot
3dd40d172b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 7226ad3729 am: a087245e03
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661581
Change-Id: I70994b32bd4a68bb3d3062d349cc833ba2edf5a0
2021-04-01 13:02:13 +00:00
Tom Natan
d127729958
Merge "Add OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD to PlatformCompatChangeRule." into sc-dev
2021-04-01 12:59:35 +00:00
TreeHugger Robot
2416f4a689
Merge "Fix a comment typo" into sc-dev
2021-04-01 12:56:30 +00:00
TreeHugger Robot
67bb2cd613
Merge "Wire up geotz metrics to the real metrics code" into sc-dev am: 2c08b5e642
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13787671
Change-Id: Ibcc4559438090ec35600ef2fdfbe5b2e3ad2daee
2021-04-01 12:55:55 +00:00
Aaron Huang
112185f2fa
Merge "Expose BIP and VSIM relavent definitions" am: ef74312993
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223
Change-Id: I1e9d92cd27fc0dcd84cc62ad7c2a591c9f5a54e5
2021-04-01 12:26:04 +00:00
Aaron Huang
b1d55e7fb0
Merge "Move deduceRestrictedCapability to libs/net and rename it" am: c6725ad2bb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999
Change-Id: I088dfe837eb986c2de792d0672a2e707112b6042
2021-04-01 12:21:47 +00:00
TreeHugger Robot
2c08b5e642
Merge "Wire up geotz metrics to the real metrics code" into sc-dev
2021-04-01 12:19:39 +00:00
Treehugger Robot
a087245e03
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 7226ad3729
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661581
Change-Id: Ie7cd2d43138155bce1adc3f518df9278bed2d4a2
2021-04-01 12:14:11 +00:00
arangelov
4e75a9dc76
Update description for skip ownership screen extra
...
Bug: 175238386
Fixes: 179307805
Test: compiled
Change-Id: I5633a9145992eff12c3796fedd28aba339f5be43
2021-04-01 12:09:02 +00:00
Sergey Volnov
6db7cce653
Merge "Add a comment to speech recognition service requiring clients targeting Android 11 to specify a <queries> tag." am: 8c6820048d am: 507ca766ac am: 9a4b4693f6 am: d9c6b16308
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660358
Change-Id: I6974833fb01cdc3b9720e5b429a970d1d5c153aa
2021-04-01 11:50:16 +00:00
kholoud mohamed
1192835a56
Remove DATA_SHARING_RESTRICTION_CHANGED broadcast
...
This broadcast was previously used to notify Managed Provisioning
that data sharing restrtiction has changed, this is no longer handled
in Managed Provisioning and is now handled in DPMS.
Fixes: 177221010
Test: N/A
Change-Id: I4e3fbb94c41f944afb41e226c06d1fffcc8bc264
2021-04-01 11:47:04 +00:00
Aaron Huang
ef74312993
Merge "Expose BIP and VSIM relavent definitions"
2021-04-01 11:38:17 +00:00
Aaron Huang
c6725ad2bb
Merge "Move deduceRestrictedCapability to libs/net and rename it"
2021-04-01 11:37:51 +00:00
Sergey Volnov
d9c6b16308
Merge "Add a comment to speech recognition service requiring clients targeting Android 11 to specify a <queries> tag." am: 8c6820048d am: 507ca766ac am: 9a4b4693f6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660358
Change-Id: I4fb577b783a1fcc7b4817fc6fba9d8c56e14e5b5
2021-04-01 11:35:08 +00:00
Neil Fuller
6ce6d59024
Merge "Track API changes TimeZoneDetector -> TimeManager" into sc-dev am: 93a0dca3df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14056566
Change-Id: I38b9ec4834b7be583c1298516e5b8221d2b4c6af
2021-04-01 11:29:50 +00:00
Treehugger Robot
7226ad3729
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base"
2021-04-01 11:27:29 +00:00
Neil Fuller
93a0dca3df
Merge "Track API changes TimeZoneDetector -> TimeManager" into sc-dev
2021-04-01 11:01:41 +00:00
Biswarup Pal
6cb70458bf
Merge "Free only the required bytes from StorageManagerService" into sc-dev am: 4f8d78e778
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14034626
Change-Id: I55d39004b634400d4bf642fbb2cb60e87e0d39d0
2021-04-01 10:50:47 +00:00
Biswarup Pal
4a761808ba
Merge "Refactor FileUtils#convertToModernFd" into sc-dev am: 3d73c3ad22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13725034
Change-Id: Icccdbbd7d692159780ca6714f110008391d11cb2
2021-04-01 10:50:35 +00:00
Chalard Jean
2bb91cdf7e
Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c5a am: e965720924 am: b139c0e716 am: 9d0057edb6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998
Change-Id: I2954b6923a07a51b521860a42355a9b0388c8bcf
2021-04-01 10:50:23 +00:00