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

660212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Presubmit Automerger Backend
33be467251 [automerger skipped] [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 am: 20e1cbc195 -s ours 
am skip reason: Merged-In Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is already in history

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

Change-Id: I1ddf71d68b801aa8a0cbe4fc08119ce162ad11b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 20:41:49 +00:00
TreeHugger Robot
554eef1388 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-06 22:36:20 +00:00
TreeHugger Robot
a4a4ea4fc8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-06 22:36:20 +00:00
TreeHugger Robot
dad4cddffe Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-06 22:36:20 +00:00
Presubmit Automerger Backend
20e1cbc195 [automerged blank] Remove package title from notification access confirmation intent 2p: e86cdf4ba1 
Blank merge reason: Change-Id Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184 with SHA-1 51d47ec7c8 is in history

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

Bug: 228178437
Change-Id: I7cadfb3449c1cf3cd4f212c49773489bd32c3f62
Merged-In: Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184
 2022-06-06 21:03:53 +00:00
Raphael Kim
e86cdf4ba1 Remove package title from notification access confirmation intent 
Bug: 228178437
Test: Manually confirmed on an application
Change-Id: Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184
Merged-In: Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184
 2022-06-06 21:03:40 +00:00
TreeHugger Robot
6443c9c18e [automerger skipped] Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev am: bf06070af0 am: ba83a11456 -s ours am: 055db8bd4e -s ours am: 3afb3ac806 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I542e9a13b46edd12f312a760795ded398aa32593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 16:12:46 +00:00
Jeff Chang
7f22339bff [automerger skipped] [RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks am: c5aaf99df5 am: 9c19806351 -s ours am: 20b659125f -s ours am: a00fcc8539 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e690a3a07a62ace4474543867a79b7654f6137a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 16:12:44 +00:00
TreeHugger Robot
3afb3ac806 [automerger skipped] Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev am: bf06070af0 am: ba83a11456 -s ours am: 055db8bd4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1bb83faf421257fef5931f992b1adb577fe6245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 15:46:42 +00:00
Jeff Chang
a00fcc8539 [automerger skipped] [RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks am: c5aaf99df5 am: 9c19806351 -s ours am: 20b659125f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d839349b537cea1f14efd4ddec969d45957966b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 15:46:35 +00:00
TreeHugger Robot
055db8bd4e [automerger skipped] Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev am: bf06070af0 am: ba83a11456 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fd9a26d95878e6ad813d5ec6c6390ad563cc05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 15:30:07 +00:00
Jeff Chang
20b659125f [automerger skipped] [RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks am: c5aaf99df5 am: 9c19806351 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97e25f712c173748ddc849d35f782547b9b2c186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 15:29:56 +00:00
TreeHugger Robot
ba83a11456 Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev am: bf06070af0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18629266

Change-Id: I39db46ddace4cc9dd12a0f025b66bb7e1fe0a23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 15:14:44 +00:00
Jeff Chang
9c19806351 [RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks am: c5aaf99df5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18629266

Change-Id: I2eb959c19e5c079c8a4d76501ec5f33d0f754bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 15:14:34 +00:00
TreeHugger Robot
bf06070af0 Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev 2022-06-06 14:48:49 +00:00
Raphael Kim
8869a8315f [automerger skipped] Remove package title from notification access confirmation intent am: 51d47ec7c8 am: c1b4cacc66 am: 963c9f8bc8 am: b37d5d47da -s ours am: 1c3e460b31 -s ours am: c657a35e44 -s ours 
am skip reason: skipped by user raphk

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

Change-Id: I9e9245bc497f66c5c1001177de3b88c72e824ea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:32:35 +00:00
Raphael Kim
c657a35e44 [automerger skipped] Remove package title from notification access confirmation intent am: 51d47ec7c8 am: c1b4cacc66 am: 963c9f8bc8 am: b37d5d47da -s ours am: 1c3e460b31 -s ours 
am skip reason: skipped by user raphk

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

Change-Id: Ibf18936f9c43c1d533abb823b8c4f188e6deb722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:15:08 +00:00
Raphael Kim
1c3e460b31 [automerger skipped] Remove package title from notification access confirmation intent am: 51d47ec7c8 am: c1b4cacc66 am: 963c9f8bc8 am: b37d5d47da -s ours 
am skip reason: skipped by user raphk

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

Change-Id: I353670db59523260aea65c8313afa85134d1b9f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 08:00:19 +00:00
Raphael Kim
b37d5d47da Remove package title from notification access confirmation intent am: 51d47ec7c8 am: c1b4cacc66 am: 963c9f8bc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18670434

Change-Id: I7b76141852d2314dd8a37d4a4ceb50f169dd8640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-05 02:50:26 +00:00
Raphael Kim
963c9f8bc8 Remove package title from notification access confirmation intent am: 51d47ec7c8 am: c1b4cacc66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18670434

Change-Id: I3af28be0359c45814aacf66a6952292894fac72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-05 02:32:27 +00:00
Raphael Kim
c1b4cacc66 Remove package title from notification access confirmation intent am: 51d47ec7c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18670434

Change-Id: I4fb8082b1f94c628417c41fd6bd6d1fd4906a12e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-05 02:14:42 +00:00
Bill Yi
7334d82b28 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie668095d0e2ff6bfe1772156c7a1d6045634e801
 2022-06-04 08:46:43 -07:00
Bill Yi
d0bb27f443 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6354a0e81fb9d4604ce294035e406a2dfad2e539
 2022-06-04 07:20:59 -07:00
Bill Yi
c810e5dea0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic0f4d333b7bcabcd5221aa993b462b5070b5cbd1
 2022-06-04 01:09:53 -07:00
Evan Severson
0d49574c94 Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev am: 44893b71c0 am: 500d27a12c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18496484

Change-Id: Id319bc74ccbd4fb56d006fb0dd881b3468baae96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:29:25 +00:00
Evan Severson
98862939f6 Allow system server uid to bypass location restriction am: 1dddfe1f70 am: 6df07033f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18200761

Change-Id: I44a4416ce713493331dd7b4f2a9fca14573e2766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:29:15 +00:00
Evan Severson
500d27a12c Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev am: 44893b71c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18496484

Change-Id: I4e69bfd6e69d36399db20525cbe98bf52233167f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:20:47 +00:00
Evan Severson
6df07033f9 Allow system server uid to bypass location restriction am: 1dddfe1f70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18200761

Change-Id: I01ec7b35cb194ebbebef0aaeb7b8d779d22a794c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:20:39 +00:00
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
44893b71c0 Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev 
* changes:
  Make CheckOp return allowed if any attr tag for a package is excluded
  Allow system server uid to bypass location restriction
  Disallow privileged apps to bypass location restriction
 2022-06-03 20:49:56 +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
Raphael Kim
51d47ec7c8 Remove package title from notification access confirmation intent 
Bug: 228178437
Test: Manually confirmed on an application
Change-Id: Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184
Merged-In: Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184
 2022-06-01 22:26:34 +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