Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,179 Commits 3 Branches 0 Tags
628a5536613c98685edf0ff86586949adea5e019
Commit Graph

660179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Severson
628a553661 Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-qpr1-dev am: 96a5a3b953 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18200760

Change-Id: Id5ef00296c5d94bd1e8ba2ccb9819b5c194fe849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:20:29 +00:00
Raphael Kim
e87182f963 Merge "Remove package title from notification access confirmation intent" into sc-v2-dev 2022-06-03 22:20:03 +00:00
Evan Severson
96a5a3b953 Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-qpr1-dev 
* changes:
  [automerge] Disallow privileged apps to bypass location restriction 2p: 807f4cfc80
  Disallow privileged apps to bypass location restriction
 2022-06-03 20:49:54 +00:00
TreeHugger Robot
eafebaebdc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-01 23:22:21 +00:00
TreeHugger Robot
ea7de377b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-01 23:22:21 +00:00
TreeHugger Robot
2c1a10c9cb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-01 23:22:21 +00:00
TreeHugger Robot
9f57d7c3c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-01 22:16:15 +00:00
TreeHugger Robot
358df3b4e2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-01 22:16:15 +00:00
TreeHugger Robot
2634588109 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-01 22:16:15 +00:00
Bill Yi
0bab9e3e16 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie300d86f55c90298efca66267dc1da951a3c380e
 2022-06-01 03:31:09 -07:00
Bill Yi
a04b741182 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I14da92749ed404c95592bb7c9233c8c505dd7a9f
 2022-05-31 13:32:44 -07:00
Bill Yi
f329b8759b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5e26b295a6db7d299a2a7e73c8c6587ac75aa7f9
 2022-05-31 13:29:23 -07:00
Bill Yi
a7a182ad32 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I23b7343bd5f1ab44ccc9415adf61ca003d8d087a
 2022-05-31 13:18:43 -07:00
Bill Yi
ff47ad72ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I25edebe2655a89a600627c4cf99e06743cbb9371
 2022-05-31 13:15:49 -07:00
Bill Yi
cc88de1507 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie0a886eefd2a2d79df4f6c8e16471445c95ec2c9
 2022-05-31 12:40:55 -07:00
Bill Yi
89ad33d3d1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I89eb09237d7d77e93ecb561a38f3044c609d3827
 2022-05-31 12:02:49 -07:00
Raphael Kim
51370d2f3f Remove package title from notification access confirmation intent 
Bug: 228178437
Test: Manually confirmed on an application
Change-Id: Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184
Merged-In: Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184
 2022-05-31 17:20:50 +00:00
