Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,270 Commits 3 Branches 0 Tags
f8a9a24e26d0bc20f43d2f586cbac4ba1ae5db12
Commit Graph

661270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Presubmit Automerger Backend
f8a9a24e26 [automerge] Disallow privileged apps to bypass location restriction 2p: 807f4cfc80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18200760

Bug: 230861324
Bug: 231496105
Change-Id: Icf7d838571ecd02a866d0180b034fc1aeb2ea0ac
Merged-In: Ib34c0b56ef52f5ee2deceb84b02cd0ff73d8181d
 2022-05-19 22:30:39 +00:00
Evan Severson
807f4cfc80 Disallow privileged apps to bypass location restriction 
This bypass was originally allowed to let restricted users who can't use
location to pair bluetooth devices. This isn't needed anymore with the
bluetooth permissions.

Test: Set up restricted profile and pair bluetooth
      Verify com.android.phone gets rejected
Bug: 230861324
Bug: 231496105
Merged-In: Ib34c0b56ef52f5ee2deceb84b02cd0ff73d8181d
Change-Id: Ib34c0b56ef52f5ee2deceb84b02cd0ff73d8181d
 2022-05-19 22:30:17 +00:00
Hui Yu
4a107edf40 [automerger skipped] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into sc-dev am: f6e715f998 -s ours 
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391ce is already in history

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

