Commit Graph

10836 Commits

Author SHA1 Message Date
Makoto Onuki
cdcc7859fd Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553 am: 6a68d207f0 am: ff8964d756
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I33024e49ddc185adc8aee70709b221e7e3d7c48d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 21:48:50 +00:00
Makoto Onuki
ff8964d756 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553 am: 6a68d207f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: Iaaf2fd27d215c4806d08bcdb12a03b459dcc7d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 21:23:22 +00:00
Makoto Onuki
6a68d207f0 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I1e1671c18a1573e819b76cbfb739d42cadc43aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 20:38:29 +00:00
Makoto Onuki
f15b3c2553 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I467f9641cf1376babab8328a06ec173a1c768fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 20:13:20 +00:00
Makoto Onuki
ea69ad5892 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I19750ed605001905eee78852893d1b18e8f274bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 19:55:08 +00:00
Makoto Onuki
822fbf618b Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: Ie919bc05747a1009507a29de429c3e8d043fed9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 19:20:45 +00:00
Makoto Onuki
7d1397a544 Only allow the system server to connect to sync adapters
Bug: 203229608
Test: Manual test with changing the check logic + debug log
Change-Id: If18009f61360564d02dcda9b1e5fa15685e3250f
(cherry picked from commit 58270527d1)
2022-06-01 20:35:21 +00:00
Manjeet Rulhania
e545a5dbbf Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18078651

Change-Id: I0e25a20970648244c2a72581478f5a09ac6c10b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I1910dca44104e35a57eba4acfa8188cd9b8626ac
Merged-In: I34120fff2ec2a158dfa55779d2afd4bbd49487ff
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
2022-05-16 19:49:21 +00:00
Manjeet Rulhania
31bd425bb6 Fix duplicate permission privilege escalation
Duplicate permissions definition with different group allows
privilege permission escalation to a different permission group.

Android studio and gradle plugin does not allow duplicate
permissions with different attributes, these tools only allow
if duplicate permissions are exact copies.

Also platform stores permissions in map at multiple places with
permission name as key. This suggests that we can disallow
duplicate permissions during package install/update.

Bug: 213323615
Test: manual
Change-Id: I6f44e740897305e7a0553c1cf6c3af37faf02a2e
Merged-In: I1910dca44104e35a57eba4acfa8188cd9b8626ac
Merged-In: I34120fff2ec2a158dfa55779d2afd4bbd49487ff
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
2022-05-16 02:06:24 +00:00
Manjeet Rulhania
f689ec94c6 Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083515

Change-Id: I64289b97a4277cde614e132aa19a971fd065db97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 17:35:31 +00:00
Manjeet Rulhania
c18c6ee3e1 [automerge] Fix duplicate permission privilege escalation 2p: 548edbb850 am: 7c95fa70de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18002380

Change-Id: Ica405833780024cdb9ebf984ffadc7894eace6ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 04:57:21 +00:00
Manjeet Rulhania
f9a9dc720c Fix duplicate permission privilege escalation
Duplicate permissions definition with different group allows
privilege permission escalation to a different permission group.

Android studio and gradle plugin does not allow duplicate
permissions with different attributes, these tools only allow
if duplicate permissions are exact copies.

Also platform stores permissions in map at multiple places with
permission name as key. This suggests that we can disallow
duplicate permissions during package install/update

Bug: 213323615
Test: AppSecurityTests
Change-Id: I1910dca44104e35a57eba4acfa8188cd9b8626ac
Merged-Id: I34120fff2ec2a158dfa55779d2afd4bbd49487ff
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
2022-05-14 03:55:04 +00:00
Manjeet Rulhania
7c95fa70de [automerge] Fix duplicate permission privilege escalation 2p: 548edbb850
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18002380

Bug: 213323615
Change-Id: I80db06143d4caa7b304894ac6ab2ac78fe15eb50
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
2022-05-13 21:57:02 +00:00
Manjeet Rulhania
548edbb850 Fix duplicate permission privilege escalation
Duplicate permissions definition with different group allows
privilege permission escalation to a different permission group.

Android studio and gradle plugin does not allow duplicate permissions
with different attributes, these tools only allow if duplicate
permissions are exact copies.

Also platform stores permissions in map at multiple places with permission
name as key. This suggests that we can disallow duplicate permissions
during package install/update

Bug: 213323615
Test: AppSecurityTests
Change-Id: I34120fff2ec2a158dfa55779d2afd4bbd49487ff
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
2022-05-13 21:56:34 +00:00
Presubmit Automerger Backend
e9fa10ef7a [automerge] Add excludedPackages parameter to broadcast 2p: c0ce69bc8d am: 884ef40058
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298311

Change-Id: I306cbbb71c88dd678cb297d9b1f0e980cbf3baa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:17:40 +00:00
Presubmit Automerger Backend
884ef40058 [automerge] Add excludedPackages parameter to broadcast 2p: c0ce69bc8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298311