Wenhao Wang
e9f7ca4fd5 [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours am: 718d5a4d2f -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: If384bbd807b6b10bbafebf359d11b725b30db72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 07:51:13 +00:00
Wenhao Wang
718d5a4d2f [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: Id2ee63db92aae509297f6e014a03fe7ccf574497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 07:33:49 +00:00
Wenhao Wang
b1cf2a0cd2 [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: I5926ea7d571c78eae47ca529cb0a166c2a718519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:58:02 +00:00
Wenhao Wang
aa456df74e [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: Id295b15c1e6469ee9f50babb2f4c057d78d67e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:35:00 +00:00
Julia Reynolds
61c6c8ba09 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours am: b50f345f57 -s ours am: f03f3fad8b -s ours am: 692a08086e -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: Id7065a864f7b11ca96085bc2870ce12d46c13533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:12:27 +00:00
Wenhao Wang
c543f70e3d [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I44b0bee5c0ba597407652dd2c1af868adcee724a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:11:04 +00:00
Julia Reynolds
692a08086e [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours am: b50f345f57 -s ours am: f03f3fad8b -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: Ide0431351cbc788dc0c4ca649a8b5eedbd9a93ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:39:09 +00:00
Wenhao Wang
8bb5e98ecb Revert "[conflict] Move service initialization am: 38fe45b539" 
This reverts commit 012cace2ee.

Reason for revert: This CL depends on ag/17823648, which is not merged into qt-qpr1-dev.

Change-Id: I503bcc1e979dd4db941cb7754f63a0dc35ce9682
 2022-05-30 05:30:08 +00:00
Julia Reynolds
f03f3fad8b [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours am: b50f345f57 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: Icbb45e04112d49968b4a2f33693793ef01fb95b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:14:00 +00:00
Julia Reynolds
b50f345f57 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: I1f15a3a4dd6fe04321ecda11bb16dc6f2aef175c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:53:17 +00:00
Julia Reynolds
f3a82a3b59 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: I094361ea2d938bd3e7ff77e66f68cf23d8e25ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:05:13 +00:00
Julia Reynolds
012cace2ee [conflict] Move service initialization am: 38fe45b539 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563202

Change-Id: If27ee7e26bcf2797a6a4a770f2a5064605cdeaa0
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:24:30 +00:00
Julia Reynolds
e21ea44232 [automerger skipped] Move service initialization am: caa5a22ea0 -s ours am: 2ee5edda84 -s ours am: 39711c9dd7 -s ours am: 210bab229f -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 14d7f081c8 is already in history

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

Change-Id: I586eb0097417d636370bb8e645c8d456d574cb4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:57:00 +00:00
Julia Reynolds
158da851e5 [automerger skipped] Move service initialization am: 14d7f081c8 -s ours am: 56822a2cbb -s ours am: 3132e811e3 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 d262fa6af7 is already in history

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

Change-Id: I3708966094997177c24a442e82047fb0534fdd7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:56:53 +00:00
Julia Reynolds
8e1f6b818f [automerger skipped] Move service initialization am: d262fa6af7 -s ours am: 1df64fbf87 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 937cc90b0d is already in history

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

Change-Id: I28dfa78ca6f9ba9746f54bda2ba84e6c72aa27d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:56:36 +00:00
Julia Reynolds
210bab229f [automerger skipped] Move service initialization am: caa5a22ea0 -s ours am: 2ee5edda84 -s ours am: 39711c9dd7 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 14d7f081c8 is already in history

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

Change-Id: I39fd8aae76294148f1ae29fd366840c4eb490223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:34:14 +00:00
Julia Reynolds
3132e811e3 [automerger skipped] Move service initialization am: 14d7f081c8 -s ours am: 56822a2cbb -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 d262fa6af7 is already in history

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

Change-Id: Id31f1f2e1c65abb07343ae82ab4ea828b87c6433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:34:09 +00:00
Julia Reynolds
1df64fbf87 [automerger skipped] Move service initialization am: d262fa6af7 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 937cc90b0d is already in history

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

Change-Id: I6c8ea200cf286d45a14537458a3c5f4f5dc4c350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:34:04 +00:00
Julia Reynolds
39711c9dd7 [automerger skipped] Move service initialization am: caa5a22ea0 -s ours am: 2ee5edda84 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 14d7f081c8 is already in history

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

Change-Id: I495654b0d378f61904bfa689df4e76ef3a113523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:33:22 +00:00
Julia Reynolds
56822a2cbb [automerger skipped] Move service initialization am: 14d7f081c8 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 d262fa6af7 is already in history

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

Change-Id: I15a32d7cd62c72412257e83b064e0f99375b4bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:33:01 +00:00
Julia Reynolds
2ee5edda84 [automerger skipped] Move service initialization am: caa5a22ea0 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 14d7f081c8 is already in history

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

Change-Id: I9b3572694f3424ba5da6b52fe06b3c71b23b3efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:32:51 +00:00
Julia Reynolds
ea157264ae [automerger skipped] Move service initialization am: 937cc90b0d -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 239251c1cd is already in history

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

Change-Id: I14005506beaadc077fe92637ae749f8c58e830c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:25:57 +00:00
Julia Reynolds
937cc90b0d Move service initialization 
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
 2022-05-24 23:28:38 +00:00
Julia Reynolds
d262fa6af7 Move service initialization 
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
 2022-05-24 23:28:00 +00:00
Julia Reynolds
14d7f081c8 Move service initialization 
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
 2022-05-24 23:15:56 +00:00
Julia Reynolds
caa5a22ea0 Move service initialization 
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
 2022-05-24 16:14:17 -07:00
Julia Reynolds
239251c1cd Move service initialization 
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
 2022-05-24 13:21:01 -07:00
Julia Reynolds
38fe45b539 Move service initialization 
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
 2022-05-23 16:03:12 -07:00
TreeHugger Robot
3d18a8e050 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-05-23 18:42:17 +00:00
TreeHugger Robot
96120cae69 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-05-23 18:42:17 +00:00
TreeHugger Robot
8ffa504388 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-05-23 18:42:17 +00:00
TreeHugger Robot
e969989bea Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-05-23 18:42:17 +00:00
TreeHugger Robot
5f64bb837d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-05-23 18:40:50 +00:00