- Sep 29, 2023
-
-
Pinyao Ting authored
[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: I8c9b34afafb28597afd38c887e965d395035c134 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pinyao Ting authored
[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: Id08ae2f3f841511af4960004bb3aacf5ceffc824 Signed-off-by:
-
- Sep 28, 2023
-
-
Pinyao Ting authored
[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: I014bdcff1d3dd3902c4155ce26b575a70846bcba Signed-off-by:
-
Pinyao Ting authored
[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: Ic6933da88e36b463ac5c71f5297f8eb824f891c7 Signed-off-by:
-
Pinyao Ting authored
[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: I5a59e5f4bc95ecb45dbe11f0ebabdefda32f755a Signed-off-by:
-
Pinyao Ting authored
[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: Ie675bd43fc1c7022faa64fa0d66587e279ec0960 Signed-off-by:
-
Pinyao Ting authored
Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: I2211e60a745e9870688b94dba86fb31e7c6b21ce Signed-off-by:
-
Pinyao Ting authored
-
- Sep 27, 2023
-
-
Pinyao Ting authored
This CL fixes the issue where, when an app have multiple main activities, the total number of shortcuts can grow indefinitely if they were published through addDynamicShortcuts. Bug: 281061287 Test: manual Change-Id: Ib3eecefee34517b670c59dd5b8526fe9eb24f463 Merged-In: Ib3eecefee34517b670c59dd5b8526fe9eb24f463
-
Pinyao Ting authored
Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev am: 110f1d8b am: ab7d63a7 am: fb370205 am: ebab9abb am: 5498e007 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623415 Change-Id: If2ec1f0ccc61a5d86a818d514be9de94cb549632 Signed-off-by:
-
Pinyao Ting authored
Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev am: 110f1d8b am: ab7d63a7 am: fb370205 am: ebab9abb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623415 Change-Id: Ibbffc5489df00cf23daf772e450acfc8ca4a9530 Signed-off-by:
-
Pinyao Ting authored
Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev am: 110f1d8b am: ab7d63a7 am: fb370205 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623415 Change-Id: Iffe670a32f555510b859cc0db7b8ccadf291b426 Signed-off-by:
-
- Sep 26, 2023
-
-
Pinyao Ting authored
Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev am: 110f1d8b am: ab7d63a7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623415 Change-Id: I038eed8f7c0cc4d6cf5222fa130b81756902e0d5 Signed-off-by:
-
Pinyao Ting authored
Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev am: 110f1d8b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623415 Change-Id: Ie01e2c81fbf8c10e29ee7e504a552dd284e71811 Signed-off-by:
-
Pinyao Ting authored
-
- Sep 20, 2023
-
-
Marzia Favaro authored
-
- Sep 18, 2023
-
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee866 -s ours am: c1e069ef -s ours am: 75495d90 -s ours am: bedfad32 -s ours am: ed66255c -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Ie9deef5f2bc135a9eb854fbd63ccc6f8d7f53a98 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Require permission to unlock keyguard am: 7f28e3ea -s ours am: cbdde0eb -s ours am: f4eace97 -s ours am: 7c2b1325 -s ours am: 219d6da5 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Ied69e349f276714c368d8f22969edacb86707f3e Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df -s ours am: 8fbbc0c9 -s ours am: 3371c14a -s ours am: 306ac204 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: I3fa4e5004ce7092e9d44cace74b5cf0f7295d68a Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Require permission to unlock keyguard am: 712ec1f4 -s ours am: 8e952270 -s ours am: 17b2d055 -s ours am: 5578bf02 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: I8c9c1ab3d0fe2b7049c3d6e3c74233ebfa0a9626 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 03279550 -s ours am: 5e73bd81 -s ours am: 4eef0a5a -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: Iec440af4b037ed8fc142c262cb656304b86c271c Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Require permission to unlock keyguard am: 6568e40b -s ours am: 57e16d7f -s ours am: d577fd09 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: I7fd77ababe0b10d3baa29c4486dae031f3940169 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469 -s ours am: 2964d2ac -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342145 Change-Id: Ida3ba7c89fce36fad11e67cb51de6ba66cc96569 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Require permission to unlock keyguard am: 41bc7c00 -s ours am: d7cadc03 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342145 Change-Id: I6ae42cd9e14e87fc8617cf8e7fe7a7495e506167 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee866 -s ours am: c1e069ef -s ours am: 75495d90 -s ours am: bedfad32 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Id6d02ac78c43b32363f973384fe1de27f3b35673 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Require permission to unlock keyguard am: 7f28e3ea -s ours am: cbdde0eb -s ours am: f4eace97 -s ours am: 7c2b1325 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Ifb40e1d2b3f2fa7567ac7d5ed448ba60797e93ca Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df -s ours am: 8fbbc0c9 -s ours am: 3371c14a -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: I3c89a2c5a174fb215476483632631f30c7eb73bb Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Require permission to unlock keyguard am: 712ec1f4 -s ours am: 8e952270 -s ours am: 17b2d055 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: Ic21565a8063438237109049cbdca497c2ecaae4c Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 03279550 -s ours am: 5e73bd81 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: I64428acd1f98d9f16d54f64433fb9edfa12be4a4 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Require permission to unlock keyguard am: 6568e40b -s ours am: 57e16d7f -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: I4287015869e91610651eae471cf911c597f1c1e3 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee866 -s ours am: c1e069ef -s ours am: 75495d90 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Ifb47b345fadcc532bc4e1f79ff3d305e275dde71 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Require permission to unlock keyguard am: 7f28e3ea -s ours am: cbdde0eb -s ours am: f4eace97 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Ide7a78d5fffa4fcda506f6b433b3e92c3a2fcfe4 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df -s ours am: 8fbbc0c9 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: Iffe9d6becb537fde9d8f445996b96efad821ebb8 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Require permission to unlock keyguard am: 712ec1f4 -s ours am: 8e952270 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: Ia2b504ddce2d5d157e0662e115cb8315a656f4f7 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee866 -s ours am: c1e069ef -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: I68303ce785531087cedcefdfdbad7b1457dd42c5 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Require permission to unlock keyguard am: 7f28e3ea -s ours am: cbdde0eb -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Ic7d14560731fd030144e48c104090124314494cc Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 03279550 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: Ib93578f492e26bb2f2c91721ac5af9d514f9e6a4 Signed-off-by:
-
Marzia Favaro authored
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: I2665c7338693324af961c5994f930f6e083662bd Signed-off-by:
-
Marzia Favaro authored
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: I1907db3ad58fb5470b5b2f1c795e868c94b0c476 Signed-off-by:
-
Marzia Favaro authored
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: Ia7b9b8c094cedb5f158f5d2854f1d73b0f24fcf8 Signed-off-by:
-
