Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
766,163 Commits 3 Branches 0 Tags
138fc75ad49976bd2f66e2ca9ff9da032611fcda
Commit Graph

766163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jayant Chowdhary
138fc75ad4 Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev 2022-07-21 20:41:45 +00:00
Rucha Katakwar
88949ab1fc Merge "Update torch brightness max level description." into tm-d1-dev 2022-07-20 23:26:09 +00:00
Jayant Chowdhary
cff610bf0e camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position 
When we use any of the viewed methods from ByteBuffer such as
asFloatBuffer, the returned buffer's position and the original
ByteBuffer's positions are independent. So update the original
ByteBuffer's position as well, for correct accounting.

Bug: 239639757

Test: Camera CTS; GCA
Test: MarshalQueryableArray error logs don't appear in logcat while using GCA

Change-Id: I488a23c278ee5d044c2423a616e598a93cbbad0b
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
 2022-07-20 18:33:45 +00:00
TreeHugger Robot
4b03a0ed58 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-20 15:54:36 +00:00
TreeHugger Robot
b58ae046f5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-20 15:54:36 +00:00
TreeHugger Robot
6fe73a1349 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-20 15:54:07 +00:00
TreeHugger Robot
d44db41919 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-20 15:54:07 +00:00
Suprabh Shukla
904e5190a7 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I478768b120d8d6b7f3e9a4f94027f5be128c85af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:42:35 +00:00
Suprabh Shukla
a001487ac6 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ic800336e69ba88630f0b156f24bc03837cdc73dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:42:30 +00:00
Suprabh Shukla
e15951e5f2 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I5494e1bc1e6225d8b9cddb5cf69c12b9f574765c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:41:03 +00:00
Suprabh Shukla
1217209edf [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I8f6a92dec20c6b43fab14e7ca11403b30f6e1c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:19:05 +00:00
Suprabh Shukla
6a3dcb1f87 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Iba2292a2af14bc8b9588462d91e35571b971fd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:18:47 +00:00
Suprabh Shukla
b3f3961df2 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I69154f34c47b8454f474a8fbbd2764e3db135d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:02:09 +00:00
Suprabh Shukla
650e883ff7 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I8ff40caac4ba3cdd7b4f566153992892d64439c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 08:01:00 +00:00
Suprabh Shukla
1479d4c594 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ib5e63c6277a7538ba41c9ff2c3517fe016e43deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:45:27 +00:00
Suprabh Shukla
c2841d8ef1 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: Ia6b5324d8af914029711c1fb63af6b45d5f2b217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:19:42 +00:00
Suprabh Shukla
ff26f6a3b7 [automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours 
am skip reason: skipped by user suprabh

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

Change-Id: I06963a3201ef81c1fe537bab7a1d51f1e305a924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:02:11 +00:00
Sam Dubey
0de21da966 Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev 2022-07-20 05:38:59 +00:00
Suprabh Shukla
ee9331c0d3 Stop crashing the system on hitting the alarm limit am: c010da3a46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069

Change-Id: I0fe52c40c5e9d38ea5c4d31dd901c1c03d5f8ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 04:39:11 +00:00
Steve Elliott
c26af50021 [automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

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

Change-Id: Ief57d911935629ae269bf9fd64fe1fcbf9ae6ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:06:12 +00:00
Steve Elliott
d4b198e1e1 [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 28dc43e6a7 -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

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

Change-Id: I341eb129d0459251cd05b4221a79444f1c8a1f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:06:09 +00:00
Jeff DeCew
b6790b9f8f Fix squished notifications on the lockscreen. am: c29777f405 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065229

Change-Id: Ib447f567bc08f5ab8f200fab294873f6a5447769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:06:06 +00:00
Steve Elliott
edb497c9bf Merge changes Ie8ddf1db,Ice6de114 into tm-dev 
* changes:
  Fix stale NSSL "fling" state caused by no-op fling
  Fix squished notifications on the lockscreen.
 2022-07-20 02:48:22 +00:00
TreeHugger Robot
a0634be0b4 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 88e1f760bf -s ours am: 98f625151c -s ours am: 6e4bd6d0e0 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: I604c5dc5e92d431dbf37c05e5eedc7b9e78c6d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:04:39 +00:00
TreeHugger Robot
6b76d854bb [automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7 am: e41a97f229 -s ours am: f5b9c814e1 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: I85f11be6a5cac102f3433c23a47759a99034b64f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:04:34 +00:00
TreeHugger Robot
d280e9bd4b [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 4792391ce3 -s ours am: b23fac6739 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: I9261fbf3a8bc6aed41d176834bbf61d8bac1ca4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:04:29 +00:00
TreeHugger Robot
9b71aa5bf5 [automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-mainline-prod am: cb1451fb7f -s ours am: c41f714122 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history

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

Change-Id: I42cbc9d0dbde6f122a9e870a336430d559a8bcbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:04:17 +00:00
Suprabh Shukla
d80bf72c09 [automerger skipped] [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129 am: b7d6952de7 -s ours am: 2dac8d1d85 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history

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

Change-Id: I4697ca54ae32b3b7fa3bfbf7e279a4276cd83be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:04:16 +00:00
TreeHugger Robot
6e4bd6d0e0 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 88e1f760bf -s ours am: 98f625151c -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: I40b0eccf9029f30ceb64c15b937c9e776300c299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:03:10 +00:00
TreeHugger Robot
f5b9c814e1 [automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7 am: e41a97f229 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: I6258a64e1367d003827c74bf9ac889d49455fee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:02:54 +00:00
Suprabh Shukla
c010da3a46 Stop crashing the system on hitting the alarm limit 
Exempting the system as a runtime restart is not clearly
better than extreme memory and computation pressure that can result from
the originating spam.
Callers in the system should guard against any spammy requests that lead
them to create a lot of alarms.

Test: Builds, boots and existing tests should pass.

atest CtsAlarmManagerTestCases:UidCapTests
atest FrameworksMockingServicesTests:AlarmManagerServiceTest

Bug: 234441463
Change-Id: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff
(cherry picked from commit 3b9f3f4a0f)
Merged-In: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff
 2022-07-20 01:48:40 +00:00
TreeHugger Robot
b23fac6739 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 4792391ce3 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: Id1a1fa141e74b44a8d44567d2764975e0a4a5246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 01:40:05 +00:00
TreeHugger Robot
98f625151c [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 88e1f760bf -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: I7db1b53b317189cb337f978b6b5ad7b536dec456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 01:39:45 +00:00
TreeHugger Robot
c41f714122 [automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-mainline-prod am: cb1451fb7f -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history

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

Change-Id: I1fbe88d540518c9f9c22583841ba3f5e5d552140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 01:39:38 +00:00
TreeHugger Robot
e41a97f229 Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495

Change-Id: Ib3093d84642819dbbdad51427ca5588bed584707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 01:39:37 +00:00
Suprabh Shukla
2dac8d1d85 [automerger skipped] [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129 am: b7d6952de7 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history

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

Change-Id: I0ec59ec496077a2f3a90bab31b57b4205ddb83cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 01:39:18 +00:00
TreeHugger Robot
88e1f760bf [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: Id0099210f887930c7365b7d9c005bce834c63dc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 01:39:17 +00:00
TreeHugger Robot
4792391ce3 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

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

Change-Id: I8e940e45fce652bffb14a78eb49116cd6558d8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 01:38:31 +00:00
TreeHugger Robot
8b2f5cecd1 Merge "Stop crashing the system on hitting the alarm limit" into sc-dev 2022-07-20 01:17:36 +00:00
TreeHugger Robot
cb1451fb7f Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-mainline-prod 
* changes:
  [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129
  Stop crashing the system on hitting the alarm limit
 2022-07-20 01:17:36 +00:00
TreeHugger Robot
950fb419e7 Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev 
* changes:
  [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129
  Stop crashing the system on hitting the alarm limit
 2022-07-20 01:17:36 +00:00
Steve Elliott
28dc43e6a7 Fix stale NSSL "fling" state caused by no-op fling 
If a fling gesture ends with the current Y position in the exact end
position for the fling, then the code to run the fling animation is
bypassed, but the flag in AmbientState tracking whether a fling is
active is never reset. This CL replaces the short circuit logic with the
standard fling-end logic, ensuring that all expected code paths are
executed.

Fixes: 234824085
Fixes: 237272856
Test: manual
  1. Enter lockscreen
  2. Swipe up and then down to the exact same position, in one
     continuous gesture
  3. Wait for a notification update
  Observe: Shade resizes correctly to match the new contents
Change-Id: Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415
Merged-In: Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415
(cherry picked from commit 7f387f9ae9)
 2022-07-20 00:07:20 +00:00
Rucha Katakwar
a5bd39561a Update torch brightness max level description. 
Bug: 239492786
Change-Id: I01720f2d25b932d58fa8b7816f8504101d70f3a3
 2022-07-19 16:50:25 -07:00
Bill Yi
1ad4272417 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iacab418921a01c183e545801f7ecb4110d1a7ecb
 2022-07-19 16:12:12 -07:00
Bill Yi
c513a6b205 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5b0ba0235d319df52c9c4438988f1d68e7f5cdcd
 2022-07-19 16:03:49 -07:00
TreeHugger Robot
0f0fbcad8a Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069

Change-Id: I0ae814253b0093a255914cdf4d2d6c2abe3b3acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:55:43 +00:00
TreeHugger Robot
58dc8eb63b Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev 2022-07-19 22:39:42 +00:00
Bill Yi
7c2144fee4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifea3e8766543cf32bd83515e3a61a43ef638c0bd
 2022-07-19 15:34:13 -07:00
Julia Reynolds
bcf7b77e13 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am: e1205e536a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc35bcb4991c7754b78062af16e26b22f2f13b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:04:30 +00:00
Julia Reynolds
a57f05206b [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am: 59f1e6a43a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4bfa25e2871973f8e5738206e1e56bbc165ed195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:04:24 +00:00