Change-Id: I7206ddb442f20729f963ad9d472e67a33d74c856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 18:16:06 +00:00
Hui Yu
05688a7e23 Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-mainline-prod 
* changes:
  [automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391ce
  Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions.
 2022-05-18 18:04:05 +00:00
Hui Yu
f6e715f998 Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into sc-dev 2022-05-18 18:04:04 +00:00
TreeHugger Robot
3f0476bac0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-18 06:08:14 +00:00
TreeHugger Robot
534abbe2c2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-18 06:08:14 +00:00
TreeHugger Robot
6dcb367f52 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-18 06:08:14 +00:00
TreeHugger Robot
41260e7be4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-18 06:08:14 +00:00
TreeHugger Robot
f642349402 [automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3 am: a4bbe303ff -s ours am: 043d3bd55f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I078786774feafd16b7f983b241a3536a9ef08942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 04:38:48 +00:00
TreeHugger Robot
043d3bd55f [automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3 am: a4bbe303ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e9added2c94f78647023c0bbdfe1c4fb625d20c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 04:17:14 +00:00
TreeHugger Robot
a4bbe303ff [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356706

Change-Id: Ie110b8cfd17e441789f225ca8743d60a65365a92
Merged-In: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 00:33:45 +00:00
TreeHugger Robot
a70add46f3 Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev 2022-05-17 23:37:35 +00:00
Hui Yu
023509e487 Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 
This is to stop spoofed packageName to pretend to be allowListed
packageName so it can bypass the BG-FGS restriction. This applies to
both BG-FGS while-in-use restriction and BG-FGS-start restriction
since these two restrictions are related.

Bug: 216695100
Bug: 215003903
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java#testSpoofPackageName
Change-Id: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
Merged-In: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
BYPASS_INCLUSIVE_LANGUAGE_REASON=Legacy API
 2022-05-17 20:16:05 +00:00
Presubmit Automerger Backend
8657d8e59b [automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892

Bug: 216695100
Bug: 215003903
Change-Id: Icebad6fec11dc0abe4784a0f8f04177f9f346b64
Merged-In: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
 2022-05-17 20:15:42 +00:00
Hui Yu
eef20391ce Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 
This is to stop spoofed packageName to pretend to be allowListed
packageName so it can bypass the BG-FGS restriction. This applies to
both BG-FGS while-in-use restriction and BG-FGS-start restriction
since these two restrictions are related.

Bug: 216695100
Bug: 215003903
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java#testSpoofPackageName
Change-Id: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
Merged-In: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
 2022-05-17 20:15:29 +00:00
Bill Yi
5045c879e3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I692407b86f77dbd2d47663ecb3e56c439d5bb975
 2022-05-17 07:08:02 -07:00
Bill Yi
207eed7ac9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3c32672b9b0108d9905dc6e35273512c1684cf99
 2022-05-17 07:02:55 -07:00
Bill Yi
b7d89bf544 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I15ac9e136396a4dd5aeb3cb617e3e2414fb1f664
 2022-05-17 01:23:03 -07:00
Bill Yi
b90e218ba3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6919a041edfb746c1062674b70b54227476d2fa4
 2022-05-16 20:43:35 -07:00
Manjeet Rulhania
a3452e4286 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours am: 7aaba89b77 -s ours am: 89ed3dc229 -s ours 
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history

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

Change-Id: Ifff1ee84ac9bcd79100d7fbbafeeae48ce0a7436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 22:06:28 +00:00
Manjeet Rulhania
89ed3dc229 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours am: 7aaba89b77 -s ours 
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history

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

Change-Id: If4dfb752ed0e4d16c973439f8ae798c96a8bf2e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 21:31:23 +00:00
Manjeet Rulhania
7aaba89b77 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours 
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history

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

Change-Id: Icad731f56b018936687104b34dec1dc6cd2afda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 21:14:01 +00:00
Manjeet Rulhania
94c1765004 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours 
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history

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

Change-Id: I1889b690d52231c896cdc65983be4febdb6eb984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 20:53:20 +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
b22a6d7372 Merge "Fix duplicate permission privilege escalation" into qt-dev 2022-05-16 16:13:01 +00:00
Brian Julian
8daa702451 Add a permissions check to LocationManagerService. 
Prevents apps from reading location requests of other users without INTERACT_ACROSS_USERS permission.
Bug: 222473855
Test: Build

Change-Id: Id591cd39ed7813c649b44d4a3210f0b1fb79b40d
Merged-In: Id591cd39ed7813c649b44d4a3210f0b1fb79b40d
(cherry picked from commit 16560c0930)
 2022-05-16 15:06:37 +00:00
TreeHugger Robot
3d29ee649b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-16 07:38:01 +00:00
TreeHugger Robot
8d38d74907 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-16 07:38:01 +00:00
TreeHugger Robot
5d67b852f6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-16 07:38:01 +00:00
TreeHugger Robot
5e49a39833 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-16 07:38:01 +00:00
Manjeet Rulhania
a02ff66dd2 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours 
am skip reason: skipped by user mrulhania

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

Change-Id: Ief33e3ea9637f9a7848e57aa17f0e0b64e8d945f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 03:24:41 +00:00
Manjeet Rulhania
e131598842 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours 
am skip reason: skipped by user mrulhania

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

Change-Id: I286b000f30a05ae45d3951b05c6b6253238b46df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 02:18: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
3624b53d39 Merge "Fix duplicate permission privilege escalation" into rvc-dev 2022-05-15 16:45:22 +00:00
Bill Yi
6eaa0d213b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic1ecbf4c9d6e259eeeca6b91b9dbea5f8b5b8393
 2022-05-15 07:41:44 -07:00
Bill Yi
30c481f179 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib262630e6ab82c892261fbba6687c133e24f005a
 2022-05-15 00:44:42 -07:00
Bill Yi
482694b261 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I71e6e605fb41cd3f9ef797780adc19bac79ffc2b
 2022-05-15 00:40:42 -07:00
Bill Yi
dfe22c52f3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I44a2b3b4272431538b16539bf32a26bcd6c21bed
 2022-05-15 04:13:16 +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
a1d776d747 [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: Idbc4eb7207404ef143eeb4034f82325b50016ecc
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
 2022-05-13 21:57:04 +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
TreeHugger Robot
a530957fbc [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours am: b21a0dae0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46b99d568acc9bc020ad83e8121c8a1970f222ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:39:38 +00:00
Julia Reynolds
3b9944fc44 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6edaddeeda3218e51a155db6d90a86874743dee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:39:32 +00:00
TreeHugger Robot
b21a0dae0b [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a301679549c6559ff6bb8ff88065fb1b00e70c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:47:25 +00:00
Julia Reynolds
86064a5284 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a121f0e365dbee6611b76f18fba86d83664aa3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:47:07 +00:00
TreeHugger Robot
dc535c71d1 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f5ca43565f031130ea9b50017ff97fcd5a76301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:28:31 +00:00
Julia Reynolds
c822f7cd66 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0515b68504ea8211a27595c6f2e415df11e033d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:28:27 +00:00
TreeHugger Robot
d5d87d85f3 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1574511d068f56b8f83f3fda26057ae810fa05fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:01:07 +00:00