summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-14Merge "Add end-to-end tests for @EnforcePermission" am: cdac5de216temp_273316506_tm-qpr2Thiébaud Weksteen
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2486756 Change-Id: I838015c65392febe5044cfac37e3a5f133b7203f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Add end-to-end tests for @EnforcePermission"Thiébaud Weksteen
2023-03-14Add end-to-end tests for @EnforcePermissionThiébaud Weksteen
The current integration tests under system/tools/aidl mock PermissionEnforcer and as such do not exercise the complete permission checks. Set up a service app (service-app) which relies on the annotation to protect its methods. A nested service is included to test that permission checks propagate to same-process calls. Bug: 269721152 Test: atest EnforcePermissionTests (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b404eee1c159bd4bc2d5c0500a1996cfbceb2799) Merged-In: I2d14f10333eabc385007216038dc487f83a4d21a Change-Id: I446406aa0e7ce6de5745d870599d37706cc52cf9
2023-03-14Merge "Fix deadlock in RebootEscrowManager" am: 13b99b7549Veena Arvind
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2469529 Change-Id: Idd320aad5a0b62df21e01432514b9bf1d076a6fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Fix deadlock in RebootEscrowManager"Veena Arvind
2023-03-14Merge "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to ↵Jack Yu
TelephonyManager"" am: 5f43355071 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2484178 Change-Id: I0da461b167476647c2c060c8bfad5ea9e990f297 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager" ↵Sebastian Pickl
am: 69d49298ee Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2484178 Change-Id: I249a9b3281cd7f74d1dd2e9e3aabc38e0c27bd36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to ↵Jack Yu
TelephonyManager""
2023-03-13Merge "CAS : Add missing converstion of message data" am: 0201f12911Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2483118 Change-Id: Ic27f70a081540da404fc656979498e6c084766da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "CAS : Add missing converstion of message data"Treehugger Robot
2023-03-13Merge "Fix javadoc error for MediaFormat.KEY_BITRATE_MODE" am: b7c18f231aDichen Zhang
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2480317 Change-Id: Ie2c5dcc792aa21e402e7632ba1c6f7390a568003 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "Fix javadoc error for MediaFormat.KEY_BITRATE_MODE"Dichen Zhang
2023-03-13Merge "Fix: Firewall: NMS inverts default rule behavior" am: 627b64593dSudheer Shanka
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2439712 Change-Id: I65ccc01b795fa53a51d211fabd2ea4063b0807d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "Improve Transition GC initiation by improving the Frameworks ↵Wessam Hassanein
triggering signal" am: 9c6a8eb60a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2477849 Change-Id: I9b7595bde763a526ebb686045871a01dddcd4274 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "Fix: Firewall: NMS inverts default rule behavior"Sudheer Shanka
2023-03-13Merge "Improve Transition GC initiation by improving the Frameworks ↵Wessam Hassanein
triggering signal"
2023-03-13Merge "Add jorgegil@ to window decor owners" am: 07f7ff98dfGarfield Tan
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2480737 Change-Id: I2aef5e915a5ab84dfa3155b8ed3cd7f136e73a4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "Removed IWLAN legacy mode support" am: 71e4fc7a4cJack Yu
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2370228 Change-Id: I013f3b45cf307dbb0827f246af4ad9a96ed3d4a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "Add jorgegil@ to window decor owners"Garfield Tan
2023-03-13[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager"Sebastian Pickl
Revert submission 2481148-getSimStateForSlotIndex Reason for revert: trying to find culprit for https://android-build.googleplex.com/builds/tests/view?testResultId=TR96728544297958511&legacy=&invocationId=I86700010138773900 Reverted changes: /q/submissionid:2481148-getSimStateForSlotIndex Change-Id: I8659ba8a581f9fdaa918dc39866f523999338ca8
2023-03-13Merge "Removed IWLAN legacy mode support"Jack Yu
2023-03-13Merge "Treat process group creation failure due to a dead process as ↵Treehugger Robot
non-fatal" am: 03dfa27d40 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2467472 Change-Id: Ic98c584d01d8dbb28d5bb48214bb7e61217fcf85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "Fix typo in android.telecom.Connection." am: c8b5936feaMateus Azis
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481490 Change-Id: I45183ef74211a163a44648d260b5973a444e7a5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "Treat process group creation failure due to a dead process as non-fatal"Treehugger Robot
2023-03-13Merge "Fix typo in android.telecom.Connection."Mateus Azis
2023-03-13Fix: Firewall: NMS inverts default rule behaviorTommy Webb
When setting a chain's firewall rules in NetworkManagementService, do not submit supplied UIDs to ConnectivityManager#replaceFirewallChain directly, as this does not consider what the actual rules are for those UIDs. Instead, supply the keys from the rules chain, which deletes default rules when it is updated via updateFirewallUidRuleLocked. For example, if a given UID's rule is the default rule, and it is part of the restricted chain, then the UID should be blocked, because the restricted chain is an allowlist. Prior to this change, the rules for UIDs are ignored when calling replaceFirewallChain, so the UID's mere presence among the supplied UIDs causes it to be unexpectedly added to the restricted mode allowlist. Test: CtsHostsideNetworkTests Change-Id: I0a71ad376bcfda05cea151144dfab9bec8e8b749
2023-03-13Merge "[WMS][Bugfix] Catch exception when dump local window." am: 9b40b1ff61Riddle Hsu
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2450064 Change-Id: I97a865185ec7ff6ab025c6a2c26766acaa3bcb12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "[WMS][Bugfix] Catch exception when dump local window."Riddle Hsu
2023-03-13[WMS][Bugfix] Catch exception when dump local window.qinyige1
The local window may update its view on its ui thread. Add synchronization in case the window is removing when dumping. Also catch exception for the race condition inside the view. Bug: 270280397 Test: Manual Change-Id: Ic0268ffff9a6a087b9e18340783da0676bf9caee
2023-03-13CAS : Add missing converstion of message dataShraddha Basantwani
Test: atest MediaCasTest#testClearKeyApis Bug: 269691993 Change-Id: Id04345a5aeebeb140b2f6bfe3166dc1ffb3558e6
2023-03-13Merge "Parcelable: mention that the CREATOR field must be public." am: ↵Treehugger Robot
a5241e0f80 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481435 Change-Id: I8824058a833c83e87c619fb56aae41fd5c973e78 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "Parcelable: mention that the CREATOR field must be public."Treehugger Robot
2023-03-12Merge "Update system APIs based on feedback." am: 1ae5b8e863Jeff Sharkey
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481488 Change-Id: I86eac856a57e9bb8df7d764bd9fa98135d435a6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-12Merge "Update system APIs based on feedback."Jeff Sharkey
2023-03-11Removed IWLAN legacy mode supportJack Yu
Fix: 241716913 Test: Manual Merged-In: Ie3a5bbd57da3b80956d2178c0cedebf33502a8b1 Change-Id: Ie3a5bbd57da3b80956d2178c0cedebf33502a8b1
2023-03-12Merge "Added remove subscription support" am: cf6bf85d60Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2483215 Change-Id: Ib4000d0419b0f51ccf7334de19dc29a2c82194ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-12Merge "Added remove subscription support"Treehugger Robot
2023-03-11Added remove subscription supportJack Yu
Bug: 239607619 Test: atest SubscriptionManagerServiceTest atest SubscriptionDatabaseManagerTest Merged-In: I13b6940e34945aeb77d4367724cd10ed6a3fc005 Change-Id: I13b6940e34945aeb77d4367724cd10ed6a3fc005
2023-03-11Merge "Limit values of data position in fuzzer" am: a6d21afb18Pawan Wagh
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2475021 Change-Id: Ice8f5439599fef60972b06600282a0f94e79ece6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-11Merge "Limit values of data position in fuzzer"Pawan Wagh
2023-03-11Merge changes from topics "15_apis", "set_get_properties" am: a11a12ae1dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481779 Change-Id: Icf6c2839ecbbd39718e188b424849de4bb5d97ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-11Added 15 APIs support am: 00dc8a15e9Jack Yu
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481778 Change-Id: Ibc4cff50e4e986b375b7807903a364957766e0f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10Fix deadlock in RebootEscrowManagerVeena Arvind
Problem: RebootEscrowManager tries to take ActivityManager lock while Synthetic Password Manager lock is already held. Solution: RebootEscrowManager offload call to ActivityManager to a handler thread. Test: atest com.android.server.locksettings and manual testing of RoR flow on physical device Bug: 270006672 Change-Id: Icbc7127369cfe2eb0a6e0e554134f19b801b0274
2023-03-10Merge changes from topics "15_apis", "set_get_properties"Treehugger Robot
* changes: Support get/set subscription property Added 15 APIs support
2023-03-10Merge "TEST_MAPPING: Add package manager service host tests to ↵Betty Zhou
kernel-presubmit" am: 0b476612d2 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2328181 Change-Id: I5f165acce52bed5f9a10b66720e62071f17c9293 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10Support get/set subscription propertyJack Yu
1. Support getSubscriptionProperty. 2. Added group update support. Setting some fields in the subscription will automatically apply to the other subscriptions in the group. Bug: 239607619 Test: atest SubscriptionManagerServiceTest atest SubscriptionDatabaseManagerTest Merged-In: I6f617aad7e2776e320eaf157b3a71446143ef401 Change-Id: I6f617aad7e2776e320eaf157b3a71446143ef401
2023-03-10Added 15 APIs supportJack Yu
Added setDisplayNumber, setOpportunistic, createSubscriptionGroup setPreferredDataSubscriptionId, getPreferredDataSubscriptionId getOpportunisticSubscriptions, addSubscriptionsIntoGroup canDisablePhysicalSubscription, setUiccApplicationsEnabled setDeviceToDeviceStatusSharing, setDeviceToDeviceStatusSharingContacts getPhoneNumberFromFirstAvailableSource, setUsageSetting setSubscriptionUserHandle, getSubscriptionUserHandle Test: atest SubscriptionManagerServiceTest Bug: 239607619 Merged-In: I617e94d96ca29d277e0f217ebef5548b7aad1f80 Change-Id: I617e94d96ca29d277e0f217ebef5548b7aad1f80
2023-03-10Merge "TEST_MAPPING: Add package manager service host tests to kernel-presubmit"Betty Zhou
2023-03-10Merge "Migrate getSimStateForSlotIndex to TelephonyManager" am: 51c68aaa73Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481148 Change-Id: Ib78ee97e840c97793e1a2f4a88869e7dc03bc005 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10Merge "Migrate getSimStateForSlotIndex to TelephonyManager"Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 06:56:23 +0000