- Oct 11, 2023
-
-
Jiaming Liu authored
Bug: 284050041 Test: atest TaskFragmentOrganizerControllerTest Change-Id: I99d854ab784305b8e1a3b43a37fe2f3c6be48b3b
-
Jiaming Liu authored
Bug: 284050041 Test: atest WindowOrganizerTests TaskFragmentOrganizerControllerTest TaskFragmentOrganizerPolicyTest Change-Id: I6001ed57483ca005270b395ad7b34271efb91289
-
- Oct 09, 2023
-
-
Becca Hughes authored
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am: ced01127 -s ours am: d583bd03 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I6d2e9923ac6ed6c11aae5e9c467fbe9819030773 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 3904fb61 -s ours am: d09f4cf9 -s ours am: 6c01c587 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I91f3345b9046f366b6c02606c3e093974028cb12 Signed-off-by:
-
Yifei Zhang authored
-
Xiaowen Lei authored
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: a8f86248" into udc-dev am: 7235ee18 am: 82eb6fc2 am: 7d45b38e am: 9e6987e3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I50b7a9091c0ee57cb790eaa2363e7d6769563575 Signed-off-by:
-
Dmitry Dementyev authored
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a am: 9b0970ed am: a994c6f0 am: d32fa66c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Ie542d51ee29cec0fcb88a2931881a308304b81da Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: ffeefd07 -s ours am: a2b62908 -s ours am: 55b9fb44 -s ours am skip reason: skipped by user tetianameronyk Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: I4c43b71c759d793dce77651fdf67735f85c5b532 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: b5bbb593 -s ours am: bcc8940c -s ours am: 21c1b927 -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 59042a32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: I6cb2cdd12ada3f59f22424a8014c7aee0c1267e0 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: a8f86248" into udc-dev am: 7235ee18 am: 3b0e671d am: 31428b9e am: 890a899b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Id5d068ac7ee3b780c8d495a59156ec321029cb90 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a" into udc-dev-plus-aosp am: 4fed81bb am: e3786984 am: 8056755e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Ib07efa86cb71cdfcfa0a4a95f1129f83d8132736 Signed-off-by:
-
Eric Biggers authored
Merge "Fix some comments in AndroidKeyStoreMaintenance.java" into main am: 7c778823 am: 2e783419 am: 82f257b5 am: b2f2935c am: 54842831 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2778008 Change-Id: Ib8430ee5dad2a96998882403ab977d658f25004f Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: 0b6fee96 -s ours am: 85ce1fd8 -s ours am: a7767fce -s ours am skip reason: skipped by user tetianameronyk Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: Ib9c8358b1f207863875da81633d00a6013c1bca1 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: a8f86248" into udc-dev am: 7235ee18 am: 82eb6fc2 am: bf01af8d am: 57302dee Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I526f596acecc5e286755f2565735b892d4c23395 Signed-off-by:
-
Dmitry Dementyev authored
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a am: 9b0970ed am: 47de64a3 am: 95bb984f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I72784dcd312868261cdeb87d211ac2c6a54dc723 Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: ffeefd07 -s ours" into udc-d1-dev-plus-aosp am: aeccbc58 -s ours am: 04e5d8bf -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 e5e5d53c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: I3ce5a6fb0f8a2d381c9dc5c2b1be3d55d64b2b20 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: ffeefd07 -s ours am: b84d5d36 -s ours am: 104692b2 -s ours am skip reason: skipped by user tetianameronyk Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: I0d6d3c3897d7c743be8a0ce06dba902507e86a9c Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: 187a8ce4 -s ours" into udc-d1-dev-plus-aosp am: 984a4dc3 -s ours am: 71ed81b2 -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 e5e5d53c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: Id67cdef3c73415dcdd8debd99ad7bc3f7efccf35 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: 187a8ce4 -s ours am: ea8e5857 -s ours am: d3f8321e -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 59042a32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: I7ba076e46558d690bc67e69df2f9ec5d9fbd14ea Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: a8f86248" into udc-dev am: 7235ee18 am: 82eb6fc2 am: 7d45b38e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Ia112ba79d66fe1d62d0beb35d39cd69ef52d8a98 Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am: ced01127 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I8221cb6890cc43faf5b8a995c9f7f124f8ca9d16 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 3904fb61 -s ours am: d09f4cf9 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I88c0eb5c2cb704aaedf76f666c3de21d5fddff8e Signed-off-by:
-
Dmitry Dementyev authored
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a am: 9b0970ed am: a994c6f0 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I32f841661b4fb451462e77d706aa86610c0c7b56 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: ffeefd07 -s ours am: a2b62908 -s ours am skip reason: skipped by user tetianameronyk Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: I7598f74e82cdfeb9a27762095eae4f349b910611 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: b5bbb593 -s ours am: 0a67ee05 -s ours am: faa6685d -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 59042a32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: Ie1bb533332a3bbc0ed71258ef5a3e28cf855f7c2 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: b5bbb593 -s ours am: bcc8940c -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 59042a32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: I5b6f5b4de87d63567deb5d372e6b4d10d6f5269a Signed-off-by:
-
Jeff Pu authored
-
Becca Hughes authored
If there are no primary provider on write then erase the additional providers. Also covers when apps are uninstalled and should be removed from stored providers. Test: ondevice flash Bug: 286174398 Change-Id: If9d6a3ff1f5603fef7d174529cd4530ff153f650
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: a8f86248" into udc-dev am: 7235ee18 am: 3b0e671d am: 31428b9e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Ia6ed52bd0b91eec811bb6e3cd512573cca4e6f31 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a" into udc-dev-plus-aosp am: 4fed81bb am: e3786984 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I4e8b7189d7759d41ef2b1d0875adeae15c02b32b Signed-off-by:
-
Eric Biggers authored
Merge "Fix some comments in AndroidKeyStoreMaintenance.java" into main am: 7c778823 am: 2e783419 am: 82f257b5 am: b2f2935c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2778008 Change-Id: I5c79dd56aebfabea639f8dae02982f44361d9acb Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: 0b6fee96 -s ours am: 85ce1fd8 -s ours am skip reason: skipped by user tetianameronyk Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: Ia131f4e96b8f5f40ff5791f9bf89916cd2038c2e Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: a8f86248" into udc-dev am: 7235ee18 am: 82eb6fc2 am: bf01af8d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Ic8ebb4a6016444857651cc772434c9bf2ac7c0f5 Signed-off-by:
-
Dmitry Dementyev authored
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a am: 9b0970ed am: 47de64a3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I0be6d15109e837d36728adc72f3808b91a81d73b Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: ffeefd07 -s ours" into udc-d1-dev-plus-aosp am: aeccbc58 -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 e5e5d53c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: I4207aec616c5e1b2437533e9ca5ab63bfeaa1398 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: ffeefd07 -s ours am: b84d5d36 -s ours am skip reason: skipped by user tetianameronyk Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: I2e790125bf4237acf1c21ec2ca895a209a0cc89b Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: 187a8ce4 -s ours" into udc-d1-dev-plus-aosp am: 984a4dc3 -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 e5e5d53c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: I408dee91b5a1a802504e9ff4b40adf78880b2867 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: 187a8ce4 -s ours am: ea8e5857 -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 59042a32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: Ica09524d0dddd0f733525475b6b094696e64d59f Signed-off-by:
-
