Commit Graph

622795 Commits

Author SHA1 Message Date
TreeHugger Robot
fa341d7986 Merge "Connect TunerFilter with FilterClient" into sc-dev 2021-02-05 09:21:38 +00:00
Alex Florescu
cbdc7ee5d9 Merge "Ensure ConstraintLayout children have ids" into sc-dev 2021-02-05 08:35:59 +00:00
Paul Hu
4c834140cf Merge "Replace NPMI#isUidNetworkingBlocked()" am: 830e1e9576 am: b3e4a2305d am: 505ac115c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53f5fb0996ad08c8a44c0560ab72725c47e39215
2021-02-05 08:15:29 +00:00
Paul Hu
505ac115c6 Merge "Replace NPMI#isUidNetworkingBlocked()" am: 830e1e9576 am: b3e4a2305d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c9f22befc69af4b4dc796d7fb432314cf8e3c3f
2021-02-05 07:43:12 +00:00
Amy Zhang
0bd7e2830d Merge "Connect TunerTimeFilter/TunerDemux with TimeFilterClient/DemuxClient" into sc-dev 2021-02-05 07:37:12 +00:00
Sarah Chin
baab776860 [automerger skipped] Merge "Update setSubscriptionOverride API to allow network types" am: 1c600eed49 am: 3cde1b28c9 -s ours am: 1a99c16d7c -s ours
am skip reason: Change-Id Ie196db5e236e478f1c29c3dfd1ca31acc205c54b with SHA-1 9762f014fa is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc704a20cdb84c696ec22033f57a331195234e1e
2021-02-05 07:03:56 +00:00
Paul Hu
b3e4a2305d Merge "Replace NPMI#isUidNetworkingBlocked()" am: 830e1e9576
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c4b745fa67c8db72d04eb48582d06916f58902d
2021-02-05 07:01:42 +00:00
TreeHugger Robot
4c1c534604 Merge "Exposed UserManager.isHeadlessSystemUserMode() as public API." into sc-dev 2021-02-05 07:00:35 +00:00
Paul Hu
830e1e9576 Merge "Replace NPMI#isUidNetworkingBlocked()" 2021-02-05 06:38:02 +00:00
TreeHugger Robot
6beb5e87c4 Merge "Remove special logic for top/bottom gesture insets" into sc-dev 2021-02-05 06:26:41 +00:00
TreeHugger Robot
241f3b293b Merge "Add support for 10-bit YUV P010 ImageFormat" into sc-dev 2021-02-05 06:18:27 +00:00
Sarah Chin
1a99c16d7c [automerger skipped] Merge "Update setSubscriptionOverride API to allow network types" am: 1c600eed49 am: 3cde1b28c9 -s ours
am skip reason: Change-Id Ie196db5e236e478f1c29c3dfd1ca31acc205c54b with SHA-1 9762f014fa is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19d551d9f9c517f553af103b54ce615b6502521e
2021-02-05 06:16:01 +00:00
Sarah Chin
3cde1b28c9 Merge "Update setSubscriptionOverride API to allow network types" am: 1c600eed49
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3dc22a55c1de4b51927499d1d33b1aa66b8a752
2021-02-05 05:49:59 +00:00
Sarah Chin
1c600eed49 Merge "Update setSubscriptionOverride API to allow network types" 2021-02-05 05:14:50 +00:00
Kohsuke Yatoh
b4dcfabf07 Merge "Run UpdatableSystemFontTest in postsubmit." into sc-dev 2021-02-05 05:04:15 +00:00
James Mattis
53f0b23678 Merge changes Ic41fdc40,I5851a36e am: 34989a9c9e am: 5996679b4b am: 9d82a647f0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc7fa53e74c2c4af89df02f1610105f1e62d06c4
2021-02-05 05:02:20 +00:00
Brad Ebinger
7bf20a9c07 Merge "Discard dead MmTelFeature Binder Instances" am: 9e1009dd55 am: 36199d0322 am: b985f68522
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b22954276763218ba224fdd4239953adc357123
2021-02-05 05:01:56 +00:00
Julien Desprez
51fe7a453a Merge "Remove TEST_MAPPING entry based on go/a-unit-tests update" am: cc7362c63c am: 42515759a4 am: b539162ed1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa585ef4ca529150b02e2d7469f13d8fa5c53682
2021-02-05 05:01:29 +00:00
Andrii Kulian
90f1b95ccf Merge "Add sample WM Jetpack Extensions impl" into sc-dev 2021-02-05 04:55:02 +00:00
Charles Chen
582247eef0 Merge changes from topic "window_context_2.0" into sc-dev
* changes:
  Apply WindowContext 2.0 for InputMethodMenuController
  Migrate WindowContext to WindowContextListener mechanism
