Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
770,693 Commits 3 Branches 0 Tags
ff46cdd950c5f89bf7770cec19ddbbec7732b291
Commit Graph

770693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
ff46cdd950 BLE audio: support assigning volume at BLE device connection 
Add support for associating an initial volume with a BLE
connection:
- add volume info to BluetoothProfileConnectionInfo in a new
BLE output factory method
- when handling device connection for BLE, also check if
volume information from the connection information is available.

Bug: 233975367
Test: atest frameworks/base/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BluetoothProfileConnectionInfoTest.java
Change-Id: Ib54267727bc4d47e6999f2b84eab805f23c4955a
 2022-07-11 16:41:01 +00:00
Vishnu Nair
cdb26776bb Merge "BBQ: Attach calling thread to jvm if needed" into tm-qpr-dev 2022-07-11 15:12:54 +00:00
Winson Chung
ea4a7a6cf9 Merge "Skip cancel of physics animators if not needed" into tm-qpr-dev 2022-07-11 15:10:17 +00:00
Jordan Demeulenaere
8eee52bf1d Merge "Fix notification animation from AOD" into tm-qpr-dev 2022-07-11 14:13:54 +00:00
Ming-Shin Lu
3fc61e0aaf Merge "Fix IME picker dialog being dismissed by the app overlay" into tm-qpr-dev 2022-07-11 10:04:26 +00:00
Jeff Chang
9e73750458 Merge "Handle the uncontrolled task in split-screen" into tm-qpr-dev 2022-07-11 05:47:58 +00:00
Winson Chung
b41f317dd9 Skip cancel of physics animators if not needed 
- For some reason calling cancelAction() with no animations still takes
  ~2s while testing, which causes tests to take multiple seconds to tear
  down

