Commit Graph

591049 Commits

Author SHA1 Message Date
Sergey Nikolaienkov
fbc3469d7b Test PipNotification when there is a MediaSession
Bug: 171520419
Test: atest WMShellFlickerTests:TvPipNotificationTests
Change-Id: Ie70f394e572e9adfeee7ecff9ba4a0e686197ca4
2020-11-06 08:17:01 +00:00
TreeHugger Robot
2d2d6357e8 Merge "iorap: Add a DEBUG guide on IORap debugging log." into rvc-qpr-dev am: 4b0ec66e83 am: 396ef95fff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13001653

Change-Id: I26317133027794c2dfb2a6df1952184b06800f13
2020-11-06 07:19:20 +00:00
TreeHugger Robot
396ef95fff Merge "iorap: Add a DEBUG guide on IORap debugging log." into rvc-qpr-dev am: 4b0ec66e83
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13001653

Change-Id: I65ae37fe10688188e26c0680e01dd1632b8ba3b2
2020-11-06 07:05:36 +00:00
TreeHugger Robot
4b0ec66e83 Merge "iorap: Add a DEBUG guide on IORap debugging log." into rvc-qpr-dev 2020-11-06 06:50:06 +00:00
Remi NGUYEN VAN
dae90d760d [automerger skipped] Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd am: 2442a58473 am: d60841c6e4 am: 5352582f80 -s ours
am skip reason: Change-Id I3ab497f2133c9020131ca4392f34aedb8da99cc9 with SHA-1 3fcb538e6f is in history

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

Change-Id: I4b95447ecb5b536a697a61662dc3d8345592da25
2020-11-06 06:41:42 +00:00
Daniel Bright
ade1d2a618 Merge "Allows APN to be unthrottled through an indication" am: bc99f76305 am: 98a2cb4729 am: 1cf14ba648 am: 50627f9058
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479020

Change-Id: I9b5571efb0e1a313baa6efa17873f342a9a1342b
2020-11-06 06:41:15 +00:00
James Mattis
4a74aafd44 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba am: 2feb4fb0a0 am: c2ed1f7e81 am: 29c4b9b6d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I1baf71a84b92f35410cceab5a1fbd062a5134689
2020-11-06 06:40:52 +00:00
Remi NGUYEN VAN
5352582f80 Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd am: 2442a58473 am: d60841c6e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: Id4c200a7acfa21c321865d996c795f8cf1bc2bd8
2020-11-06 06:04:26 +00:00
Daniel Bright
50627f9058 Merge "Allows APN to be unthrottled through an indication" am: bc99f76305 am: 98a2cb4729 am: 1cf14ba648
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479020

Change-Id: I4151d7c099f8689f2b8d955f714cb6936514b96b
2020-11-06 06:04:04 +00:00
James Mattis
29c4b9b6d2 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba am: 2feb4fb0a0 am: c2ed1f7e81
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I8ce428771882b8f2e2e904ebba18acdf7be2a056
2020-11-06 06:03:37 +00:00
TreeHugger Robot
0fe0dcd920 [automerger skipped] Merge "Hide overlays over uninstall confirm dialog" into qt-dev am: 75826a6664 am: 0bfb8a8808 -s ours am: 0e03f74361 -s ours am: 12a6173e62 -s ours am: 0d48b8e238 -s ours am: 2843c95f88 -s ours
am skip reason: Change-Id I38b6d85871064d76f2911e20acc74b4ab76406b3 with SHA-1 d75105e74b is in history

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

