Sudheer Shanka
e38ccc8356
[automerger skipped] Merge changes I2867a158,I98de12b5 am: 81df5357e6 -s ours am: 3bdbdf590c -s ours am: c4ff8d7f13 -s ours
...
am skip reason: Merged-In I2867a15840a0987c948179e2f8069e652c4a0c1f with SHA-1 6db81c15df is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133994
Change-Id: Ibf9603bd5ac47f2acc8c328e6f995582d03db627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 19:02:27 +00:00
Sudheer Shanka
06c23b4345
[automerger skipped] Allow shell uid without checking the package name. am: fcef75158f -s ours am: 4677409cfd -s ours am: 1c77537386 -s ours
...
am skip reason: Merged-In I2867a15840a0987c948179e2f8069e652c4a0c1f with SHA-1 6db81c15df is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133994
Change-Id: I29787f326a6fcba2f70021f54f4b2f61d595b701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 19:02:25 +00:00
Automerger Merge Worker
f990d1278d
Merge "Merge "Perform the user-allowlist check after all other fixed allowlist check" into tm-dev am: 6d33a7c73b am: d1539100c7" into tm-d1-dev-plus-aosp
2022-07-26 19:02:02 +00:00
Jing Ji
9891393ca3
Merge "Perform the user-allowlist check after all other fixed allowlist check" into tm-dev am: 6d33a7c73b am: d1539100c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19302198
Change-Id: I04bf30ad57b6d8bb90a07b5d0bf6e1b72b29bc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 19:01:58 +00:00
Jing Ji
8ca8560891
Merge "Perform the user-allowlist check after all other fixed allowlist check" into tm-dev am: 6d33a7c73b am: 36aa6a4bff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19302198
Change-Id: I59aada49aa352db3ebbba0bf32850bbda76ed7e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 19:01:49 +00:00
Sudheer Shanka
c4ff8d7f13
[automerger skipped] Merge changes I2867a158,I98de12b5 am: 81df5357e6 -s ours am: 3bdbdf590c -s ours
...
am skip reason: Merged-In I2867a15840a0987c948179e2f8069e652c4a0c1f with SHA-1 6db81c15df is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133994
Change-Id: Iaee7e073bf162e7b83c3251e3ffda1c1e1800e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 19:00:51 +00:00
Sudheer Shanka
1c77537386
[automerger skipped] Allow shell uid without checking the package name. am: fcef75158f -s ours am: 4677409cfd -s ours
...
am skip reason: Merged-In I2867a15840a0987c948179e2f8069e652c4a0c1f with SHA-1 6db81c15df is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133994
Change-Id: If81b0c2215b6dfa22dbc42fe54dc514fac652bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 19:00:35 +00:00
Jing Ji
36aa6a4bff
Merge "Perform the user-allowlist check after all other fixed allowlist check" into tm-dev am: 6d33a7c73b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19302198
Change-Id: I16879e9e466d3534e5e8dbd8fdcb1a0e72a5cd8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 18:37:19 +00:00
Sudheer Shanka
3bdbdf590c
[automerger skipped] Merge changes I2867a158,I98de12b5 am: 81df5357e6 -s ours
...
am skip reason: Merged-In I2867a15840a0987c948179e2f8069e652c4a0c1f with SHA-1 6db81c15df is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133994
Change-Id: I49d2a8ed8d59c31636ae71526c138c70b2613f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 18:37:08 +00:00
Sudheer Shanka
4677409cfd
[automerger skipped] Allow shell uid without checking the package name. am: fcef75158f -s ours
...
am skip reason: Merged-In I2867a15840a0987c948179e2f8069e652c4a0c1f with SHA-1 6db81c15df is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133994
Change-Id: I81f0d6576c20bd054b7044d50e1a36b8c81b75a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 18:36:50 +00:00
Jing Ji
d1539100c7
Merge "Perform the user-allowlist check after all other fixed allowlist check" into tm-dev am: 6d33a7c73b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19302198
Change-Id: Idb4e79ab6a65a4b6faafdc3ba019f88c33c5e1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 18:35:50 +00:00
Sudheer Shanka
81df5357e6
Merge changes I2867a158,I98de12b5
...
* changes:
Allow shell uid without checking the package name.
Allow apps receiving MediaSession callbacks to start FGS from BG.
2022-07-26 17:40:37 +00:00
Almaz Mingaleev
f39d439341
Merge "Inline Time.TIMEZONE_UTC." am: a092e31b3e am: ce361177f5 am: 5d4265af9b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2165722
Change-Id: Ib099befe3e91f433ad00b94ec091e207342e2874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 17:39:03 +00:00
Treehugger Robot
d723156cbc
[automerger skipped] Merge "Revert^2 "Move out allowlists for com.android.cellbroadcast"" am: 86b958b661 -s ours am: 13b5cdb38a -s ours am: 42a50bd598 -s ours
...
am skip reason: Merged-In I7155dbad359af7480bce1c6b321b17032acaab5e with SHA-1 1ce3acc30f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147020
Change-Id: I2e8c15ffcec4ac86dc62c8b422b62c7ebf230d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 17:38:25 +00:00
Andrei-Valentin Onea
e01666d371
[automerger skipped] Revert^2 "Move out allowlists for com.android.cellbroadcast" am: 73c22ade48 -s ours am: 280d188435 -s ours am: da1f8fbd95 -s ours
...
am skip reason: Merged-In I7155dbad359af7480bce1c6b321b17032acaab5e with SHA-1 1ce3acc30f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147020
Change-Id: I384170cbc6b2a696efb2bdd1ab676e14cc5ca2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 17:38:14 +00:00
Jing Ji
6d33a7c73b
Merge "Perform the user-allowlist check after all other fixed allowlist check" into tm-dev
2022-07-26 17:34:45 +00:00
Almaz Mingaleev
5d4265af9b
Merge "Inline Time.TIMEZONE_UTC." am: a092e31b3e am: ce361177f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2165722
Change-Id: Ie66a5ca13ae823b0891aeafc1d901b9293e11582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 17:13:16 +00:00
Treehugger Robot
42a50bd598
[automerger skipped] Merge "Revert^2 "Move out allowlists for com.android.cellbroadcast"" am: 86b958b661 -s ours am: 13b5cdb38a -s ours
...
am skip reason: Merged-In I7155dbad359af7480bce1c6b321b17032acaab5e with SHA-1 1ce3acc30f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147020
Change-Id: I8113a8eb77c95938bf86ce2f8ac13692524dfda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 17:12:41 +00:00
Andrei-Valentin Onea
da1f8fbd95
[automerger skipped] Revert^2 "Move out allowlists for com.android.cellbroadcast" am: 73c22ade48 -s ours am: 280d188435 -s ours
...
am skip reason: Merged-In I7155dbad359af7480bce1c6b321b17032acaab5e with SHA-1 1ce3acc30f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147020
Change-Id: Id62f5899d30e9be71184795aff8948457ef7d09e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 17:12:39 +00:00
Almaz Mingaleev
ce361177f5
Merge "Inline Time.TIMEZONE_UTC." am: a092e31b3e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2165722
Change-Id: Ie60c2ad23c8ad0a97d1f6b23e23e035fc3cdf3cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 16:46:17 +00:00
Almaz Mingaleev
a092e31b3e
Merge "Inline Time.TIMEZONE_UTC."
2022-07-26 16:40:28 +00:00
Trevor Radcliffe
c270776927
Merge "Point directly to generated c sysprop_library" into stage-aosp-master am: a576fe427c am: e2c180d26c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19396033
Change-Id: I8ef00d8dde8910f5c6880696165e089a0a7a1db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 16:39:18 +00:00
Treehugger Robot
13b5cdb38a
[automerger skipped] Merge "Revert^2 "Move out allowlists for com.android.cellbroadcast"" am: 86b958b661 -s ours
...
am skip reason: Merged-In I7155dbad359af7480bce1c6b321b17032acaab5e with SHA-1 1ce3acc30f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147020
Change-Id: I49ffedc64a062b68e436c75050f87503d21fab2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 16:39:08 +00:00
Andrei-Valentin Onea
280d188435
[automerger skipped] Revert^2 "Move out allowlists for com.android.cellbroadcast" am: 73c22ade48 -s ours
...
am skip reason: Merged-In I7155dbad359af7480bce1c6b321b17032acaab5e with SHA-1 1ce3acc30f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147020
Change-Id: If0831389b839f35672b2544431a3b850b1956e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 16:38:52 +00:00
Almaz Mingaleev
091ba50a61
Merge "Remove Time use." am: c2e6b1cc84 am: a90eff342e am: 1537f9d90a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2164084
Change-Id: I7aad91dd966e25a2f72b7da4bf48233dad9ecb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 16:38:33 +00:00
Trevor Radcliffe
e2c180d26c
Merge "Point directly to generated c sysprop_library" into stage-aosp-master am: a576fe427c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19396033
Change-Id: Ida107ce9cda052c0aefc6cd1e388f73be69b9875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 15:48:33 +00:00
Almaz Mingaleev
1537f9d90a
Merge "Remove Time use." am: c2e6b1cc84 am: a90eff342e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2164084
Change-Id: I51ced28f1d129dd3f8d01074b948c6f7aa156664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 15:48:12 +00:00
Treehugger Robot
86b958b661
Merge "Revert^2 "Move out allowlists for com.android.cellbroadcast""
2022-07-26 15:44:00 +00:00
Trevor Radcliffe
a576fe427c
Merge "Point directly to generated c sysprop_library" into stage-aosp-master
2022-07-26 15:27:02 +00:00
Almaz Mingaleev
a90eff342e
Merge "Remove Time use." am: c2e6b1cc84
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2164084
Change-Id: Idb20042d929b88ba4c2799a3ff10fc6746226487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 15:22:32 +00:00
Almaz Mingaleev
dfb45d6b29
Inline Time.TIMEZONE_UTC.
...
Time is deprecated and should not be used.
Bug: 16550209
Test: atest FrameworksCoreTests:android.net.NetworkPolicyTest
Change-Id: Ib1a29f52982701028e63da2856b9fbb3626244f9
2022-07-26 16:20:09 +01:00
Vaibhav Devmurari
41988d3520
Merge "Make ScreenDecorations NOT_TOUCHABLE" into tm-d1-dev am: fa6cd620d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19379306
Change-Id: I53725eaefde8679b14138e02e149a5a0d2f7cc40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 15:14:31 +00:00
Almaz Mingaleev
c2e6b1cc84
Merge "Remove Time use."
2022-07-26 14:58:38 +00:00
Vaibhav Devmurari
fa6cd620d9
Merge "Make ScreenDecorations NOT_TOUCHABLE" into tm-d1-dev
2022-07-26 14:51:26 +00:00
TreeHugger Robot
a0c0c2c35b
Merge "Add a missing dependency for UpdatableSystemFontTest" into tm-dev-plus-aosp am: 2d6129ae6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19415074
Change-Id: I242994d2591b0d2a15dd1b2808d8b39ef9095cfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 12:30:40 +00:00
Julia Reynolds
c6da507a0b
Merge "[NMS] Call isServiceTokenValidLocked with lock." am: e672a9336d am: ce72fe3c63 am: c56e259f16
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128209
Change-Id: Ia7b3527e2eb1d5908b987f308251c800338f1f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 12:30:30 +00:00
TreeHugger Robot
2d6129ae6d
Merge "Add a missing dependency for UpdatableSystemFontTest" into tm-dev-plus-aosp
2022-07-26 12:14:55 +00:00
Almaz Mingaleev
a315ab6824
Remove Time use.
...
Time is deprecated and there are better alternatives.
Bug: 16550209
Test: atest FrameworksSaxTests
Change-Id: I301d1075b4b64c4586c2e4d7d9b0a12e609fe064
2022-07-26 13:08:41 +01:00
Julia Reynolds
c56e259f16
Merge "[NMS] Call isServiceTokenValidLocked with lock." am: e672a9336d am: ce72fe3c63
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128209
Change-Id: Ie43f606cbc39be8a5e5fbe569e0e063307acfcb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 12:06:30 +00:00
Julia Reynolds
ce72fe3c63
Merge "[NMS] Call isServiceTokenValidLocked with lock." am: e672a9336d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128209
Change-Id: I2b7fe5e7de3dcbb107207e282070ecae8c0f3012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 11:17:51 +00:00
Julia Reynolds
e672a9336d
Merge "[NMS] Call isServiceTokenValidLocked with lock."
2022-07-26 10:55:03 +00:00
Yike
d031ce0e8e
Add a missing dependency for UpdatableSystemFontTest
...
All of a test's dependencies should be explicitly declared in the Soong build module to enable infrastructure features that ensure correctness and optimize runtime.
Here UpdatableSystemFontTest uses EmojiRenderingTestApp, but it doesn't declare the dependency in its Soong build module. This change declares EmojiRenderingTestApp in UpdatableSystemFontTest's `data` attribute.
Bug: 222438068
Test: atest-src UpdatableSystemFontTest \
--experimental-device-driven-test \
--experimental-java-runtime-dependencies \
--bazel-arg=--test_timeout=48000
Test: atest UpdatableSystemFontTest
Change-Id: Ic1b5b94aabd4c95744109f2cc7443ae04c43b3a6
2022-07-26 17:21:25 +08:00
Sudheer Shanka
fcef75158f
Allow shell uid without checking the package name.
...
Bug: 230779051
Test: manual
Change-Id: I2867a15840a0987c948179e2f8069e652c4a0c1f
Merged-In: I2867a15840a0987c948179e2f8069e652c4a0c1f
2022-07-26 00:22:45 +00:00
Sudheer Shanka
6aeb217e9a
Allow apps receiving MediaSession callbacks to start FGS from BG.
...
If the app invoking the MediaSession callbacks is capable of
starting a FGS from background, then also allow the target app
receiving the callbacks to start FGS from background.
Bug: 221873343
Test: manual
Change-Id: I98de12b5410c3f0f70d7d2be12bef3e6d0e1bf73
Merged-In: I98de12b5410c3f0f70d7d2be12bef3e6d0e1bf73
2022-07-26 00:19:56 +00:00
TreeHugger Robot
b79d3d1af9
Merge "Fix SuspiciousIndentation errors" into stage-aosp-master am: 717280b4bb am: d6434c036f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19416684
Change-Id: Ic656635a5415f8a3b1e10d8fd8f324134cc6c302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-25 21:31:56 +00:00
TreeHugger Robot
d6434c036f
Merge "Fix SuspiciousIndentation errors" into stage-aosp-master am: 717280b4bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19416684
Change-Id: Ifd147cc56293f5cc9f79f7802d31fa4ff9dc1b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-25 21:15:02 +00:00
TreeHugger Robot
717280b4bb
Merge "Fix SuspiciousIndentation errors" into stage-aosp-master
2022-07-25 20:46:17 +00:00
Cole Faust
bf9020a1e6
Merge "Disable AndroidFrameworkLintCheckerTest" into stage-aosp-master am: 646b04e9d8 am: 56c5babef8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19395575
Change-Id: Ifa7fd09ecd70131a5f0caa651ed71692c9965ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-25 20:23:43 +00:00
Cole Faust
56c5babef8
Merge "Disable AndroidFrameworkLintCheckerTest" into stage-aosp-master am: 646b04e9d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19395575
Change-Id: I67c6ba526b0d79403eb71dd33541a7865126c5a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-25 19:59:06 +00:00
Cole Faust
646b04e9d8
Merge "Disable AndroidFrameworkLintCheckerTest" into stage-aosp-master
2022-07-25 18:58:02 +00:00