Without change:
[76/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testAnimationsUpdatedWhileInMotion: PASSED (4.743s)
[77/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testFling: PASSED (4.441s)
[78/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testFlingRespectsMinMax: PASSED (4.090s)
[79/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testFlingThenSpring: IGNORED (0ms)
[80/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testSpringOneProperty: PASSED (4.517s)
[81/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testIsPropertyAnimating: PASSED (4.768s)
[82/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testUpdateListeners: PASSED (4.795s)
[83/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testFlingThenSpring_objectOutsideFlingBounds: PASSED (4.741s)
[84/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testListenersNotCalledOnSubsequentAnimations: PASSED (4.818s)
[85/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testAnimationsUpdatedWhileInMotion_originalListenersStillCalled: IGNORED (0ms)
[86/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testSpringMultipleProperties: PASSED (4.491s)
[87/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testFlingToMinMaxThenSpring: PASSED (4.743s)
[88/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testExtensionProperty: PASSED (4.365s)
[89/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testOneAnimatorPerView: PASSED (8.053s)
[90/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testEndListenersAndActions: IGNORED (0ms)

With change:
[76/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testAnimationsUpdatedWhileInMotion: PASSED (755ms)
[77/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testFling: PASSED (427ms)
[78/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testFlingRespectsMinMax: PASSED (126ms)
[79/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testFlingThenSpring: IGNORED (0ms)
[80/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testSpringOneProperty: PASSED (503ms)
[81/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testIsPropertyAnimating: PASSED (756ms)
[82/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testUpdateListeners: PASSED (804ms)
[83/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testFlingThenSpring_objectOutsideFlingBounds: PASSED (779ms)
[84/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testListenersNotCalledOnSubsequentAnimations: PASSED (804ms)
[85/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testAnimationsUpdatedWhileInMotion_originalListenersStillCalled: IGNORED (1ms)
[86/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testSpringMultipleProperties: PASSED (502ms)
[87/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testFlingToMinMaxThenSpring: PASSED (728ms)
[88/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testExtensionProperty: PASSED (326ms)
[89/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testOneAnimatorPerView: PASSED (50ms)
[90/665] com.android.wm.shell.animation.PhysicsAnimatorTest#testEndListenersAndActions: IGNORED (0ms)

Bug: 238577469
Test: atest WMShellUnitTests
Change-Id: Id378ababb9b0542bbc5a17caebaa42f2f9fb4f33
 2022-07-11 05:47:04 +00:00
Evan Chen
d453c4f6ff Merge "Fix Computer and App Streaming Strings" into tm-qpr-dev 2022-07-11 05:33:54 +00:00
Tony Huang
2b9d5ac7cc Merge "Avoid re-launch button show after split switching" into tm-qpr-dev 2022-07-11 04:03:00 +00:00
Shaowei Shen
184d8894f8 Merge "[Output Switcher] Delete Media Output Group related code" into tm-qpr-dev 2022-07-11 02:08:37 +00:00
Alejandro Nijamkin
d6ef72ba9c Merge "Unit test for CameraGestureHelper." into tm-qpr-dev 2022-07-10 18:26:19 +00:00
Jeff DeCew
231b56c774 Merge changes I60fb07e4,Ie16987a8 into tm-qpr-dev 
* changes:
  Only log NOTIF INFLATION ABORTED if we may have actually aborted something.
  Add the invalidation reason to existing log statements
 2022-07-10 10:23:01 +00:00
Alejandro Nijamkin
4af7cc97bc Unit test for CameraGestureHelper. 
Also includes some massaging of `CameraGestureHelper` to be more
testable.

Test: Made sure that double-tapping the power button still brings up the
camera correctly in all the scenarios described in ag/19214502
Bug: b/235403546

Change-Id: I54e3f760b0c2fa5738766f8b97568caf07676a8d
 2022-07-09 15:02:28 -07:00
Winson Chung
d69a267b95 Merge "Support running WMShellUnitTests from studio" into tm-qpr-dev 2022-07-09 02:36:24 +00:00
TreeHugger Robot
864d7277b0 Merge "Workaround a notification inflation race condition." into tm-qpr-dev 2022-07-08 23:49:33 +00:00
Aaron Liu
2ae06d9b9b Merge "[Keyguard] Remove behind scrim for alarm" into tm-qpr-dev 2022-07-08 22:23:17 +00:00
TreeHugger Robot
591a11a432 Merge "Fix tts span on Editable" into tm-qpr-dev 2022-07-08 22:15:10 +00:00
Avichal Rakesh
573c527843 Merge "camera: Fix exception handling from ImageReader#detach" into tm-d1-dev am: 00d8fb5022 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139699

Change-Id: Ib70238ad7e850cad5666a66c2a6f29353d58cf0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:52:26 +00:00
Lucas Dupin
8513f6b23a Merge "Size restrict right icon size in notification" into tm-dev am: 9ec047d918 am: f2cf01bb57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19197146

Change-Id: I2ac5d5fc9d69affd778b34c12fb16ee301344f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:52:01 +00:00
Charles Chen
369d0399ab [automerger skipped] Merge "Fix exception when opening App info on work profile" into tm-dev am: 9b6a9578a1 am: 7ec2bb7e96 -s ours 
am skip reason: Merged-In Ibcb40521a5a8374e485932f006049ba676213da1 with SHA-1 b4bf0a8550 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18989968

Change-Id: I4a9e36d03322bdab37d816d02b75154b28b6e06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:51:18 +00:00
Manjeet Rulhania
119e4c998c [automerger skipped] Merge "Remove package name from SafetyNet logs" into qt-dev am: 2c12354e77 am: ca9d475ba4 -s ours am: d307aa8bed -s ours am: 98fa0f5b54 -s ours am: 3c6d0b8026 -s ours am: ed729f2dd1 -s ours am: cf84806a77 -s ours am: 57efff8c94 -s ours am: c2175c38eb -s ours 
am skip reason: Merged-In I993832e148636f1795ffe393c6dc74a08b9442f8 with SHA-1 bbe2a11827 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19138582

Change-Id: I99bf7a206158dd2487c49eb4c3347ac8ff1ce702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:50:37 +00:00
Manjeet Rulhania
12e3dfbba8 [automerger skipped] Merge "Remove package name from SafetyNet logs" into qt-dev am: 2c12354e77 am: ca9d475ba4 -s ours am: d307aa8bed -s ours am: 98fa0f5b54 -s ours am: 3c6d0b8026 -s ours am: c8f2755065 -s ours am: d0fcd51365 -s ours am: 2fe0848f96 -s ours 
am skip reason: Merged-In I993832e148636f1795ffe393c6dc74a08b9442f8 with SHA-1 bbe2a11827 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19138582

Change-Id: Id86d54a1b9754d986de777e99169aa5e00a9b270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:50:30 +00:00
Manjeet Rulhania
7a0feb3247 [automerger skipped] Merge "Remove package name from SafetyNet logs" into rvc-dev am: fa04b36240 am: 2cef59d6fd -s ours am: b51f58151d -s ours am: eba95e3619 -s ours am: c2530cddcc -s ours am: 248d6f5682 -s ours am: 027e367e1c -s ours 
am skip reason: Merged-In I8f823487ca16861a35135cfc3383fa2ce8258017 with SHA-1 dfeea39dbc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139356

Change-Id: I36a745944a20463a60c45b66ebfecf17ea540f72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:50:23 +00:00
Manjeet Rulhania
34692f9f40 [automerger skipped] Merge "Remove package name from SafetyNet logs" into rvc-dev am: fa04b36240 am: 2cef59d6fd -s ours am: b51f58151d -s ours am: 28efa79ab4 -s ours am: 0ba1ce8d6e -s ours am: 729b2c1ab8 -s ours 
am skip reason: Merged-In I8f823487ca16861a35135cfc3383fa2ce8258017 with SHA-1 dfeea39dbc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139356

Change-Id: Ie2f48d9f7032786183280970b7a54462d08f9c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:50:15 +00:00
Manjeet Rulhania
05a95d0b10 [automerger skipped] Merge "Remove package name from SafetyNet logs" into sc-dev am: 0edf50599f am: 52218b9919 am: cbac180a1d -s ours am: 4f784ac9b8 -s ours am: 94d347aa8e -s ours 
am skip reason: Merged-In I4b61d13256ce0bfb8fc9d21db52ee78ce2097f14 with SHA-1 45b2319677 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139540

Change-Id: I76969705c21a31c3c32355f297daf98d5afebab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:50:06 +00:00
Manjeet Rulhania
d1964e2e5e [automerger skipped] Merge "Remove package name from SafetyNet logs" into sc-dev am: 0edf50599f am: 423fd8207b -s ours am: 96910a5861 -s ours am: b490b326be -s ours 
am skip reason: Merged-In I4b61d13256ce0bfb8fc9d21db52ee78ce2097f14 with SHA-1 45b2319677 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139540

Change-Id: I4ba8d623010939a1664fa547bf6fb86c4976cb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:49:57 +00:00
TreeHugger Robot
14af6daa6e [automerger skipped] Merge "Don't setOccluded in onLaunchAnimationStart." into tm-dev am: 2493eff319 am: cebb7f3f47 -s ours 
am skip reason: Merged-In Ia71eb5fb0f85eb5fb494e66a270c68d7df5e1629 with SHA-1 e66e445e6a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19136050

Change-Id: Iaa8099e3c80bd145a90f0c950ceebc7b71a77e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:49:35 +00:00
Hui Yu
835683cfce Merge "Don't freeze apps in the power exemption allow list." into tm-dev am: 2ccba9feb0 am: 59b6143788 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19140263

Change-Id: I8992a3593370c8bb57ccab6a36aec0031deafc45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:49:21 +00:00
Manjeet Rulhania
d92a076862 Merge "Remove package name from SafetyNet logs" into tm-dev am: 9567592b7d am: a379fc68f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19136091

Change-Id: I4321bd676fb4680afa24dcc287df1633acbb52ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:46:37 +00:00
Bill Yi
5d9be93aef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 1bd49a3174 -s ours am: af5f974d09 -s ours am: 9b53d39d66 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19170333

Change-Id: Idbe6e7ba283f92aee985c0f86ba9f6afbcb722ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:21 +00:00
Bill Yi
dc9e798505 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c32a3d169e -s ours am: d2dba84d6a -s ours am: bcd96aea8f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19170333

Change-Id: I3a7ecd8282758ff758986caab1fb0864bad1716d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:19 +00:00
Bill Yi
7fd5ecdd03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 75a7e3f8b1 -s ours am: 0f5f012ccc -s ours am: 83b5f8bdc1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19168912

Change-Id: Ie57108316695057f87f27511ad3f68eec3577364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:16 +00:00
Bill Yi
4f67b2385b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89398b5bcd -s ours am: 45c0f5deee -s ours am: 734a418fdc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19168912

Change-Id: Iae062830c4fa8e42eaa50e7e9c8aed9766993ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:15 +00:00
Bill Yi
05fa84fae4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f128a870e6 -s ours am: 5442c430b5 -s ours am: 525ac20dab -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19166158

Change-Id: Ib518ffcae4234bf84795cf4cb982e749cd33ae80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:13 +00:00
Bill Yi
85ccb4234d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c6329f268c -s ours am: fb59100992 -s ours am: acdc0b1e3c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19166158

Change-Id: I144f29f65cdc6a00de56448446bcf9bf4a9f4714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:11 +00:00
Bill Yi
50928b4661 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fdadf01db3 -s ours am: 47a70345db -s ours am: 105c0e9850 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19165310

Change-Id: I968ad95ae2e53a21ced750affa9c4fb3fb5c1ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:06 +00:00
Bill Yi
dface46f1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d78afe82ce -s ours am: 796069eed6 -s ours am: a6161bd6f4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19165310

Change-Id: Iacf6a43e2284b800dd8b0e6c2acc8d7cc1a7d023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:00 +00:00
Bill Yi
dff3e55413 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 57d5ccd33e -s ours am: a84a2650c4 -s ours am: 66067e8343 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19163018

Change-Id: I7efc80f3d6a515b9f08f287d5a5533d8cbfd3d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:44:50 +00:00
Bill Yi
2f1f5cd3b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1b32ed8427 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19168921

Change-Id: I8ed1decd00f38bfb0d5b9dd30713c8be4f215f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:43:07 +00:00
Bill Yi
1c64dc5a21 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 956fc5c039 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19168921

Change-Id: I0db1f32df1c0eeadcb7f3e77c39c357c04a7179b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:43:05 +00:00
Bill Yi
4c0e0bbf73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bb5946e450 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19168911

Change-Id: I53ec0059511a4b94c38510560d2647cbf5273de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:43:03 +00:00
Bill Yi
72631424ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 254137abbd -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19168911

Change-Id: I7aae064c80b5e673da6b0546b8317a522c195384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:43:01 +00:00
Bill Yi
eb1cb1af9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 28f49cf7b7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19166682

Change-Id: I92eee5bbe9b7dcb05b8cb55010c6e424ac44969d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:42:59 +00:00
Bill Yi
f1a47affe0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e10e3712aa -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19166682

Change-Id: Ie34b57d011399695c4c998f44c5a9dd89791dc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:42:56 +00:00
Bill Yi
67e1a4f42a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5ba91a1426 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19165787

Change-Id: I9593136e4eaac2a3ae7253649deff7566b48e6fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:42:49 +00:00
Bill Yi
fcf7ea34bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 847f444a66 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19165787

Change-Id: I87dbe6dbad3f27d7792e54efa757ba888fae7b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:42:19 +00:00
Bill Yi
060ea91c54 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5536cde95 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19163017

Change-Id: Ibd17af31f7cc755f6429d1dcb1b524c596cb746c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:41:58 +00:00
Bill Yi
2aba83d0a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba0de3fe1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19163017

Change-Id: Ib827b7b0f39eb81db8609198f539f80ec5d010f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:41:42 +00:00
TreeHugger Robot
b4658047c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 4bbf9ac326 -s ours am: 50d1e9e446 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19170076

Change-Id: I2823b32b0525f7f4f938d6aa75629a455c197083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:51 +00:00
Bill Yi
381ba2493e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d17e368b24 -s ours am: ba3fc15da2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19170076

Change-Id: I59e110c628219b1289c5082125826ee26ffe0a19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:45 +00:00