Bug: 231635380
Bug: 210118427
Change-Id: I247933faa1b8cffa9756516f8d4853b3bce88653
Merged-In: I9a331f71c7052b294d4eada0f0f658dba989d881
2022-05-11 18:49:39 +00:00
Evan Severson
c0ce69bc8d Add excludedPackages parameter to broadcast
This parameter is useful for when a broadcast's intent is not targeting
specific package and it is not wanted to be delievered to a specific
one.

Test: Install two apps and create shell command argument to exlude
        packages, verify the correct packages can receive or get
	skipped. Verified with manifest and registered receivers.
Bug: 231635380
Bug: 210118427

Merged-In: I9a331f71c7052b294d4eada0f0f658dba989d881
Change-Id: I9a331f71c7052b294d4eada0f0f658dba989d881
2022-05-11 18:49:24 +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
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
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
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
Alex Buynytskyy
36b0e9e94c 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:47:24 +00:00
Michael Groover
115740d022 Merge "Revert "[DO NOT MERGE]Revert "Relax minimum signature scheme ver..."" into sc-v2-dev 2022-03-08 00:42:19 +00:00
Michael Groover
01c3d11b83 Revert "[DO NOT MERGE]Revert "Relax minimum signature scheme ver..."
Revert submission 16943318-presubmit-am-bc566b73c1674298b82a1153c03313a1

Reason for revert: This change breaks Better Bug.
Reverted Changes:
I32a2db8c7:[automerge] [DO NOT MERGE]Revert "Relax minimum si...
Ic53d2a361:[DO NOT MERGE]Revert "Relax minimum signature sche...

Bug: 223079119