2021-02-05 04:53:09 +00:00
TreeHugger Robot
c2ca5cbac4 Merge "Consolidating MODIFY_AUDIO_SETTING permission checks" into sc-dev 2021-02-05 04:47:38 +00:00
James Mattis
9d82a647f0 Merge changes Ic41fdc40,I5851a36e am: 34989a9c9e am: 5996679b4b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d16914403745fe0a1421423667ad3a7cd00a4e5
2021-02-05 04:36:08 +00:00
Brad Ebinger
b985f68522 Merge "Discard dead MmTelFeature Binder Instances" am: 9e1009dd55 am: 36199d0322
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I376bc488d54805332da88bd138514a9eb8a1784d
2021-02-05 04:35:48 +00:00
Julien Desprez
b539162ed1 Merge "Remove TEST_MAPPING entry based on go/a-unit-tests update" am: cc7362c63c am: 42515759a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3454edd6262b6709c90fbd9b7075da39e566b34c
2021-02-05 04:35:37 +00:00
James Mattis
5996679b4b Merge changes Ic41fdc40,I5851a36e am: 34989a9c9e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id949051a7aa834be339530f5db6cdd36ec2ea7f2
2021-02-05 03:49:50 +00:00
Brad Ebinger
36199d0322 Merge "Discard dead MmTelFeature Binder Instances" am: 9e1009dd55
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3a57c891b4be0d45d7b7686cc85bd8a01512ddb
2021-02-05 03:41:35 +00:00
Sarah Chin
4e452808c0 [automerger skipped] Merge "Update setSubscriptionOverride API to allow network types" into rvc-qpr-dev-plus-aosp am: 707d05ce93 -s ours
am skip reason: Change-Id Ie196db5e236e478f1c29c3dfd1ca31acc205c54b with SHA-1 b321fb5fc8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6472ac6f2dd11a15fc9c440552e2293901f0ec6
2021-02-05 03:38:22 +00:00
Julien Desprez
42515759a4 Merge "Remove TEST_MAPPING entry based on go/a-unit-tests update" am: cc7362c63c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e085ac4141421561227c2c1878e24c1003cb004
2021-02-05 03:35:37 +00:00
James Mattis
34989a9c9e Merge changes Ic41fdc40,I5851a36e
* changes:
  Updating Existing CS APIs for multiple defaults
  Transmitting multiple default networks to netd
