- Sep 19, 2023
-
-
Prem Edhara authored
Bug: 294435720 Test: atest FrameworksMockingServicesTests: com.android.server.DeviceIdleControllerTest Change-Id: I908b0a8db05ef0feb19c5ecab47c1065295d17a4
-
- Sep 05, 2023
-
-
Ahmad Khalil authored
-
Xin Li authored
[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 7e2b98ed -s ours am: c909f293 -s ours am: 980ce0b0 -s ours am: 330f1c38 -s ours am skip reason: Merged-In I67149c6faa2766be6d2537f2315dd2734bdd0447 with SHA-1 83b55b6a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24623865 Change-Id: I18334073659be57f3ce27440fab003f08cc835d8 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Xin Li authored
[automerger skipped] Merge UP1A.230905.019 am: 75da5da9 -s ours am: 5f4953b7 -s ours am: e63ac572 -s ours am: 33489f5a -s ours am skip reason: Merged-In I67149c6faa2766be6d2537f2315dd2734bdd0447 with SHA-1 83b55b6a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24623865 Change-Id: Id041ff2dd425c633996b9e5fe08f4d3009f38b0c Signed-off-by:
-
Shuzhen Wang authored
Merge "Camera: Fix docs for mandatory stream combinations" into udc-dev am: 91973000 am: a2a13d0c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640918 Change-Id: Ifeec97578db61ea810675caea4ba84bfa292cb5b Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into udc-dev am: df886201 am: 9561404b -s ours am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 adf62031 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575247 Change-Id: I28331a7756da8e75aab514b0c2423d5861a1515a Signed-off-by:
-
Rambo Wang authored
-
Xin Li authored
[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 7e2b98ed -s ours am: c909f293 -s ours am: 980ce0b0 -s ours am skip reason: Merged-In I67149c6faa2766be6d2537f2315dd2734bdd0447 with SHA-1 83b55b6a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24623865 Change-Id: Ic7db73ebe3c48891e3f575ad7188b13e37b0a8cb Signed-off-by:
-
Xin Li authored
[automerger skipped] Merge UP1A.230905.019 am: 75da5da9 -s ours am: 5f4953b7 -s ours am: e63ac572 -s ours am skip reason: Merged-In I67149c6faa2766be6d2537f2315dd2734bdd0447 with SHA-1 83b55b6a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24623865 Change-Id: Iea4e0c2620c91904df89ad31faee73dbd7defd3c Signed-off-by:
-
Cosmin Băieș authored
-
Xin Li authored
[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 7e2b98ed -s ours am: c909f293 -s ours am skip reason: Merged-In I67149c6faa2766be6d2537f2315dd2734bdd0447 with SHA-1 83b55b6a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24623865 Change-Id: Ib579f967c834e1e3198de9686a04aa39444646ce Signed-off-by:
-
Xin Li authored
am skip reason: Merged-In I67149c6faa2766be6d2537f2315dd2734bdd0447 with SHA-1 83b55b6a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24623865 Change-Id: Ic05b970c3a7c12379d119548e57e63a08a79108b Signed-off-by:
-
Song Chun Fan authored
-
Shuzhen Wang authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640918 Change-Id: If48af670f01bfdc32f71753a6a02fd1cf0718868 Signed-off-by:
-
Julia Reynolds authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575247 Change-Id: I5b51cbdc0bf3a00a7d61b3f96ff5208f2fb9b7cb Signed-off-by:
-
Shuzhen Wang authored
-
Yeabkal Wubshit authored
-
TYM Tsai authored
[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 9cfa634e -s ours am: e8960583 -s ours am: 981a4dcd -s ours am: 187ad9a3 -s ours am: 680a703f -s ours am: 7af1f121 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I4d9517e5aa560d9756705980ce2189291a94f537 Signed-off-by:
-
Kweku Adams authored
[automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 3c5aa21b -s ours am: e76d1bed -s ours am: 27139453 -s ours am: 5ff6639a -s ours am: 656e7f9c -s ours am: e5163c09 -s ours am: 24a083d6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I7825b7512e50dc75db0dddfec57e7b146f272421 Signed-off-by:
-
TYM Tsai authored
[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 29e8c9a1 -s ours am: fa4c7e73 -s ours am: 8c2f395a -s ours am: a93156c3 -s ours am: 2284daa5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: Ie45b497d5bbd0af8641d52c4ae631f496b0af702 Signed-off-by:
-
Kweku Adams authored
[automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 3c5aa21b -s ours am: f53bc451 -s ours am: c6e61ed1 -s ours am: 9f9ce22f -s ours am: f69f92c7 -s ours am: 99832137 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I40ca69ff4d3bede7e31b253ad5b46b484209a58d Signed-off-by:
-
TYM Tsai authored
[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 9cfa634e -s ours am: e8960583 -s ours am: 981a4dcd -s ours am: cb4170d5 -s ours am: 4f9d1940 -s ours am: 0c25e6c8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I74cfc47263402afcc13854cddc0136a40cfef434 Signed-off-by:
-
Kweku Adams authored
[automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 3c5aa21b -s ours am: e76d1bed -s ours am: 27139453 -s ours am: 5ff6639a -s ours am: f02ee191 -s ours am: 1631e22b -s ours am: b80b2458 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I185d9cbd8593d4e85f922844e9c2f43ac6df6ff7 Signed-off-by:
-
TYM Tsai authored
[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 29e8c9a1 -s ours am: fa4c7e73 -s ours am: a25066a7 -s ours am: 87afa323 -s ours am: 11b0577b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: Icdbd6ec9de96169fc3d5d592565042b21db7a0ed Signed-off-by:
-
Kweku Adams authored
[automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 3c5aa21b -s ours am: f53bc451 -s ours am: c6e61ed1 -s ours am: 31993c62 -s ours am: 3f0f5c6c -s ours am: 1b9a4cb8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I9f00a0fbc208aef939351dfaaae87307fe7bf7d3 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Drop invalid data." into tm-qpr-dev am: 99f65269 -s ours am: 8a039a77 -s ours am: 0a50d9dc -s ours am: f9875121 -s ours am: bb14e885 -s ours am skip reason: Merged-In Ie817aa0993e9046cb313a750d2323cadc8c1ef15 with SHA-1 68686110 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20065165 Change-Id: Id609cfd5922d2ab22425b9157209f1a764c67cfc Signed-off-by:
-
Kweku Adams authored
[automerger skipped] Drop invalid data. am: a5182ce1 -s ours am: d79f91f2 -s ours am: d83acb2a -s ours am: 76f4435e -s ours am: b6ecc0f3 -s ours am skip reason: Merged-In Ie817aa0993e9046cb313a750d2323cadc8c1ef15 with SHA-1 68686110 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20065165 Change-Id: I031566cb42a80cb43f5ebebeabb363be44807c8c Signed-off-by:
-
Automerger Merge Worker authored
* changes: [automerger skipped] Merge "Drop invalid data." into tm-qpr-dev am: 99f65269 -s ours am: 8a039a77 -s ours am: 1d57012d -s ours am: d0cb03e8 -s ours am: 1566b4d9 -s ours [automerger skipped] Drop invalid data. am: a5182ce1 -s ours am: d79f91f2 -s ours am: 325774b8 -s ours am: 0816cb76 -s ours am: 6a9afe3b -s ours
-
Automerger Merge Worker authored
* changes: [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 9cfa634e -s ours am: e8960583 -s ours am: 981a4dcd -s ours am: fcf88757 -s ours [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 3c5aa21b -s ours am: e76d1bed -s ours am: 27139453 -s ours am: 5ff6639a -s ours am: 7a4f0626 -s ours
-
Treehugger Robot authored
[automerger skipped] Merge "Drop invalid data." into tm-qpr-dev am: 99f65269 -s ours am: 8a039a77 -s ours am: 1d57012d -s ours am: d0cb03e8 -s ours am: 1566b4d9 -s ours am skip reason: Merged-In Ie817aa0993e9046cb313a750d2323cadc8c1ef15 with SHA-1 68686110 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20065165 Change-Id: Ie6a50d167ba05fb0f4241640c70fb4d9397ed30c Signed-off-by:
-
TYM Tsai authored
[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 9cfa634e -s ours am: e8960583 -s ours am: 981a4dcd -s ours am: fcf88757 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I45abda27b03dae6ed4310a6c6c07b47ed37bcdef Signed-off-by:
-
Kweku Adams authored
[automerger skipped] Drop invalid data. am: a5182ce1 -s ours am: d79f91f2 -s ours am: 325774b8 -s ours am: 0816cb76 -s ours am: 6a9afe3b -s ours am skip reason: Merged-In Ie817aa0993e9046cb313a750d2323cadc8c1ef15 with SHA-1 68686110 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20065165 Change-Id: I25437ce14fc06ba726dd5eef6781fca81b698707 Signed-off-by:
-
Automerger Merge Worker authored
* changes: [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into rvc-qpr-dev am: fc881f5d -s ours am: 9b791f0b -s ours am: 15c48d54 -s ours am: 5ca3ba7c -s ours am: e69d9c81 -s ours am: 1f0356db -s ours am: b1f83dbf -s ours am: 340f7146 -s ours am: 00f1812f -s ours am: 6c8ee1fc -s ours am: 2fa45b1d -s ours [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 68686110 -s ours am: 6006ebee -s ours am: dc69ac89 -s ours am: 01b73e79 -s ours am: 1e0028e9 -s ours am: 4c1ead9b -s ours am: 6de7f78d -s ours am: b54860e3 -s ours am: c518bef9 -s ours am: 25b9c491 -s ours am: c1d0c7e2 -s ours
-
Kweku Adams authored
[automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 3c5aa21b -s ours am: e76d1bed -s ours am: 27139453 -s ours am: 5ff6639a -s ours am: 7a4f0626 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: Icb7f7a4efc3599df03f8bd99b4d0d91bdd892631 Signed-off-by:
-
Automerger Merge Worker authored
* changes: [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 29e8c9a1 -s ours am: fa4c7e73 -s ours am: 0977328f -s ours [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 3c5aa21b -s ours am: f53bc451 -s ours am: c6e61ed1 -s ours am: df93b87d -s ours
-
Treehugger Robot authored
[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into rvc-qpr-dev am: fc881f5d -s ours am: 9b791f0b -s ours am: 15c48d54 -s ours am: 5ca3ba7c -s ours am: e69d9c81 -s ours am: 1f0356db -s ours am: b1f83dbf -s ours am: 340f7146 -s ours am: 00f1812f -s ours am: 6c8ee1fc -s ours am: 2fa45b1d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064770 Change-Id: I5092ef9b35a3d1c2f54207b62fbbb668bf36903b Signed-off-by:
-
Kweku Adams authored
[automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 68686110 -s ours am: 6006ebee -s ours am: dc69ac89 -s ours am: 01b73e79 -s ours am: 1e0028e9 -s ours am: 4c1ead9b -s ours am: 6de7f78d -s ours am: b54860e3 -s ours am: c518bef9 -s ours am: 25b9c491 -s ours am: c1d0c7e2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064770 Change-Id: I1ff850563055be1a03a1676a70e68be755bee9d4 Signed-off-by:
-
TYM Tsai authored
[automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into tm-dev am: b817c5e2 -s ours am: 29e8c9a1 -s ours am: fa4c7e73 -s ours am: 0977328f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I5797475d797bdc4a3ffc36e0f8af24c01133747b Signed-off-by:
-
Automerger Merge Worker authored
* changes: [automerger skipped] Merge "RESTRICT AUTOMERGE: Drop invalid data." into rvc-qpr-dev am: fc881f5d -s ours am: 9b791f0b -s ours am: 15c48d54 -s ours am: 5ca3ba7c -s ours am: e69d9c81 -s ours am: 0ccd5466 -s ours am: 5e3b1152 -s ours am: 5510af66 -s ours am: a3f6f897 -s ours am: 98a8a7f3 -s ours [automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 68686110 -s ours am: 6006ebee -s ours am: dc69ac89 -s ours am: 01b73e79 -s ours am: 1e0028e9 -s ours am: 5691035b -s ours am: a66123bf -s ours am: 95e98a79 -s ours am: c9e9c68d -s ours am: 66fb42e6 -s ours
-
Kweku Adams authored
[automerger skipped] RESTRICT AUTOMERGE: Drop invalid data. am: 3c5aa21b -s ours am: f53bc451 -s ours am: c6e61ed1 -s ours am: df93b87d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I3623a6687b4af39ad49b347d8ccf60e987517fd8 Signed-off-by:
-