Change-Id: Id02828df3f4d22e9c75f45c5a35d4bfee8c46923
2020-11-06 05:56:10 +00:00
TreeHugger Robot
ea853ccb37 [automerger skipped] Merge "DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled." into qt-dev am: 368a03507a am: e3a416b6ff -s ours am: 182544aa8b am: c35433cb4e am: 66598852a2 am: 54395d93d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6bfde53df43684812e74f39bd27a7e716a4d15c
2020-11-06 05:55:44 +00:00
Hai Zhang
15f893185f [automerger skipped] DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled. am: 719c9c5206 am: a2cf5c1df1 -s ours am: 87339a9c22 am: 039b1ef74b am: 230d120208 am: ff64d5e74e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b74bb723e0bac9142fc7b317fbc615c4a05cae5
2020-11-06 05:55:29 +00:00
TreeHugger Robot
ef65521bfb [automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours am: 014fe5e136 -s ours am: a85492e5ff -s ours am: 4c074aad79 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd41b25a83 is in history

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

Change-Id: Ia145539f94fb7c7e3bae4d28ddc83fe17ba9500e
2020-11-06 05:54:51 +00:00
Nate Myren
5b0959a735 [automerger skipped] Ensure permissions are revoked on state changes am: bc71724034 am: f31a906eba -s ours am: cef551dc4f -s ours am: e980626fb4 -s ours am: d0efe506a3 -s ours am: a4b14d8cd0 -s ours
am skip reason: Change-Id I0dec9eb7c2fecd3147e33e04d3f79f6dffcf7721 with SHA-1 bc71724034 is in history

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

Change-Id: Ic9b313a29db9c07463687a79ba5e16ebbd5f2a7b
2020-11-06 05:54:32 +00:00
Remi NGUYEN VAN
d60841c6e4 Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd am: 2442a58473
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: I884a464727b8f2dbf7554926dd8a0fd9cab71176
2020-11-06 05:48:38 +00:00
Daniel Bright
1cf14ba648 Merge "Allows APN to be unthrottled through an indication" am: bc99f76305 am: 98a2cb4729
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479020

Change-Id: I0da779a79638a3c591fa49ec7538f4900dae9898
2020-11-06 05:48:04 +00:00
James Mattis
c2ed1f7e81 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba am: 2feb4fb0a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I3d013dc1a3caf9c41fbc835f2eb92df4e40bed33
2020-11-06 05:47:26 +00:00
TreeHugger Robot
2843c95f88 [automerger skipped] Merge "Hide overlays over uninstall confirm dialog" into qt-dev am: 75826a6664 am: 0bfb8a8808 -s ours am: 0e03f74361 -s ours am: 12a6173e62 -s ours am: 0d48b8e238 -s ours
am skip reason: Change-Id I38b6d85871064d76f2911e20acc74b4ab76406b3 with SHA-1 cdec871e66 is in history

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

Change-Id: Icd28720b0125b75ce73eb5655e3747420e4124c8
2020-11-06 05:41:10 +00:00
TreeHugger Robot
54395d93d3 [automerger skipped] Merge "DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled." into qt-dev am: 368a03507a am: e3a416b6ff -s ours am: 182544aa8b am: c35433cb4e am: 66598852a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: I89e970135f9f538f43dc9df148cfd11f089fffb8
2020-11-06 05:40:52 +00:00
TreeHugger Robot
b67c9c9be5 Merge "Revert "Switching to lazily batching alarms by default"" 2020-11-06 05:40:50 +00:00
Hai Zhang
ff64d5e74e [automerger skipped] DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled. am: 719c9c5206 am: a2cf5c1df1 -s ours am: 87339a9c22 am: 039b1ef74b am: 230d120208
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: Icf5ec316d5431505909decd7908cc46c6ebc2cc3
2020-11-06 05:40:43 +00:00
TreeHugger Robot
4c074aad79 [automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours am: 014fe5e136 -s ours am: a85492e5ff -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c883c is in history

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

Change-Id: I9aefcff4bb4c05d13fd9d15eee7809d7294bcb17
2020-11-06 05:39:32 +00:00
Nate Myren
a4b14d8cd0 [automerger skipped] Ensure permissions are revoked on state changes am: bc71724034 am: f31a906eba -s ours am: cef551dc4f -s ours am: e980626fb4 -s ours am: d0efe506a3 -s ours
am skip reason: Change-Id I0dec9eb7c2fecd3147e33e04d3f79f6dffcf7721 with SHA-1 84c1247a7e is in history

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

Change-Id: I335f9050023189e5d0a12a067313698ebc19dae9
2020-11-06 05:39:18 +00:00
Remi NGUYEN VAN
2442a58473 Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: I8c03acd5af53d8dccd183d791a1acaf434d81169
2020-11-06 05:30:32 +00:00
TreeHugger Robot
72dc456402 Merge "Add enums for TvSettings logging" 2020-11-06 05:25:11 +00:00
Daniel Bright
98a2cb4729 Merge "Allows APN to be unthrottled through an indication" am: bc99f76305
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479020

Change-Id: Ica2a83344b5888ab9a423515005bd6c5ba7e5284
2020-11-06 05:24:04 +00:00
TreeHugger Robot
a80b1f7e89 [automerger skipped] Merge "Hide overlays over uninstall confirm dialog" into qt-dev am: 75826a6664 am: 0bfb8a8808 -s ours am: 0e03f74361 -s ours am: 47a3a02ca6 -s ours
am skip reason: Change-Id I38b6d85871064d76f2911e20acc74b4ab76406b3 with SHA-1 cdec871e66 is in history

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

Change-Id: I5be20402ac3f5077cd00fa606dfd72046b7c7f4f
2020-11-06 05:21:37 +00:00
TreeHugger Robot
0c208a5486 [automerger skipped] Merge "DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled." into qt-dev am: 368a03507a am: e3a416b6ff -s ours am: 182544aa8b am: 488863bdf9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic084e81b852f6e2f90da46b7b8c6cd814aaf907d
2020-11-06 05:21:22 +00:00
Hai Zhang
c1666c9f1f [automerger skipped] DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled. am: 719c9c5206 am: a2cf5c1df1 -s ours am: 87339a9c22 am: 0bd90ab9c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2796cf73a1adaaaeb0d821d08527dfb17a7cd8f6
2020-11-06 05:21:18 +00:00
TreeHugger Robot
561fd184e5 [automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours am: ec522fffcd -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c883c is in history

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

Change-Id: I2a8839438267eb0b1fea679b529f9568991a94d0
2020-11-06 05:20:45 +00:00
Nate Myren
2abe3df94d [automerger skipped] Ensure permissions are revoked on state changes am: bc71724034 am: f31a906eba -s ours am: cef551dc4f -s ours am: 4fdadd4b92 -s ours
am skip reason: Change-Id I0dec9eb7c2fecd3147e33e04d3f79f6dffcf7721 with SHA-1 84c1247a7e is in history

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

Change-Id: If15ac2eea39ec6238a5eb079a367047d324785c5
2020-11-06 05:20:37 +00:00
TreeHugger Robot
0d48b8e238 [automerger skipped] Merge "Hide overlays over uninstall confirm dialog" into qt-dev am: 75826a6664 am: 0bfb8a8808 -s ours am: 0e03f74361 -s ours am: 12a6173e62 -s ours
am skip reason: Change-Id I38b6d85871064d76f2911e20acc74b4ab76406b3 with SHA-1 cdec871e66 is in history

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

Change-Id: Idf0338a16d71556f71b07dfd2e77e24f37f9a163
2020-11-06 05:20:36 +00:00
TreeHugger Robot
66598852a2 [automerger skipped] Merge "DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled." into qt-dev am: 368a03507a am: e3a416b6ff -s ours am: 182544aa8b am: c35433cb4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: I27bd74164341ff6deb80c80b07c02e159ea04cac
2020-11-06 05:20:21 +00:00
Hai Zhang
230d120208 [automerger skipped] DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled. am: 719c9c5206 am: a2cf5c1df1 -s ours am: 87339a9c22 am: 039b1ef74b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: I590907c4d67c7afe1f6ee55202293f032266c08e
2020-11-06 05:20:19 +00:00
TreeHugger Robot
a85492e5ff [automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours am: 014fe5e136 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c883c is in history

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

Change-Id: I6676b3d58129b9d0414112ac12101f7003aa419a
2020-11-06 05:19:58 +00:00
Nate Myren
d0efe506a3 [automerger skipped] Ensure permissions are revoked on state changes am: bc71724034 am: f31a906eba -s ours am: cef551dc4f -s ours am: e980626fb4 -s ours
am skip reason: Change-Id I0dec9eb7c2fecd3147e33e04d3f79f6dffcf7721 with SHA-1 84c1247a7e is in history

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

Change-Id: I0fc35ebb0aa8160758951bafdd972ca4631a10ac
2020-11-06 05:19:56 +00:00
James Mattis
2feb4fb0a0 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I57d85884e4bf6039cf645ed58e2c7b0c8fd404a2
2020-11-06 05:19:47 +00:00
Remi NGUYEN VAN
64512597fd Merge "Move VPN JNI to the bottom of srcs" 2020-11-06 05:04:53 +00:00
Daniel Bright
bc99f76305 Merge "Allows APN to be unthrottled through an indication" 2020-11-06 05:04:14 +00:00
James Mattis
f2c37de2ba Merge "Adding multilayered requests to NetworkRequestInfo" 2020-11-06 04:33:24 +00:00
TreeHugger Robot
47a3a02ca6 [automerger skipped] Merge "Hide overlays over uninstall confirm dialog" into qt-dev am: 75826a6664 am: 0bfb8a8808 -s ours am: 0e03f74361 -s ours
am skip reason: Change-Id I38b6d85871064d76f2911e20acc74b4ab76406b3 with SHA-1 cdec871e66 is in history

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

Change-Id: Ie55ed4bfd7cd9a392340e62b8ef2556219759f33
2020-11-06 04:25:46 +00:00
TreeHugger Robot
488863bdf9 [automerger skipped] Merge "DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled." into qt-dev am: 368a03507a am: e3a416b6ff -s ours am: 182544aa8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: I5035d69f9a7addbd079ec9965b9a383cf8dd0e54
2020-11-06 04:25:36 +00:00
Hai Zhang
0bd90ab9c3 [automerger skipped] DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled. am: 719c9c5206 am: a2cf5c1df1 -s ours am: 87339a9c22
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: I9fb8e89b82612b95aed698518ea3eaec8d0aa8f6
2020-11-06 04:25:34 +00:00
TreeHugger Robot
12a6173e62 [automerger skipped] Merge "Hide overlays over uninstall confirm dialog" into qt-dev am: 75826a6664 am: 0bfb8a8808 -s ours am: 0e03f74361 -s ours
am skip reason: Change-Id I38b6d85871064d76f2911e20acc74b4ab76406b3 with SHA-1 cdec871e66 is in history

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

Change-Id: I2a1228516964bfac53260aac2bf4f41a8680b1f2
2020-11-06 04:25:32 +00:00
TreeHugger Robot
ec522fffcd [automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c883c is in history

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

Change-Id: Iab6d04caa3de38172c7d89f131ee4b8feb82b036
2020-11-06 04:25:21 +00:00
TreeHugger Robot
c35433cb4e [automerger skipped] Merge "DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled." into qt-dev am: 368a03507a am: e3a416b6ff -s ours am: 182544aa8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: I01f849207ae0744da2e0729ee5ec9485fa6ea928
2020-11-06 04:25:21 +00:00
Nate Myren
4fdadd4b92 [automerger skipped] Ensure permissions are revoked on state changes am: bc71724034 am: f31a906eba -s ours am: cef551dc4f -s ours
am skip reason: Change-Id I0dec9eb7c2fecd3147e33e04d3f79f6dffcf7721 with SHA-1 84c1247a7e is in history

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

Change-Id: Ibd590852fd089874a8f391cf502fa376c5c826bf
2020-11-06 04:25:19 +00:00
Hai Zhang
039b1ef74b [automerger skipped] DO NOT MERGE Revoke install permissions when the permission defining app is uninstalled. am: 719c9c5206 am: a2cf5c1df1 -s ours am: 87339a9c22
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12787259

Change-Id: I8e3becccca07952c66dd9d17189cb34ff3cc7415
2020-11-06 04:25:19 +00:00
TreeHugger Robot
014fe5e136 [automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c883c is in history

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

Change-Id: I8f8568b88fa11511da685c05ac7cb4abdfb02b16
2020-11-06 04:24:37 +00:00