- Aug 03, 2023
-
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 0713b8ce -s ours am: d80debe6 -s ours am: 30aabba4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I3fd9eff933d0d778a4a4a27c982e533337de849b Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 2c6bc42d -s ours am: d6f987ec -s ours am: 1c09e77d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I0f8dc5f12dfbf2e014ff023ef00e2bf3f304cf33 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am: 4e330903 -s ours am: 0425b69c -s ours am: e6e5a7f5 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I3104a4a73d481a7c89e4338aa664692bb804c663 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am: 412ad586 -s ours am: c06cecce -s ours am: 699fac4a -s ours am: 9720f59e -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I54b727920ea20c0e49a240b8234efcc1db75b83b Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 0713b8ce -s ours am: d80debe6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: Ia5ebc79d377c963d0e9f3a1138dc9db5a66a4ec3 Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 2c6bc42d -s ours am: d6f987ec -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I91f9cd5b32cfebbaa2e23ebb5c463f9869cb4a36 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am: 4e330903 -s ours am: 0425b69c -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I9e912dcd220a6bb967ad206444e9f1672a9af62e Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am: 412ad586 -s ours am: c06cecce -s ours am: 699fac4a -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I6fe9403669fdb334dc600178f4ab71b279b79057 Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 0713b8ce -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: Id1f19df175389204a05a2ad9dc18da3d70f0d1f2 Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 2c6bc42d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: Ie9edda69f061bf1d82dc13b4449c826243b5646e Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am: 4e330903 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I6c600ff65a300a04453573a05b97bdb0f8848217 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am: 412ad586 -s ours am: c06cecce -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I1d1a5e4c1349564dd728f9b742e9f4791790b4a9 Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: Ied3da599c8318104560f45095b488dbea6bf6bce Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I54e9051fa22bed5df3aad526dc06aea47c461317 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am: f0ad1262 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I3f1914359059ef7293c35f2d458eb1f2932a4872 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am: 412ad586 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I985e068102ec0d9a5fd65e0370b673631b45cc88 Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I427d149dac85645adadf79ad4c34e6cdc39f1d6b Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: If037b704e0b60e2d3b9279cfe55b71d10dc4a896 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am: 2c60a72d -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: If835df376d2fea62848f10097f5793f59ff60f36 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am: a917310e -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I52df5a6f1232474b6e9870703ef6fac2d5cd14d7 Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I89d9262e6e14b9bd3e1c8b19529c85dce16c031e Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I7d2593480cc2449cb74d2a14a1ce4e18b59e25a2 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am: f715c988 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: Ib311ce45ac70a271c7f4755891f489a7e8a606b8 Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am: d2983b8a -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I81171a9c9e0584864d175ec88ff5f1fbd53f740b Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262 -s ours am: f1f578c3 -s ours am: 69226025 -s ours am: 8fd7bfde -s ours am: 8badb22c -s ours am: ccd47c5f -s ours am: a491053f -s ours am: 22e4491d -s ours am: 8fc807eb -s ours am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355 Change-Id: Ief948159ce41104fe4ac363880b6ca4b591a3276 Signed-off-by:
-
kumarashishg authored
[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370 -s ours am: cfce4ff7 -s ours am: b4f03d1e -s ours am: cdf541a5 -s ours am: dbd499f0 -s ours am: e24c3a74 -s ours am: d6865ed7 -s ours am: b90ad186 -s ours am: c081a59c -s ours am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355 Change-Id: Id8a2f5406213afa4342c611af8c5bfba889da39c Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262 -s ours am: f1f578c3 -s ours am: 69226025 -s ours am: 8fd7bfde -s ours am: 8badb22c -s ours am: 15e852fc -s ours am: ea0e4bae -s ours am: 16c8f450 -s ours am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355 Change-Id: Idec73245d9500b80e8bc105cfcad4dfe25b396d5 Signed-off-by:
-
kumarashishg authored
[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370 -s ours am: cfce4ff7 -s ours am: b4f03d1e -s ours am: cdf541a5 -s ours am: dbd499f0 -s ours am: 56b7b6de -s ours am: 6bec1988 -s ours am: b52e71fa -s ours am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355 Change-Id: I11cbe66e5fa107b4827b002b7ee511cd2ffcb04c Signed-off-by:
-
Peter Lin authored
am skip reason: Merged-In I88b4e5dfd16b1efbe87bf21459755ff2b4900d1f with SHA-1 1129bf75 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23854268 Change-Id: Ie2a1057aea3d6a42fe249fa77a57d7c2e21a437e Signed-off-by:
-
Peter Lin authored
am skip reason: Merged-In I88b4e5dfd16b1efbe87bf21459755ff2b4900d1f with SHA-1 1129bf75 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23854268 Change-Id: I03eb69f4c905164d9d60f8d666c8466db98748cb Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262 -s ours am: f1f578c3 -s ours am: 69226025 -s ours am: 8fd7bfde -s ours am: 8badb22c -s ours am: ccd47c5f -s ours am: a491053f -s ours am: 22e4491d -s ours am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355 Change-Id: I02350dc77ffe7cfc054da973009ec81bd95269b1 Signed-off-by:
-
kumarashishg authored
[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370 -s ours am: cfce4ff7 -s ours am: b4f03d1e -s ours am: cdf541a5 -s ours am: dbd499f0 -s ours am: e24c3a74 -s ours am: d6865ed7 -s ours am: b90ad186 -s ours am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355 Change-Id: If7c4f6d5bbcdf885deaf9cc38d3e90fdf2455aff Signed-off-by:
-
Nan Wu authored
[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I154cd5b8e0c3ac44f14bec7b2591fa767220c79c Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262 -s ours am: f1f578c3 -s ours am: 69226025 -s ours am: 8fd7bfde -s ours am: 8badb22c -s ours am: ccd47c5f -s ours am: a491053f -s ours am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355 Change-Id: I1540f8b95f5b4368ef6ff13370cbe3a78728d0dd Signed-off-by:
-
Nan Wu authored
[automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983047 Change-Id: I3c185d84110dcf811abd12840a1814de1ed7245a Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "[conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c" into rvc-qpr-dev am: 4b74ba44 -s ours am: d892ae17 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I22bf5e8f7e2d28e4b8bf48fdfeaedaf7b585cf2f Signed-off-by:
-
Anton Potapov authored
[automerger skipped] [conflict] Merge "Add userId check before loading icon in Device Controls" into rvc-dev am: 2818ba8c am: 373c5ac4 -s ours am: 020addb6 -s ours am skip reason: Merged-In Iba846f19098c71c0519470cd7b8c1fd60d47e70b with SHA-1 22f18e02 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24294454 Change-Id: I4011edb3b7713639b223d2fafdbd9bf997747d93 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-qpr-dev am: 91771262 -s ours am: f1f578c3 -s ours am: 69226025 -s ours am: 8fd7bfde -s ours am: 8badb22c -s ours am: 15e852fc -s ours am: ea0e4bae -s ours am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355 Change-Id: I46f6e9f2b05fedab43e83ef5b9f507d7fc5c265c Signed-off-by:
-
kumarashishg authored
[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370 -s ours am: cfce4ff7 -s ours am: b4f03d1e -s ours am: cdf541a5 -s ours am: dbd499f0 -s ours am: e24c3a74 -s ours am: d6865ed7 -s ours am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355 Change-Id: I2f5ef783ade4aa83fcd70e1818e705e037b1f966 Signed-off-by:
-
kumarashishg authored
[automerger skipped] Resolve custom printer icon boundary exploit. am: 658ed370 -s ours am: cfce4ff7 -s ours am: b4f03d1e -s ours am: cdf541a5 -s ours am: dbd499f0 -s ours am: 56b7b6de -s ours am: 6bec1988 -s ours am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 0e0693ca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24108355 Change-Id: Ibf2e3043a1d6db6d4fde895ccc534dcd5319b298 Signed-off-by:
-
