Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
649,108 Commits 3 Branches 0 Tags
e5d5ade2e1c5598acfa367ea44b4fb5bd6275ba1
Commit Graph

649108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Christie
e5d5ade2e1 Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into rvc-qpr-dev am: 6ce6f0b8fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17186288

Change-Id: I58ea073190e9bf63844b78b4833f78c5a601bd51
 2022-03-21 23:28:31 +00:00
TreeHugger Robot
21726fc866 [automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-qpr-dev am: 72d9b9c9a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I58805e9c5f18f5843d63becba6a26c22fe3d81c6
 2022-03-21 23:26:26 +00:00
Julia Reynolds
ee9f86ef77 [automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: b21e9e17f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ce674035bc7afbcd7292f0ca3f5eeecbb585a70
 2022-03-21 23:26:17 +00:00
David Christie
6ce6f0b8fb Merge "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." into rvc-qpr-dev 2022-03-21 23:12:32 +00:00
TreeHugger Robot
72d9b9c9a3 Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-qpr-dev 2022-03-21 23:07:01 +00:00
Julia Reynolds
b21e9e17f6 DO NOT MERGE Add an OEM configurable limit for zen rules 
Test: ZenModeHelperTest
Bug: 220735360
Change-Id: I3da105951af90007bf48dc6cf00aed3e28778b36
Merged-In: I3da105951af90007bf48dc6cf00aed3e28778b36
 2022-03-21 21:55:28 +00:00
Julia Reynolds
13de1bee05 Merge "Add an OEM configurable limit for zen rules" into sc-dev 2022-03-21 17:41:36 +00:00
Vadim Caen
ffad2f714d Merge "Fix setSplashScreenTheme documentation" into sc-dev 2022-03-21 13:18:56 +00:00
Julia Reynolds
75bd0edd7b Add an OEM configurable limit for zen rules 
Test: ZenModeHelperTest
Bug: 220735360
Change-Id: I3da105951af90007bf48dc6cf00aed3e28778b36
Merged-In: I3da105951af90007bf48dc6cf00aed3e28778b36
 2022-03-19 18:43:25 +00:00
TreeHugger Robot
ba634e4a67 [automerger skipped] Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev am: b52cedd04b am: b359403e39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7e1b57f5baaaca3fec0a4c8d891ed004eace514
 2022-03-16 11:07:06 +00:00
Jeff Chang
eb8a1d4be9 [automerger skipped] [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a03 am: bf71c0255c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6773afbe3093d1d900b029c63975cd715bfd2aab
 2022-03-16 11:06:44 +00:00
TreeHugger Robot
b359403e39 Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev am: b52cedd04b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16961349

Change-Id: I12c5cc50e904965db8d84f89c00dc3c02f29ccdc
 2022-03-16 10:43:04 +00:00
Jeff Chang
bf71c0255c [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16961349

Change-Id: I84aedd95be01bec2daf057af34d31c9220e8a27c
 2022-03-16 10:42:48 +00:00
TreeHugger Robot
b52cedd04b Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev 2022-03-16 10:16:14 +00:00
David Christie
094b1b927e Update GeofenceHardwareRequestParcelable to match parcel/unparcel format. 
Test: manual
Bug: 216631962

Change-Id: I3d6d1be9d6c312fe0bf98f600ff8fc9c617f8ec3
 2022-03-14 19:53:54 +00:00
Matt Pietal
5c85eadaa8 [DO NOT MERGE] Ignore flaky tests 
Until a better fix can be found.

Fixes: 223385977
Test: atest KeyguardViewMediatorTest
Change-Id: I9579f5e0fa15a40d8977919029e9d72bdb981b69
 2022-03-10 19:17:02 +00:00
Alex Buynytskyy
5b2e8af805 Always restart apps if base.apk gets updated. 
Bug: 219044664
Fixes: 219044664
Test: atest PackageManagerShellCommandTest
Change-Id: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
Merged-In: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
 2022-03-09 20:49:35 +00:00
TreeHugger Robot
a683c9b0c2 [automerger skipped] Merge "Always restart apps if base.apk gets updated." into qt-dev am: 1adea76f46 am: 972089ad30 -s ours am: 9cc48f64f0 -s ours am: 92bc1bf5eb -s ours 
am skip reason: skipped by user alexbuy

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

Change-Id: I47d942829b33c0c4ceba7c81a22d3ca5c11e3fbb
 2022-03-09 19:29:18 +00:00
TreeHugger Robot
92bc1bf5eb [automerger skipped] Merge "Always restart apps if base.apk gets updated." into qt-dev am: 1adea76f46 am: 972089ad30 -s ours am: 9cc48f64f0 -s ours 
am skip reason: skipped by user alexbuy

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

Change-Id: Ida01ae8138ab93aa2fad64c82ccd87ee1078b4ab
 2022-03-09 19:07:06 +00:00
TreeHugger Robot
7190fb7240 [automerger skipped] Merge "Always restart apps if base.apk gets updated." into rvc-dev am: fe30ac3f0a am: f8bc3f97ed -s ours 
am skip reason: skipped by user alexbuy

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

Change-Id: I924d77a8e07ad6e1da2328984c6e530ff1cd2ed3
 2022-03-09 18:44:11 +00:00
TreeHugger Robot
9cc48f64f0 [automerger skipped] Merge "Always restart apps if base.apk gets updated." into qt-dev am: 1adea76f46 am: 972089ad30 -s ours 
am skip reason: skipped by user alexbuy

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

Change-Id: I164a1737563abdfe143ef461d94362c1e43981bd
 2022-03-09 18:44:10 +00:00
TreeHugger Robot
c42ea331e0 Merge "Verify caller before auto granting slice permission" into qt-dev am: 3d226b76c1 am: b4fb5feffc am: 12448ab311 am: c759e6a989 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17089346

Change-Id: I3ae3355c7984d6b4b89463059cf1bd6159b963bb
 2022-03-09 07:21:39 +00:00
TreeHugger Robot
f8bc3f97ed Merge "Always restart apps if base.apk gets updated." into rvc-dev am: fe30ac3f0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17112304

Change-Id: I4cca0da70a5f0bc9bd9d60b863d6b4bcbd601ab2
 2022-03-09 06:56:58 +00:00
TreeHugger Robot
c759e6a989 Merge "Verify caller before auto granting slice permission" into qt-dev am: 3d226b76c1 am: b4fb5feffc am: 12448ab311 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17089346

Change-Id: I3ae47b70497d8dd3e12cd69ac2e1ec1cf63cb423
 2022-03-09 06:56:06 +00:00
TreeHugger Robot
fe30ac3f0a Merge "Always restart apps if base.apk gets updated." into rvc-dev 2022-03-09 06:43:41 +00:00
TreeHugger Robot
12448ab311 Merge "Verify caller before auto granting slice permission" into qt-dev am: 3d226b76c1 am: b4fb5feffc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17089346

Change-Id: I5681e619f79ff7884af2f79feaacd2e1794913a4
 2022-03-09 06:33:56 +00:00
TreeHugger Robot
972089ad30 Merge "Always restart apps if base.apk gets updated." into qt-dev am: 1adea76f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17111536

Change-Id: Ia35c96940c76b46ff5754f493e4f0c64df211483
 2022-03-09 06:21:41 +00:00
TreeHugger Robot
1adea76f46 Merge "Always restart apps if base.apk gets updated." into qt-dev 2022-03-09 06:09:58 +00:00
TreeHugger Robot
b4fb5feffc Merge "Verify caller before auto granting slice permission" into qt-dev am: 3d226b76c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17089346

Change-Id: I20932910644a9d4ca4b3a46c4e4b9f96d504adf6
 2022-03-09 06:08:50 +00:00
TreeHugger Robot
3d226b76c1 Merge "Verify caller before auto granting slice permission" into qt-dev 2022-03-09 05:41:31 +00:00
Alex Buynytskyy
52a4337a47 Always restart apps if base.apk gets updated. 
Bug: 219044664
Fixes: 219044664
Test: atest PackageManagerShellCommandTest
Change-Id: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
Merged-In: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
 2022-03-09 00:51:17 +00:00
Alex Buynytskyy
a5dd59db6d Always restart apps if base.apk gets updated. 
Bug: 219044664
Fixes: 219044664
Test: atest PackageManagerShellCommandTest
Change-Id: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
Merged-In: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
 2022-03-09 00:48:11 +00:00
TreeHugger Robot
2964f715c8 [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into rvc-dev am: 508167f720 -s ours am: cf13bbbc3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9ef06be19516572303b962b988858223a98b9d1
 2022-03-08 20:09:07 +00:00
Matt Pietal
4f48adfd75 [automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 21e48cf26b -s ours am: 77d8bbe5c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee7206e26434019b42da819d9bb0530222873dd2
 2022-03-08 20:08:48 +00:00
TreeHugger Robot
cf13bbbc3d [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into rvc-dev am: 508167f720 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I0ea46e642b9aa0b93bab454ce0f39df192bcb194
 2022-03-08 19:44:40 +00:00
Matt Pietal
77d8bbe5c5 [automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 21e48cf26b -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: Id9c3e2bc4cd1aad42e5f021510008a8f233c869a
 2022-03-08 19:44:26 +00:00
TreeHugger Robot
508167f720 Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into rvc-dev 2022-03-08 19:20:39 +00:00
TreeHugger Robot
cc38b3f619 Merge "[Ongoing Call] Don't call #getIntent to avoid a security vulnerability." into sc-dev 2022-03-08 18:57:57 +00:00
TreeHugger Robot
e4f01f7717 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-qpr-dev am: d4ef6e49a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2efffa43249ca8f5d5b69b05b642d22b0d52ef07
 2022-03-08 04:30:50 +00:00
Jeff Chang
f8857833e9 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 8b7e0c52e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic31176d74b0873b2401ea5656907889f9c9aab2c
 2022-03-08 04:30:30 +00:00
TreeHugger Robot
d4ef6e49a1 Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-qpr-dev 2022-03-08 04:06:49 +00:00
Caitlin Cassidy
b029b005d8 [Ongoing Call] Don't call #getIntent to avoid a security vulnerability. 
Fixes: 212467440
Test: atest OngoingCallControllerTest
Test: verified clicking the chip can still open valid activities.
Change-Id: I7707d01be37582461227edcecf5d559f2019c8a5
Merged-In: I7707d01be37582461227edcecf5d559f2019c8a5
(cherry picked from commit 08d94cbabb)
 2022-03-07 16:26:49 +00:00
Vincent Wang
7aba92e561 Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev 2022-03-07 11:50:55 +00:00
Jeff Chang
7221a25a03 [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity 
Any malicious application could hijack tasks by
android:relinquishTaskIdentity. This vulnerability can perform UI
spoofing or spy on user’s activities.

This CL limit the usage which only allow system and same app to apply
relinquishTaskIdentity. Based on the condition of updateIdentity from
Task#setIntent, update the intent with the parent's task together to
align with original code logic. Moreover, we shouldn't save launch
params for such tasks with null realActivity.

Bug: 185810717
Bug: 218243793
Test: atest IntentTests
      atest ActivityStarterTests
      atest TaskRecordTests
      atest testSplitscreenPortraitAppOrientationRequests
Change-Id: I42c671e66c39c82be1dcef1f374d56d4593f9f57
 2022-03-07 10:40:03 +00:00
TreeHugger Robot
fb7b70bdb4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours am: f36ed930cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id84deef83bd9641d9a366ed7fff49c545fc1b53e
 2022-03-07 09:46:25 +00:00
Jeff Chang
5c5b837442 [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a7362dff152e108c8d9f31b09e45525e45d96a4
 2022-03-07 09:46:09 +00:00
TreeHugger Robot
748ed4c7cb [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I250a4502e845b7219e0f33d7db24a95dda86ec00
 2022-03-07 09:45:37 +00:00
Jeff Chang
506c82612a [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc014 -s ours am: fc2e453887 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4eaba4ff7bd41d4c879d686892bc1fd76902f0a0
 2022-03-07 09:45:17 +00:00
TreeHugger Robot
f36ed930cd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80af8 am: c0d12c6b4a -s ours am: 9d5c0bf1b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50789965770642edef8730349b6e386b9587963c
 2022-03-07 09:25:46 +00:00
Jeff Chang
92e566d24f [automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e41f8de655e5de2beae89e08a58cb27c0039358
 2022-03-07 09:25:36 +00:00