Commits · 6e2ccc1824be9a33e75403d6272c3248868463cd · Farzin Kazemzadeh / platform_frameworks_base-old

Apr 04, 2024

Merge changes I7c63d523,Id0ac7d06 into udc-dev am: · 6e2ccc18

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

Change-Id: I718ce1d5f7fba3f9eaf36f1a5ecf4e0fdf260e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6e2ccc18

Fix bug in screen capture and lock task migrations am: · fdab86e2

Kholoud Mohamed authored 1 year ago

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

Change-Id: I2e0b907c5c990bde1ca0717b3b0b4006742d6b28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fdab86e2

Merge changes I7c63d523,Id0ac7d06 into udc-dev · 132292ab

Kholoud Mohamed authored 1 year ago

* changes:
  [Bugfix]migrate user restrictions to DevicePolicyEngine
  Fix bug in screen capture and lock task migrations

132292ab

Apr 03, 2024

Merge "[CDM][CMD] Check permissions for CDM shell commands" into udc-dev am: · ef762c81

Guojing Yuan authored 1 year ago

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

Change-Id: Icaad95a8f99e31ed8279204e680a88d165bcee8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ef762c81

Merge "[CDM][CMD] Check permissions for CDM shell commands" into udc-dev · 3409c5db
Guojing Yuan authored 1 year ago

3409c5db

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that... · eeea4d99

Guojing Yuan authored 1 year ago

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours am: ca1ed38f -s ours am: d8ee4d8b -s ours am: 5da632b1 -s ours am: 1694173e -s ours am: 9630ba97 -s ours

am skip reason: contains skip directive

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



Change-Id: I7c6a209e711aa11bc9886f7089a0b3d196132aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

eeea4d99

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 3ed22308

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf am: a265dfa7 -s ours am: 11b0ff5a -s ours am: 83408a2e -s ours am: 346dd1bb -s ours am: 71da8923 -s ours am: 0e941d37 -s ours

am skip reason: contains skip directive

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



Change-Id: I19a7bdc4d535479c5becac451f0cd095a9e7725b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3ed22308

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that... · 9630ba97

Guojing Yuan authored 1 year ago

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours am: ca1ed38f -s ours am: d8ee4d8b -s ours am: 5da632b1 -s ours am: 1694173e -s ours

am skip reason: contains skip directive

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



Change-Id: I232606abd391e38223d134fd329bc6af92d6923e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9630ba97

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that... · ec4fd452

Guojing Yuan authored 1 year ago

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours am: ca1ed38f -s ours am: d8ee4d8b -s ours am: 49085501 -s ours am: deafb2d4 -s ours

am skip reason: contains skip directive

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



Change-Id: Idb59ebd3a4ab0540d623daaac9eece8bf2ea72de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ec4fd452

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · be310de7

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf am: a265dfa7 -s ours am: 11b0ff5a -s ours am: 83408a2e -s ours am: 123ee982 -s ours am: 6060da37 -s ours

am skip reason: contains skip directive

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



Change-Id: I565073a90a233bbbef5e78f7325af342ba1728aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

be310de7

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 0e941d37

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf am: a265dfa7 -s ours am: 11b0ff5a -s ours am: 83408a2e -s ours am: 346dd1bb -s ours am: 71da8923 -s ours

am skip reason: contains skip directive

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



Change-Id: I54bab6bae85f72de74c9421dae50ab9041c86a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0e941d37

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that... · deafb2d4

Guojing Yuan authored 1 year ago

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours am: ca1ed38f -s ours am: d8ee4d8b -s ours am: 49085501 -s ours

am skip reason: contains skip directive

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



Change-Id: Id6b9bf4d722ac9a28983792f33ac882f63c50bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

deafb2d4

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 6060da37

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf am: a265dfa7 -s ours am: 11b0ff5a -s ours am: 83408a2e -s ours am: 123ee982 -s ours

am skip reason: contains skip directive

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



Change-Id: I590916869e7b6ff1bb027614b635dacf32e74d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6060da37

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that... · 1694173e

Guojing Yuan authored 1 year ago

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours am: ca1ed38f -s ours am: d8ee4d8b -s ours am: 5da632b1 -s ours

am skip reason: contains skip directive

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



Change-Id: I874f580ad1f568a62f0b4589e393b2ef5dedf7f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1694173e

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 71da8923

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf am: a265dfa7 -s ours am: 11b0ff5a -s ours am: 83408a2e -s ours am: 346dd1bb -s ours

am skip reason: contains skip directive

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



Change-Id: Iab2f40f20d2f88d9e114b82c5e083c202bf99db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

71da8923

[CDM][CMD] Check permissions for CDM shell commands · 54c968aa

Guojing Yuan authored 1 year ago

Override handleShellCommand instead of onShellCommand because
Binder.onShellCommand checks the necessary permissions of the caller.

Bug: 313428840

Test: manually tested CDM shell commands
Change-Id: I5539b3594feb5544c458c0fd1061b51a0a808900
Merged-In: I5539b3594feb5544c458c0fd1061b51a0a808900
(cherry picked from commit 1761a0fe)

54c968aa

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that... · 5da632b1

Guojing Yuan authored 1 year ago

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours am: ca1ed38f -s ours am: d8ee4d8b -s ours

am skip reason: contains skip directive

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



Change-Id: Idcbf63945c99567de6664c192089aa81eb63a688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5da632b1

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that... · 49085501

Guojing Yuan authored 1 year ago

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours am: ca1ed38f -s ours am: d8ee4d8b -s ours

am skip reason: contains skip directive

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



Change-Id: I7cffb7a321051bc5f456eabb65e23f758af68375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