Change-Id: I987bda9df92543f082700936c20aad06f992bdb0
2022-03-08 00:05:17 +00:00
Michael Groover
7026055322 Merge "[DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"" into sc-v2-dev 2022-03-05 00:02:48 +00:00
Michael Groover
3c36fd5fee [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"
This reverts commit b71e398935.

Revert reason: System apps should now have uncompressed dex / library
files in their APKs and should be able to satisfy the minimum V2
signature requirement when targeting API level 30+.

Fixes: 215046612
Test: Manually verified V1 only signed APK targeting API level 30
      on the system image failed to verify.
Change-Id: Ic53d2a3614e7dff4e4bfe18561d3dfbb665bbcb2
2022-02-22 18:17:11 +00:00
TreeHugger Robot
6e59db1952 Merge changes from topic "presubmit-am-0d13c95295c446889fc51032ba336d89" into sc-qpr1-dev am: 459761c7a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16778744

Change-Id: I930db864b7bb7e90996cb54e8e92a0422e5f3a2c
2022-02-09 18:10:54 +00:00
TreeHugger Robot
7d43598fdf Merge "Security fixes for PendingIntent related apis in LauncherApps" into sc-dev 2022-02-09 17:53:50 +00:00
Presubmit Automerger Backend
167749b462 [automerge] Security fixes for PendingIntent related apis in LauncherApps 2p: e41e04bb8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16778744

Bug: 209607104
Change-Id: Ie671aa785fd13e9389b2fec0a02318e7b5e05861
Merged-In: Id262b9a0de58d8834c85d925cf84bb44b8b99742
2022-02-09 03:12:23 +00:00
Pinyao Ting
e41e04bb8c Security fixes for PendingIntent related apis in LauncherApps
Allowing arbitrary activityOptions during the creation of PendingIntent
is a source of security vulnerability. This CL removes activityOptions
from the call-site.

Bug: 209607104
Test: manual
Change-Id: Id262b9a0de58d8834c85d925cf84bb44b8b99742
Merged-In: Id262b9a0de58d8834c85d925cf84bb44b8b99742
2022-02-09 03:12:10 +00:00
Ganesh Olekar
e38b4d59cf Merge "Validate pid can be trusted" into sc-dev am: 45312b8382 am: b14e524ffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958

Change-Id: I55bd837724c745078138cdbd8afc4213768dcdb1
2022-02-05 04:31:21 +00:00
Ganesh Olekar
b14e524ffd Merge "Validate pid can be trusted" into sc-dev am: 45312b8382
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958

Change-Id: I47da71211e30902d5f489f0dec109056b9503707
2022-02-05 04:14:22 +00:00
Ganesh Olekar
45312b8382 Merge "Validate pid can be trusted" into sc-dev 2022-02-05 03:56:26 +00:00
TreeHugger Robot
5150b2b56c Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e057 am: dd9121aaf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: I24513de281029178f2cdd9360ce87ed4d8eb210c
2022-01-27 18:47:46 +00:00
TreeHugger Robot
dd9121aaf6 Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e057
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: I23f8aac37dde7a9390d8ff478122b13eb99275a2
2022-01-27 18:29:12 +00:00
Jackal Guo
7172238add Move CtsContentTestCases to group presubmit-large
The test config takes longer than 900 seconds to run. Move it to a
dedicated group for running slow presubmit Test Mapping test.

Some more context is in the referenced bug, e.g, b/174495337
The group will work exactly the same as presubmit for now.

Bug: 174654670
Bug: 174495337
Fix: 215431363
Fix: 215549069
Test: treehugger
Change-Id: Id9769bbc625b42257af603d69098ae69c0fabb80
Merged-In: Id9769bbc625b42257af603d69098ae69c0fabb80
(cherry picked from commit ccc91c4fa9)
2022-01-24 23:45:31 +08:00
Ganesh Olekar
f29223746d Validate pid can be trusted
Bug: 200288596
Test: Manual
Test: atest android.security.cts.AttributionSourceTest#testPidCheck
Change-Id: I07f86ba220bedb1393f4d7ed23175e92d4576601
2022-01-13 00:30:12 +00:00
Naomi Musgrave
f5284f89be Merge "Introduce WindowManagerState field for sandboxing" into sc-v2-dev 2021-12-08 21:52:51 +00:00
Naomi Musgrave
5acb031f31 Introduce WindowManagerState field for sandboxing
New field indicates if ActivityRecord#providesMaxBounds has
calculated that sandboxing of max bounds to match app bounds
should be applied.

Test: manual
Bug: 193514437
Change-Id: I91587ce1e1ded7435038e2d1a7d038be57ff0f2f
2021-12-08 17:36:03 +00:00
tomnatan
303e76b80e Remove EnabledSince from OVERRIDE_MIN_ASPECT_RATIO_PORTRAIT_ONLY
We want this change to be enabled regardless of the app's target sdk
version.

Fix: 202842551
Test: N/A
Change-Id: Ia08afdeff276d132d6a5c619427017de3e1fba22
2021-12-06 16:42:36 +00:00
TreeHugger Robot
23039de620 Merge "Add feature flag for Android automotive OS templates host" into sc-v2-dev 2021-11-13 00:09:56 +00:00
tomnatan
36d7acbaaf Change OVERRIDE_MIN_ASPECT_RATIO_PORTRAIT_ONLY to be enabled since Sv2
Bug: 203647190
Test: N/A
Change-Id: Ie4c47d58c678082d37f8afb7cfde35e85e92ae77
2021-11-11 17:57:04 +00:00
Calvin Huang
17525b616d Add feature flag for Android automotive OS templates host
Bug: 204165454
Fix: 204165454
Test: Build gcar_emu_x86_64-userdebug then run \
android.app.cts.SystemFeaturesTest#testFeatureNamespaces

Change-Id: I77f817ae02e581e010cdd7eb3ee9e4d1c1bb8e37
2021-11-09 00:54:59 +00:00
tomnatan
5a676f6f15 Introduce an OVERRIDE_MIN_ASPECT_RATIO_PORTRAIT_ONLY change ID
This change ID will determine whether the OVERRIDE_MIN_ASPECT_RATIO override will be applied for portrait only activities (if enabled), and for all orientations (if disable).

Note that this change is enabled by default because it will need to be
enabled for most use cases.

Fix: 203647190
Test: atest WmTests:SizeCompatTests
Change-Id: I0fccbdc22ff387d33695fbf432cf96cd517de095
2021-11-08 16:47:49 +00:00
Chris Li
8e47bf7a9f Check app targetSdkVersion when check minWidth/Height for multi window
Bug: 197654537
Test: manually with app target S- with large min width/height
Change-Id: I2dd0902cb255cbe111ebab86dbf59be1a32e0cfc
2021-11-03 17:26:22 +08:00
Tom Natan
59f0a73009 Merge "Apply min aspect ratio override only for portrait only activities" into sc-v2-dev 2021-10-25 09:16:38 +00:00
tomnatan
4674792ad6 Apply min aspect ratio override only for portrait only activities
This only affects the min aspect ratio override, developers can still set min aspect ratio in the manifest regadless of whether the app is fixed to portrait. This change is needed since applying the override on activities that aren't fixed to portrait results in unintended behavior (see bug for more context).

Fix: 202842551
Test: atest WmTests:SizeCompatTests
Change-Id: Iebd8edf1fc43ee892aea78715c9b217950df5a3b
2021-10-20 22:58:13 +00:00
Makoto Onuki
f61a9d76e1 Fix javadoc on Context.startForegroundService
Bug: 203664384
Bug: 142968927
Test: treehugger
Change-Id: Ie3ba7d9fd5cda034f2ef8fab79630cfb15d6bb13
2021-10-20 21:45:06 +00:00
Varun Shah
991929b9fb Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev am: 912d89451a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853562

Change-Id: Id9539465fac375a4c2953aff19d6b3e5a880375a
2021-09-27 16:10:57 +00:00