2021-02-05 03:12:38 +00:00
Brad Ebinger
9e1009dd55 Merge "Discard dead MmTelFeature Binder Instances" 2021-02-05 03:12:28 +00:00
Sarah Chin
707d05ce93 Merge "Update setSubscriptionOverride API to allow network types" into rvc-qpr-dev-plus-aosp 2021-02-05 03:05:24 +00:00
Calvin Pan
ca389a6427 Merge "Add a carrier config for non-RCS capabilities expiration" am: 454e15dc12 am: 1285ab52ce am: 6362783d8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561617

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0054d3821355ceda57d4df85af704c8bf7433f2
2021-02-05 02:51:35 +00:00
Muhammad Qureshi
cfc401ac80 Merge "Use annotation id @SystemApi constants in StatsLog" am: eb043b78a5 am: 59d282be17 am: d8d235dd29
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9c9c20d299432948a23150355a3f49192834f1c
2021-02-05 02:51:13 +00:00
Cole Faust
041a9d1fb6 Merge "Create ux restricted customizations for DeviceDefault buttons and switches" into rvc-qpr-dev am: 89af47ea21 am: e9a7a1cf62
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13472372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dfde5e1af634a2c9636caecf693540e7758e76b
2021-02-05 02:50:40 +00:00
Julien Desprez
cc7362c63c Merge "Remove TEST_MAPPING entry based on go/a-unit-tests update" 2021-02-05 02:50:16 +00:00
TreeHugger Robot
8098f49d2b Merge "Save locale list to Font instance" into sc-dev 2021-02-05 02:23:11 +00:00
Ben Lin
563727df26 Merge "PiP: Pinch-resize auto to max size if it's pretty close to it." into sc-dev 2021-02-05 02:19:38 +00:00
Amy Zhang
7e55ac002f Connect TunerFilter with FilterClient
Test: make
Bug: 174095851
Change-Id: If57bda43eea7e4404692943510a33ab4e66bf2e6
2021-02-04 18:09:09 -08:00
Calvin Pan
6362783d8c Merge "Add a carrier config for non-RCS capabilities expiration" am: 454e15dc12 am: 1285ab52ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561617

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I117abe342c7928f287c7a5f3f947b32e5da6678e
2021-02-05 01:53:21 +00:00
Muhammad Qureshi
d8d235dd29 Merge "Use annotation id @SystemApi constants in StatsLog" am: eb043b78a5 am: 59d282be17
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65e6c014643c59c8b6c04f981eb4d837e50fd864
2021-02-05 01:53:04 +00:00
Cole Faust
e9a7a1cf62 Merge "Create ux restricted customizations for DeviceDefault buttons and switches" into rvc-qpr-dev am: 89af47ea21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13472372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90d338b2610f71d90ccc90ade0210dc09d9fd1fb
2021-02-05 01:52:33 +00:00
Calvin Pan
1285ab52ce Merge "Add a carrier config for non-RCS capabilities expiration" am: 454e15dc12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561617

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a998f7850c8be6f8813b8b4f079fb98f518e98b
2021-02-05 01:39:55 +00:00
James Lin
e5e204f62b Merge "[RCS UCE] Add a network response with Reason header info callback for the publish request and subscribe request." am: 77c5faf493 am: 09f4410ea2 am: 4472f1f545
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570560

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5030cd96b091410af130c9916c564b3f296ec230
2021-02-05 01:30:32 +00:00
Tobias Thierer
c0299a52e7 Merge "Update services/backup/OWNERS" am: 84da5781da am: 7b4dda6f1d am: b67de755a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575284

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cd90ff26c0e0fc46f0accaba8961e773d4b89ab
2021-02-05 01:29:20 +00:00
Muhammad Qureshi
59d282be17 Merge "Use annotation id @SystemApi constants in StatsLog" am: eb043b78a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e4adc2d6e5e8dcea181d6cbcb93f87b3e103ac2
2021-02-05 01:28:29 +00:00
Calvin Pan
454e15dc12 Merge "Add a carrier config for non-RCS capabilities expiration" 2021-02-05 01:27:59 +00:00
Cole Faust
89af47ea21 Merge "Create ux restricted customizations for DeviceDefault buttons and switches" into rvc-qpr-dev 2021-02-05 01:24:59 +00:00
Muhammad Qureshi
eb043b78a5 Merge "Use annotation id @SystemApi constants in StatsLog" 2021-02-05 01:10:34 +00:00
Chris Tate
191b3b9db5 Merge "Revert "Put broadcast timekeeping on its own thread"" into sc-dev 2021-02-05 00:57:55 +00:00
TreeHugger Robot
7ff13b5213 Merge "Disable split screen tests at 90 degrees" into sc-dev 2021-02-05 00:53:37 +00:00