summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-27Merge cherrypicks of [19034752] into tm-frc-permission-release.t_frc_per_330444010android13-frc-permission-releaseAndroid Build Coastguard Worker
Change-Id: I55ede2e32e51a68bd3dfbabe390d62a85e47e09d
2022-06-27DPMS workaround to check the device owner type in PermissionControllerAlex Johnston
Context: * If the device is managed, then hibernation should not be handled unless the device is financed. * We need a way to check if a device is financed in PermissionController. However, PermissionController is a mainline module so cannot call the TestAPI Dpm.getDeviceOwnerType Change: * User Global Settings to let permission controller know if the device is financed Bug: 236283038 Test: Manual testing following go/hibernation-local-testing Change-Id: Ib9a1a9116014d041c9514752882cdd364bfe777b (cherry picked from commit 7d1eae2df6d3fb521fcfc0e5c9360e6e44da7299) Merged-In: Ib9a1a9116014d041c9514752882cdd364bfe777b
2022-06-21Snap for 8748865 from d6ad543b7cc0abd7efdf99fc42443715f531a39e to ↵Android Build Coastguard Worker
tm-frc-permission-release Change-Id: I5200076372d6d5ba8eca9bc8f137a9a37c880456
2022-06-21Merge "Use top activity for fixed rotation from snapshot starting window" ↵Riddle Hsu
into tm-dev
2022-06-21Use top activity for fixed rotation from snapshot starting windowRiddle Hsu
Assume T=trampoline activity, M=main activity. When launching T into an existing task which contains the existing M: The task will have Top = T (no window) = 'activity' Bottom = M (has window) = 'topFullscreenActivity' Because the real top launching activity is T, we should use it for checking whether to apply fix rotation. Otherwise fixed rotation will be skipped because M is not the current top activity, which will cause the snapshot starting window to be half cropped. Also make sure the trampoline activity has the same rotation as the snapshot. Because the snapshot starting window will be shown on the trampoline first and then transfer to the existing activity. This relates to commit a95bd4a that enables snapshot starting window to take effect across trampoline activity. Bug: 236200669 Test: Assume A,B are landscape singleTask activities with the same task affinity. A will be finished (clear-task-stack) after starting B. Launch the app and return to home and launch it again. The starting window should not be cropped. Change-Id: I11cea671c0e6b9a58ba28f28ce0f735eb576c55d
2022-06-20Merge "Prevent callback registration when back flag is disabled" into tm-devVadim Caen
2022-06-20Merge "Update the docs for the provisioning extra AllowOffline." into tm-devElis Elliott
2022-06-20Snap for 8745897 from 512a4fe71569d874def5d77bfc1e8dabfd65e423 to ↵Android Build Coastguard Worker
tm-frc-permission-release Change-Id: I46aa497c9a39a78488c309175e59e19a9441a418
2022-06-20Update the docs for the provisioning extra AllowOffline.Elis Elliott
update to reflect the new usage of the extra in forcing platform side provisioning. Bug: 236597525 Test: n/a Change-Id: Ie98e9aaa790d1c0bd4b2d5e2b85a81bd8e3c92e3
2022-06-20Add SDK level check to adding sandbox UIDs.Martijn Coenen
ConnectivityServiceTest builds against the latest Vpn framework code, but when run on an older base image (eg 'S'), said framework code might run into runtime errors calling new APIs. Until the test is decoupled, do the SDK level check here. Bug: 230548427 Bug: 232420362 Test: Build Change-Id: If453e16e680f46cf2b9eb769e5607fb5513b32ac (cherry picked from commit ab678b983bb4e1b5c724523d796f8cbcccabbc02) Merged-In: If453e16e680f46cf2b9eb769e5607fb5513b32ac
2022-06-20Prevent callback registration when back flag is disabledVadim Caen
When the enableOnBackInvokedCallback is set to false (or not set), registering an OnBackInvokedCallback should be a no-op to avoid overriding the default compat callback. Test: Manual testing registering a callback on an app with the flag disabled and doing a back gesture. Currently we don't have test executing a back gesture so automated tests are not possible Bug: 235206960 Change-Id: I54d843f11130a78ed5a68cbe4722e601a2086ee1 Merged-In: I54d843f11130a78ed5a68cbe4722e601a2086ee1 (cherry picked from commit aa48dc3c2db92189055804878b88a51f0cf8e955)
2022-06-20[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-v2-dev am: 7b16d91315 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986219 Change-Id: I014e516a1ed2bfae6a23b48f7a19cc2ce6f92b97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
89bcac62e3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986219 Change-Id: I0fe35d42c80e8537ac7d090f5494b0be9d22b1f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-v2-dev am: 28f8641d3d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986217 Change-Id: I567a58f4cccb9ccf5beb7f3741eb0dd74d94b659 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a0cf385810 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986217 Change-Id: I8ace3ff5f0c7ed7ccdc9d0b8893076282809143b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-v2-dev am: a41b724a95 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986137 Change-Id: I7089dcd9c41ed88e1e3e11ff1cbd76263793b662 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
91b202fdeb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986137 Change-Id: Ie21f4ec997cc32abbc4f8a37864bc89cc052091a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-v2-dev am: 42005e5cc4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986130 Change-Id: Ief57bf13d233e9f944afd35070f8c01a8d247860 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
37fa2f3acc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986130 Change-Id: I773c06d4f75f9faca646b086b0fbcfb287425e05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-06-20[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-v2-dev am: f7bc199271 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986210 Change-Id: I863cb0fc0568a1318747749ad65d84da6279bc44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
520386c4b2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986210 Change-Id: Ia70b8cc99fbe51edd7928c45e9425518ce50aa5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-v2-dev am: 5a4241b73e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986207 Change-Id: I0e61b53b2d203112741a492baf4b74c26fffee71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
8109121cef -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986207 Change-Id: I6fcd61331598c2db9b46fd5433fa24e19d283d57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-v2-dev am: 8b739e5268 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986132 Change-Id: I72476b056fc6a1c323a47054532560d429388157 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f5caa35c26 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986132 Change-Id: I1dc136c5fdbc6891a8a890be658d52eba6db131f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-v2-dev am: e4b3e6916d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18984623 Change-Id: Ie8f088f3f88937e7c1e4da3e07e8e40353e2fde3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
52acd0f061 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18984623 Change-Id: I472513eb7e394039ffbead6c24489d36ee5aacd8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
cc2bcd2a9e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18984265 Change-Id: Iba6089c3af6afedef59588b11e1d5cb0ae606ed1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-06-20Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-06-20Merge "Fix no announcment when the PIP menu shows on the screen" into tm-devRyan Lin
2022-06-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4f8656695a60a3eaf00ccb2b3578055b9c19e7e0
2022-06-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ifec924088bb584ef9b01e56c4b2466ce0407c052
2022-06-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib2b2e34a584594efe766af7aba3c9df7b7fa1998
2022-06-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I551fbf96438a7973080b0ddfaeacaa255143f359
2022-06-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia5d6337536ce883b19ebb4f072d64f54902dd1ee
2022-06-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ifa13b84c021a66fe9e70e2ee50c97db18f647d6a
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 23:35:00 +0000