Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
761,915 Commits 3 Branches 0 Tags
c2e08706a05302d705fcbb9d4743043910b7afbf
Commit Graph

761915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Wang
c2e08706a0 Merge "Fix face unlock does not work for top app in split screen" into tm-dev am: 16ebd44e9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157285

Change-Id: If621998bf2e12fa67e3c5eec8e96da485351dea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 09:18:21 +00:00
Treehugger Robot
3937838831 Merge "PBAP: Do not set phonebook access to ACCESS_REJECTED automatically" am: 01447fa5e4 am: af69c79996 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2098810

Change-Id: I8d9b6d3430670a894f18c77e37e940917c1b25a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 09:11:29 +00:00
Vincent Wang
16ebd44e9f Merge "Fix face unlock does not work for top app in split screen" into tm-dev 2022-05-16 08:57:54 +00:00
Wei Sheng Shih
a738d0d85c Merge "Extend splash screen exception list to T" into tm-dev am: a92124a41e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185289

Change-Id: I794fd8718089b8720cbaf59fd05a6f33e2103f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:44:47 +00:00
Wei Sheng Shih
a92124a41e Merge "Extend splash screen exception list to T" into tm-dev 2022-05-16 08:26:53 +00:00
TreeHugger Robot
5097d083f3 Merge "PBAP: Do not set phonebook access to ACCESS_REJECTED automatically" into tm-dev am: 4cd19a7ece 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349816

Change-Id: If817d4f288d706160f65f9efcc22f5ea99e2046d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:22:25 +00:00
Treehugger Robot
af69c79996 Merge "PBAP: Do not set phonebook access to ACCESS_REJECTED automatically" am: 01447fa5e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2098810

Change-Id: I3ab9e0feacf561193d6da65f659eff3db8aa251c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:13:35 +00:00
TreeHugger Robot
4cd19a7ece Merge "PBAP: Do not set phonebook access to ACCESS_REJECTED automatically" into tm-dev 2022-05-16 07:52:10 +00:00
Treehugger Robot
01447fa5e4 Merge "PBAP: Do not set phonebook access to ACCESS_REJECTED automatically" 2022-05-16 07:40:23 +00:00
Manjeet Rulhania
61b1109137 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours am: 3972a5c0fc -s ours 
am skip reason: skipped by user mrulhania

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

Change-Id: If9594e28ba3cb3d431556338790758a371232b68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 05:54:29 +00:00
Vincent Wang
906623fb47 Fix face unlock does not work for top app in split screen 
ActivityManager#getTask() only returned focus activity if we set
argument as 1, enlarge the max size and check package name and
visibility of running task.

BUG: 228128130
Test: 1. Launch any applications that will show biometric prompt
      2. Enter slpit screen mode before biometric prompt showing
      3. Wait for biometric showing and check the biometric prompt
	 funtionality
Change-Id: Ib49a4dcf0061a0f8a9c53505eee4656a2571f2f7
 2022-05-16 13:36:46 +08:00