49085501

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 346dd1bb

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf am: a265dfa7 -s ours am: 11b0ff5a -s ours am: 83408a2e -s ours

am skip reason: contains skip directive

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



Change-Id: Ic81f623876edd93341e2b88b6d62c8e4b7394c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

346dd1bb

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 123ee982

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf am: a265dfa7 -s ours am: 11b0ff5a -s ours am: 83408a2e -s ours

am skip reason: contains skip directive

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



Change-Id: Id0d3b9ce0093c90716f5506ea680dfb23d844359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

123ee982

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that... · d8ee4d8b

Guojing Yuan authored 1 year ago

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours am: ca1ed38f -s ours

am skip reason: contains skip directive

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



Change-Id: If47a81c5334ca0ea00ab83744dd96c5c8383d2f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d8ee4d8b

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 83408a2e

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf am: a265dfa7 -s ours am: 11b0ff5a -s ours

am skip reason: contains skip directive

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



Change-Id: I898ac1fa64af4b01eb1dcbe3dc9b5e20e2492f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

83408a2e

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that... · ca1ed38f

Guojing Yuan authored 1 year ago

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours

am skip reason: contains skip directive

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



Change-Id: Ic5cf13d4863e1fdb536f24f607945d953d052039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ca1ed38f

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 11b0ff5a

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf am: a265dfa7 -s ours

am skip reason: contains skip directive

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



Change-Id: I727e2ed850f6545c29eb4b693a0f1062ba5a4beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

11b0ff5a

Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip... · 14359bbd

Guojing Yuan authored 1 year ago

Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb

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

Change-Id: I3f1e26d2ffba2b7cef531d1d0aa60b0aad11e80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

14359bbd

[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by... · a265dfa7

Guojing Yuan authored 1 year ago

[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf

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



Change-Id: I0a2786b2acf44a5976bffa974050142b5e76209d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a265dfa7

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 168dbdc2

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 8a1346ce -s ours am: 2a88b66d -s ours am: 56c86192 -s ours am: 2cc57248 -s ours am: 7210bb82 -s ours am: 6ad221db -s ours

am skip reason: contains skip directive

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



Change-Id: I2d09afe10d83dc2bdd9e09ab4c87bfe5070cfadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

168dbdc2

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 908429d2

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: f28e88e5 -s ours am: 522be97f -s ours am: 3921f04e -s ours am: f5ddb900 -s ours am: dcb34931 -s ours

am skip reason: contains skip directive

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



Change-Id: I70ae1cc37da72c7c4958864a3c56327dcaa7db4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

908429d2

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 6ad221db

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 8a1346ce -s ours am: 2a88b66d -s ours am: 56c86192 -s ours am: 2cc57248 -s ours am: 7210bb82 -s ours

am skip reason: contains skip directive

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



Change-Id: I2b0ee1f3a0cee0075757c4fc8646edb882a12047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6ad221db

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · de1cddc3

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 8a1346ce -s ours am: 2a88b66d -s ours am: 56c86192 -s ours am: a254b5f4 -s ours am: ff32fc2f -s ours

am skip reason: contains skip directive

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



Change-Id: I7b21898dfe4b789637f562c912931373603f6cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

de1cddc3

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · c7a6e9b4

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: f28e88e5 -s ours am: 522be97f -s ours am: a55309bd -s ours am: c6433f1d -s ours

am skip reason: contains skip directive

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



Change-Id: I3eb8c8939b4d14ec3b24c02bd83279f6a32421fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c7a6e9b4

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · dcb34931

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: f28e88e5 -s ours am: 522be97f -s ours am: 3921f04e -s ours am: f5ddb900 -s ours

am skip reason: contains skip directive

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



Change-Id: I01d5c003b3c99b4848614b4e78362e1872a8f314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dcb34931

Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip... · 97cf09bb
Guojing Yuan authored 1 year ago
```
Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev
```
97cf09bb

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · ff32fc2f

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 8a1346ce -s ours am: 2a88b66d -s ours am: 56c86192 -s ours am: a254b5f4 -s ours

am skip reason: contains skip directive

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



Change-Id: If0dff92c7cc2f585b253e1371f0391aa198a5fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ff32fc2f

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · c6433f1d

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: f28e88e5 -s ours am: 522be97f -s ours am: a55309bd -s ours

am skip reason: contains skip directive

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



Change-Id: I85b9468dc9cc7b82a5d05b40ddab06e6b394e1e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c6433f1d

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 7210bb82

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 8a1346ce -s ours am: 2a88b66d -s ours am: 56c86192 -s ours am: 2cc57248 -s ours

am skip reason: contains skip directive

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



Change-Id: If4d42fb56b970e37780da269a490d9459cd33a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7210bb82

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · f5ddb900

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: f28e88e5 -s ours am: 522be97f -s ours am: 3921f04e -s ours

am skip reason: contains skip directive

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



Change-Id: Ic2027ca8550edb27feac4132f1b6810ed41fb94a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f5ddb900

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 2cc57248

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 8a1346ce -s ours am: 2a88b66d -s ours am: 56c86192 -s ours

am skip reason: contains skip directive

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



Change-Id: Ia48ecfd05a201bb8b96277961556411d1f445d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2cc57248

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · a254b5f4

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 8a1346ce -s ours am: 2a88b66d -s ours am: 56c86192 -s ours

am skip reason: contains skip directive

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



Change-Id: Iad6b23e5a8f6d93d9b2df3bbe7ee580e1ba5ae3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a254b5f4

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p... · 3921f04e

Guojing Yuan authored 1 year ago

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: f28e88e5 -s ours am: 522be97f -s ours

am skip reason: contains skip directive

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



Change-Id: If3150eddc9c4ef2d97d2b5adbe0dafde28c5fc35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3921f04e