- Sep 07, 2023
-
-
Paul Duffin authored
Also, removes `--no-banner` as it is deprecated and `--format=v2` is unnecessary. Bug: 290825755 Test: m current-api-xml (cherry picked from https://android-review.googlesource.com/q/commit:aab881d8b7ebea74266039275d0f5bf7019e1a5b) Merged-In: Ib2ff55cf2bfd2128866b2e4f67cf39303135b79b Change-Id: Ib2ff55cf2bfd2128866b2e4f67cf39303135b79b Bug: 299428102
-
Pinyao Ting authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24681253 Change-Id: Ic3074485454982ac173c6be277274f0d6e979ff7 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jay Sullivan authored
-
Pinyao Ting authored
-
Treehugger Robot authored
[automerger skipped] Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 am: f9a2bcf2 am: 6824374b am: e81ac136 am: 69d83198 -s ours am: 03e7be40 -s ours am skip reason: Merged-In I392f8e923923bf40827a2b6207c4eaa262694fbc with SHA-1 3d41fb76 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: I9b32b270f1ed97f454539e387a9f726b8a3b475a Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d3 am: e8f41307 am: d76f2649 -s ours am: 9b5664c3 -s ours am: b064ace3 -s ours am skip reason: skipped by user juliacr Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: I545123412589d42ad933a7ce83f33ecea8fb3ecf Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 am: f9a2bcf2 am: 6824374b am: e81ac136 am: 69d83198 -s ours am skip reason: Merged-In I392f8e923923bf40827a2b6207c4eaa262694fbc with SHA-1 3d41fb76 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: Ic5e9d1763347c6db4c0de2855c0feefccd08188f Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d3 am: e8f41307 am: d76f2649 -s ours am: 9b5664c3 -s ours am skip reason: skipped by user juliacr Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: I573207575a51c27160f47f6bf614b8713c6c65e4 Signed-off-by:
-
Treehugger Robot authored
Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 am: f9a2bcf2 am: 6824374b am: e81ac136 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: Ica00add185f5f5e5cf9a4a5b00a629d72b895740 Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d3 am: e8f41307 am: d76f2649 -s ours am skip reason: skipped by user juliacr Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: I49003ed6a5703d422cad082829c01627c51f0e10 Signed-off-by:
-
- Sep 06, 2023
-
-
Pinyao Ting authored
Bug: 296980481 Test: atest CtsShortcutManagerTestCases Change-Id: I7a2e85c703d2758f89b0c06d898f9423d6764444 Merged-In: I7a2e85c703d2758f89b0c06d898f9423d6764444 (cherry picked from commit 879e92bb) (cherry picked from commit a1c34f0a)
-
Jay Thomas Sullivan authored
This change fixes an intermittent bug where privacy indicator icons will sometimes stay on, even after the last app actively using the appop (e.g., camera, microphone, or location) terminates. Background: We begin tracking that an app is actively using one of these appops as soon as startOp (or another startOp-like method) is called. We stop tracking whenever one of the following triggers occur (whichever happens first): 1. finishOp (or another finishOp-like method) is explicity called) (invoking AppOpsService::finishOperation) 2. The IBinder token, a required arg to startOp, dies (invoking AppOpsService::onClientDeath) Both triggers end up calling the following chain of functions, which results in the privacy indicator visibly disappearing: AttributedOp::finished -> AttributedOp::finishOrPaused, -> AppOpsService:scheduleOpActiveChangedIfNeededLocked -> ... -> (indicator visibly disappears) The problem: The problem occurs inside another function, AttributedOp::onUidStateChanged (triggered whenever a currently- active-op's uid changes uid state) performs the unique behavior of "restarting" an active op, which involves finishing the active op (AttributedOp::finished) and then starting it again (AttributedOp::startedOrPaused). In order for onUidStateChanged to perform this restart functionality without causing chaos, when it finishes an active-op, it passes a flag to indicate that active watchers should not be notified of this operation (triggerCallbackIfNeeded=false). The problem is that active ops are keyed by live IBinder sessions. And, a binder session can die at any time. So, if the binder dies during the brief moment in AttributedOp::onUidStateChanged between the finished() and startedOrPaused() calls, then, startedOrPaused() will throw a DeadObjectException, because it needs to interact with the binder (to register an binder.onClientDeath callback). In this case, the active op will be left finished, but it never actually notified any watchers. To the user, the state of the indicator appears to have leaked. The solution: When a DeadObjectException is thrown from startedOrPaused(), notify the watchers that the active op is finished. Also, rename the triggerCallbackIfNeeded argument to reduce the risk of future users repeating this mistake. Fix: 290091092 Test: cd packages/modules/Permission && atest :alltests (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5d7e9f78bbaa02f98ac5edb36da10404de23f305) Merged-In: I48f5577f7c611eccdd803a2a9c32790362a329ea Change-Id: I48f5577f7c611eccdd803a2a9c32790362a329ea -
Treehugger Robot authored
Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 am: f9a2bcf2 am: 6824374b am: 88d743c8 am: 3b18ce15 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: Ic87fa8f5129fff7e45a1226d573d34fd6eb24f36 Signed-off-by:
-
Treehugger Robot authored
Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 am: f9a2bcf2 am: 6824374b am: 88d743c8 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: I1bfc6e66ee8888bf8b21516b26839e63e618aefa Signed-off-by:
-
Treehugger Robot authored
Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 am: f9a2bcf2 am: 6824374b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: I954f25e65662ad30f3ac2d05d3274594a1ad8184 Signed-off-by:
-
Treehugger Robot authored
Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 am: f9a2bcf2 am: 6824374b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: Ide424b70d9e395f790ff97efdbdfdf782fe2a514 Signed-off-by:
-
Treehugger Robot authored
Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 am: f9a2bcf2 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: I6ddacb513ad4c86787d7ae56012808aabdd3cf07 Signed-off-by:
-
Treehugger Robot authored
Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: I16836d34e86d5eb3b42f78316c54d719ddb416ba Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d3 am: e8f41307 am: 25b8fa5e -s ours am: d92dacc7 -s ours am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 dd044a6c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: I45517ab0daa9f774f174b392fe3e206afd7d60f1 Signed-off-by:
-
- Sep 05, 2023
-
-
Julia Reynolds authored
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d3 am: e8f41307 am: 25b8fa5e -s ours am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 dd044a6c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: I7ec3f5bb89145626cb9f9f26a63dcb0a63b261cb Signed-off-by:
-
Treehugger Robot authored
Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: I2848dab36d97f274d534a06bbacd7ef5eafba3d4 Signed-off-by:
-
Treehugger Robot authored
Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: I8573f7aafec6212117fb63874c26de55b2253a09 Signed-off-by:
-
Julia Reynolds authored
Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d3 am: e8f41307 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: I2de0dd8aa390a660e6de86e66af8ed8dc24832ee Signed-off-by:
-
Julia Reynolds authored
Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d3 am: e8f41307 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: Ic1737e762e7e78b3f3846f3b6ad31efeaec8ce9b Signed-off-by:
-
Julia Reynolds authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: Ia3c0ade3eb2232bba22e9b30d5c23947d26ce01e Signed-off-by:
-
Treehugger Robot authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24046929 Change-Id: I1d89b4711b7ffaeba8360ff284c89745b8e57dfe Signed-off-by:
-
Treehugger Robot authored
-
Julia Reynolds 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
-
Julia Reynolds authored
-
Julia Reynolds authored
Test: NotificationConversationInfoTest.java Test: make a conversation priority on the primary user Test: make a conversation priority on a secondary user Bug: 288896269 Change-Id: I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 Merged-In: I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 (cherry picked from commit adf62031)
-
- Sep 04, 2023
-
-
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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: Iffbb29af44a197a188b90243a526cfc773af8978 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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: Ie1f7c98d4fc42541dfb0ec848eb9fd41f2883412 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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I8d8f68a262c3010ec7efba9121f4e12026ee9fa0 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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I98a8ed20203fd1699b593cbad85479e1256cd762 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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I8742b5f661891ff2f7881528ad060b2ef465bf35 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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I8d9065ee649b795df420cae9690341e5a01c76ff 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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20064768 Change-Id: I57648eeee82326afa252de892a24ac558e97a899 Signed-off-by:
-