Manjeet Rulhania
3972a5c0fc [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours am: 8eee1b2826 -s ours 
am skip reason: skipped by user mrulhania

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

Change-Id: Icbd158a716929aace36992b6242f6219ce6f0d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 05:18:26 +00:00
Vadim Caen
ba3d92d8e6 Extend splash screen exception list to T 
Extend the support of the exception list for T and apps targeting S and
T.

Test: atest ActivityRecordTests
Test: com.android.server.wm.SplashScreenExceptionListTest
Bug: 231708538
Change-Id: I5412e81f70cbc9aac3861d13d85e199e949bedc7
 2022-05-16 12:19:16 +08:00
Manjeet Rulhania
8eee1b2826 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 am: f689ec94c6 -s ours am: e131598842 -s ours am: 473bb58e58 -s ours 
am skip reason: skipped by user mrulhania

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

Change-Id: I413b039bc4eacb8075fdafa9d67efad0c1159a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 04:04:51 +00:00
Chienyuan
e4a75aa8e8 PBAP: Do not set phonebook access to ACCESS_REJECTED automatically 
The value is saved in SharedPreferences. However, it will return ACCESS_UNKNOWN in several cases. We shouldn't set it as rejected automatically. We should ask user when PBAP connect.

Bug: 230712201
Test: manual
Change-Id: Ia3f373b9799cf02c47dc782688430fb234491f61
(cherry picked from commit 5bc5f10310)
 2022-05-16 11:40:47 +08:00
Chienyuan
5bc5f10310 PBAP: Do not set phonebook access to ACCESS_REJECTED automatically 
The value is saved in SharedPreferences. However, it will return ACCESS_UNKNOWN in several cases. We shouldn't set it as rejected automatically. We should ask user when PBAP connect.

Bug: 230712201
Test: manual
Change-Id: Ia3f373b9799cf02c47dc782688430fb234491f61
 2022-05-16 03:35:16 +00:00
Manjeet Rulhania
473bb58e58 [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: I43d0a123282ac4ddec1643d25a8def016c341096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 03:25:47 +00:00
Wei Sheng Shih
79b31eda84 Merge "Send client relaunch event to WMCore." into tm-dev am: a688a7499d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367863

Change-Id: I70298174734bc1a4439de0c3919c604261dff0a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 03:17:16 +00:00
Michael Groover
f407027f0e Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev am: d931f19fb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381775

Change-Id: Iad97767d24c82e1f3e0309e152c4a8c4db38a3c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 03:16:42 +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
Wei Sheng Shih
a688a7499d Merge "Send client relaunch event to WMCore." into tm-dev 2022-05-16 01:55:24 +00:00
Michael Groover
d931f19fb0 Merge "Use key rotation aware check when sharedUID signatures change on OTA" into tm-dev 2022-05-16 01:36:04 +00:00
Ling Ma
6be5b86947 Merge "Make registrationState consistent with RoamType in case of override" am: ecb5d530c2 am: aa886be6d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2098372

Change-Id: I777725fb3a6d52873176d42cfefae43cf39467fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 01:23:24 +00:00
Ling Ma
aa886be6d0 Merge "Make registrationState consistent with RoamType in case of override" am: ecb5d530c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2098372

Change-Id: I5eea47ee7b4c1bcd3537e825da7622fa6a7e2fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 00:49:19 +00:00
Ling Ma
ecb5d530c2 Merge "Make registrationState consistent with RoamType in case of override" 2022-05-15 23:56:31 +00:00
Yurii Zubrytskyi
bba4188a23 Merge "SELinux labels bug logging and workaround" into tm-dev am: a9cdc4a888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281657

Change-Id: Id83d81167d68c06561bf2d13e292cb84bc421535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-15 23:04:18 +00:00
Yurii Zubrytskyi
a9cdc4a888 Merge "SELinux labels bug logging and workaround" into tm-dev 2022-05-15 22:22:31 +00:00
Nikita Ioffe
0a13eb6be8 Merge "Populate activeApexChanged in ActiveApexInfo" into tm-dev am: 5157101aca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331942

Change-Id: I388c045215feeca7b9bf1003f6f814a20dd00f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-15 21:48:51 +00:00
Nikita Ioffe
5157101aca Merge "Populate activeApexChanged in ActiveApexInfo" into tm-dev 2022-05-15 21:29:40 +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
Ling Ma
17b399056a Make registrationState consistent with RoamType in case of override 
Bug: 231357778
Test: manual + atest frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/NetworkRegistrationInfoTest.java
Merged-In: Ibf74839f688df587d1f791795924a8152c52e3dc
Change-Id: Ibf74839f688df587d1f791795924a8152c52e3dc
 2022-05-14 17:09:53 -07:00
Gavin Corkery
c7ac9faa36 Merge "Add DeviceConfig flag for enforcing receiver restrictions" into tm-dev am: c7c60d5ec1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356870

Change-Id: I2b4dcda405d8039a08a018b5113bc94f08ee4bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 21:25:30 +00:00
Gavin Corkery
c7c60d5ec1 Merge "Add DeviceConfig flag for enforcing receiver restrictions" into tm-dev 2022-05-14 20:24:03 +00:00
TreeHugger Robot
c5c2c5622e Merge "Camera: Update doc to describe tradeoff of DEFAULT timestamp base" into tm-dev am: b15596cb67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322257

Change-Id: I271ecc03501c729860550de22c5d20c267a36d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 19:33:44 +00:00
TreeHugger Robot
b15596cb67 Merge "Camera: Update doc to describe tradeoff of DEFAULT timestamp base" into tm-dev 2022-05-14 18:05:10 +00:00
Alex Buynytskyy
778ecd97cb Merge "Revert "Synchronize cache-is-ready boolean with cache readiness."" into tm-dev am: 2dabd1208c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18384536

Change-Id: I13538ad7a41106f0d44b6d04ce20363824daa554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 17:03:55 +00:00
Alex Buynytskyy
2dabd1208c Merge "Revert "Synchronize cache-is-ready boolean with cache readiness."" into tm-dev 2022-05-14 16:40:59 +00:00
Sergey Nikolaienkov
ed2bc5bb9d Merge "Introduce run-cleanup adb command for CTS test" into tm-dev am: ea8aa9e338 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17623973

Change-Id: Ic6cc70b781147c93fd106e7ecfe7d1935353e79e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 06:38:57 +00:00
Evan Chen
15f629e488 Merge "Remove role checker for non-selfManaged association" into tm-dev am: 5f7154db85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18384203

Change-Id: I3a8a67a52ffbad52d7cec93dcbff9b4bcd24cf72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 06:37:38 +00:00
Peter Kalauskas
fca845a148 Merge "Move call to hide IME until next frame" into tm-dev am: f505fefdd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18378271

Change-Id: I8fb52728cbf04bb4291c3033dcb73540e7218a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 06:36:39 +00:00
Manjeet Rulhania
9125536e3b [automerger skipped] [automerge] Fix duplicate permission privilege escalation 2p: 548edbb850 am: 7c95fa70de am: c18c6ee3e1 -s ours am: 9063daac9e -s ours 
am skip reason: Merged-In I9bc839836786a0876e67fd73c05f8944bb532249 with SHA-1 a19e17e32c is already in history

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

Change-Id: I79cc3625d237a98ded46f359ab12562b2b96f609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 06:36:12 +00:00
Sergey Nikolaienkov
ea8aa9e338 Merge "Introduce run-cleanup adb command for CTS test" into tm-dev 2022-05-14 06:10:22 +00:00
Evan Chen
5f7154db85 Merge "Remove role checker for non-selfManaged association" into tm-dev 2022-05-14 06:06:55 +00:00
Peter Kalauskas
f505fefdd6 Merge "Move call to hide IME until next frame" into tm-dev 2022-05-14 05:28:42 +00:00
Manjeet Rulhania
9063daac9e [automerger skipped] [automerge] Fix duplicate permission privilege escalation 2p: 548edbb850 am: 7c95fa70de am: c18c6ee3e1 -s ours 
am skip reason: Merged-In I9bc839836786a0876e67fd73c05f8944bb532249 with SHA-1 a19e17e32c is already in history

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

Change-Id: I13d174d5b1d47b83bd8ec166c09fae7abd89399c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 05:23:34 +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
TreeHugger Robot
0287aecd16 Merge "Add note about Sensor.TYPE_HEAD_TRACKER visibility" into tm-dev am: 616530de0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381200

Change-Id: I6d99b002db1c94e5e419b55b37bae73bd1e546fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 04:19:08 +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
TreeHugger Robot
616530de0e Merge "Add note about Sensor.TYPE_HEAD_TRACKER visibility" into tm-dev 2022-05-14 03:23:46 +00:00