Commits · cf9c5b09435f5805595f8e3c259c7e00b5154495 · Farzin Kazemzadeh / platform_frameworks_base-old

Feb 10, 2021

Merge "Restrict Carrier Wifi while VCN is configured & privileged" am: am: · cf9c5b09

Benedict Wong authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb5858838d6b83ea60880649b53cbb3d78e4df4e

cf9c5b09

Merge "Restrict Carrier Wifi while VCN is configured & privileged" am: · ddc40b5c

Benedict Wong authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8c30dd5ba2ed98c3b308a7213bfca10f214d0d3

ddc40b5c

Merge "Restrict Carrier Wifi while VCN is configured & privileged" · c84bc1f1
Benedict Wong authored 4 years ago

c84bc1f1

Merge "Switch SystemUI from IConnectivityManager to VpnManager." am: am: · ac36f9b6

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1c58ca03094df88edd510c47c060dc2b29c127b

ac36f9b6

Merge "Switch SystemUI from IConnectivityManager to VpnManager." am: · c30b637f

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadeb816ad6abce5d9a0405ae0f9a81139a6473c2

c30b637f

Restrict Carrier Wifi while VCN is configured & privileged · cebde1ed

Benedict Wong authored 4 years ago

This change removes the NOT_RESTRICTED capability for Carrier Wifi. This
is done even if a VCN is in safe mode, but will ONLY be performed if the
VCN is provisioned, and has the appropriate carrier privileges to run.

This change also fixes a test bug where the NOT_VCN_MANAGED capability
was not present in the query to getUnderlyingNetworkPolicy(), and
therefore was incorrectly passing.

Bug: 163432273
Test: atest FrameworksVcnTests
Change-Id: Iecb827b5341bdeb93ef8692c1d62f0eaf9d416ba

cebde1ed

Merge "Switch SystemUI from IConnectivityManager to VpnManager." · 0b303f2d
Lorenzo Colitti authored 4 years ago

0b303f2d

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am:... · a436a9c1

TreeHugger Robot authored 4 years ago

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 53825749 am: 08476180 am: 77d6da84 am: 88ad6db9 am: 3516e98d am: 43ad2093

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I127abae40864d8c4dbc709b21a77e9fcb69e2663

a436a9c1

[automerger skipped] RESTRICT AUTOMERGE am: -s ours am: ... · ec730b6a

Eugene Susla authored 4 years ago

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f am: 3f1fb650 -s ours am: 6766245f am: e52ac322

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fa2fe5cc107f4853c10f7559e1b9d63b8a670fb

ec730b6a

Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: am:... · 28d77c08

TreeHugger Robot authored 4 years ago

Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 67596632 am: a9641173 am: 8eef0f9d am: 0bc002f7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If89872e86cf38dc24d563e38d8ec638dad464efa

28d77c08

[automerger skipped] RESTRICT AUTOMERGE am: am: -s ours... · 457a3807

Eugene Susla authored 4 years ago

[automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c am: 4d587c5a -s ours am: 3c24d07d am: 19456a4b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37877b35cb9051ee6b0fbb434d05711da2a88048

457a3807

[automerger skipped] resolve merge conflicts of... · 22f0fc0e

Michael Groover authored 4 years ago

[automerger skipped] resolve merge conflicts of 540b50bb to qt-qpr1-dev am: 8750762c -s ours am: ebde0f1f -s ours am: 58c483b6 -s ours

am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a9533225 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c6ea8965bacf39b8d05fa285de487394a053980

22f0fc0e

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am:... · 43ad2093

TreeHugger Robot authored 4 years ago

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 53825749 am: 08476180 am: 77d6da84 am: 88ad6db9 am: 3516e98d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fc3424fffffc3751faf53f8ca87d2c94864ce23

43ad2093

[automerger skipped] RESTRICT AUTOMERGE am: -s ours am: ... · e52ac322

Eugene Susla authored 4 years ago

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f am: 3f1fb650 -s ours am: 6766245f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb89ffd735b559380e1ce321b0a8d1170ab44f2e

e52ac322

Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: am:... · 0bc002f7

TreeHugger Robot authored 4 years ago

Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 67596632 am: a9641173 am: 8eef0f9d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c4cc928f634c0dfdc3ec3d036c8c5dfc0bb7167

0bc002f7

[automerger skipped] RESTRICT AUTOMERGE am: am: -s ours am: · 19456a4b

Eugene Susla authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifda810cfa71d212d92dd63ab052136e8fe5e723a

19456a4b

Merge "Fix PolicyListener testing surface." am: am: · fb11991c

Cody Kesting authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60347b063c5102b0abf9e1464c0f9b7438bcf347

fb11991c

[automerger skipped] resolve merge conflicts of... · 58c483b6

Michael Groover authored 4 years ago

[automerger skipped] resolve merge conflicts of 540b50bb to qt-qpr1-dev am: 8750762c -s ours am: ebde0f1f -s ours

am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a9533225 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ba88ee303eb38e19d124331abfda6e09a14afdf

58c483b6

Feb 09, 2021

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am:... · 3516e98d

TreeHugger Robot authored 4 years ago

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 53825749 am: 08476180 am: 77d6da84 am: 88ad6db9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e2cfb8ccae18862b73fc4360016abfe1aa6613

3516e98d

[automerger skipped] RESTRICT AUTOMERGE am: -s ours am: ... · 6766245f

Eugene Susla authored 4 years ago

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f am: 3f1fb650 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I689d2e339d23f8dd2b08f360d27d8520be5c41c2

6766245f

Merge "Fix PolicyListener testing surface." am: · 3b1c79bd

Cody Kesting authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cf14631522a25f64939f67bcd5b65300f657213

3b1c79bd

Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: am: · 8eef0f9d

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22ef7c07d5e7a7284810aff3f5308fcacb1f6b2c

8eef0f9d

[automerger skipped] RESTRICT AUTOMERGE am: am: -s ours · 3c24d07d

Eugene Susla authored 4 years ago

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bc4d6f366fab119da399da1a1a37024c4717dde

3c24d07d

[automerger skipped] resolve merge conflicts of... · ebde0f1f

Michael Groover authored 4 years ago

[automerger skipped] resolve merge conflicts of 540b50bb to qt-qpr1-dev am: 8750762c -s ours

am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a9533225 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id982e8e6f2931509943c5d8e0f77202d04183c9e

ebde0f1f

Merge "Fix PolicyListener testing surface." · c5bc3bcd
Cody Kesting authored 4 years ago

c5bc3bcd

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am:... · 88ad6db9

TreeHugger Robot authored 4 years ago

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 53825749 am: 08476180 am: 77d6da84

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4952f07571992a24f29a80063cd205b54592a5a1

88ad6db9

[automerger skipped] RESTRICT AUTOMERGE am: -s ours am: ... · 3f1fb650

Eugene Susla authored 4 years ago

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51e17655a64f6d3c6ed5a8eac5a22d6eebb68c38

3f1fb650

Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: · a9641173

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I365cb6b774ccb9a4d73654b73bfde00ef2eaf327

a9641173

RESTRICT AUTOMERGE am: · 4d587c5a

Eugene Susla authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0ce89b57ab01e6316b5cad5854b26624b460043

4d587c5a

Merge "[RCS UCE] Expose the IMS RCS feature APIs" am: am: · 1ef592d1

Brad Ebinger authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id772eaf136b0ed8dbca801771055b4485bb22c89

1ef592d1

Merge "Make getKeyStoreForUid convert uid to namespace." am: am: · 89f6fa14

Pavel Grafov authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2be2dae8b59c099acc340b5589cf15f0a79ddbb4

89f6fa14

Merge "Update idmap2_tests to really work host-side" am: am: · be39416f

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a5928b08c04950c67d102ad808a21c896c58f7

be39416f

Merge "[RCS UCE] Expose the IMS RCS feature APIs" am: · d4a311a5

Brad Ebinger authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I543ac89d821aeb92ac12b1049b5d269c50a8764f

d4a311a5

freezer: handle exception in locks file format am: · 8277ea35

Marco Ballesio authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3c8c1c8097f34cc83ae5d5728b40a91d23257ce

8277ea35

Merge "Make getKeyStoreForUid convert uid to namespace." am: · 23db5bf1

Pavel Grafov authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a4b33a1b734a63fe206f41425fd31fcb234d476

23db5bf1

Merge "Update idmap2_tests to really work host-side" am: · ea3212b7

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2ec101728830ba75bc1dc1a75cfdd5ef2af72c7

ea3212b7

Merge "[RCS UCE] Expose the IMS RCS feature APIs" · a7f8e8fe
Brad Ebinger authored 4 years ago

a7f8e8fe
Merge "Make getKeyStoreForUid convert uid to namespace." · fd1b9aa4
Pavel Grafov authored 4 years ago

fd1b9aa4

Fix PolicyListener testing surface. · fecc2a33

Cody Kesting authored 4 years ago

This CL updates VcnManager to provide a test-only method for getting
currently registered VcnUnderlyingNetworkPolicyListeners. This is
preferrable over the current method, which accesses VcnManager's private
Map directly.

Bug: 8675309
Test: atest FrameworksVcnTests
Change-Id: I7afd60ff55868ae44bfa74910ae02daf8a81b107

fecc2a33

freezer: handle exception in locks file format · 911519f2

Marco Ballesio authored 4 years ago

Safeguard /proc/locks processing from wrongly formatted /proc/locks
files

Bug: 179171387
Test: could not reproduce the issue, but verified that no crashes
occurred in a prolonged test (4hrs+)

Change-Id: Ia8a12903f2e520e51780c8b05876aa1c9083e92b
(cherry picked from commit fb4f4073)

911519f2