drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
813,935 Commits 1 Branch 0 Tags
Commit Graph

813935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jahinimtiaz
d8b1dda042 Include module dependencies under data 
Bug: 269138674
Test: Presubmit
Change-Id: Ibd1a18f6369396c4ae7b0263baab84f25c88ce06
 2023-03-30 21:22:34 +00:00
Prashanth Swaminathan
a59180a4ca Merge "Don't load compiler_rt if renderscript is disabled" 2023-03-15 21:54:26 +00:00
Dmitry Dementyev
75a97fdafb Merge "Update KeyguardManager owners." 2023-03-15 18:30:49 +00:00
Zi Wang
3cd394fa7d Merge "Remove unnecessary slice in combined_apis bp2build converter" 2023-03-15 16:38:54 +00:00
Mythri Alle
beefb571f6 Merge "Add clock-type to choose how timestamps are provided when profiling" 2023-03-15 10:02:00 +00:00
Sorin Basca
2e868b0030 Merge "Enable ds-docs-switched" 2023-03-15 07:48:16 +00:00
Treehugger Robot
a3458cb1a3 Merge "Change DancingScript to VF in fonts.xml" 2023-03-15 02:40:40 +00:00
Adam Bookatz
bd37127ef1 Merge "[Bugfix]check whitelisted packages exclude nonsystem app" 2023-03-15 01:43:55 +00:00
Thiébaud Weksteen
3ba9654196 Merge "Add presubmit TEST_MAPPING" 2023-03-15 01:42:16 +00:00
Prashanth Swaminathan
48b8152515 Don't load compiler_rt if renderscript is disabled 
Bug: 206676167
Test: Verified on aosp_cf_riscv64_slim target, which doesn't support RS,
that this library loads and fails by default, but skips load when the
config.disable_renderscript flag is enabled.

Change-Id: If3f516f5e38c39b35b26d102ebdc9a4816be60a3
 2023-03-14 18:19:46 -07:00
Thiébaud Weksteen
52e82d986e Add presubmit TEST_MAPPING 
Move to the 'device-tests' test suites to ensure the correct platform
certificate is used (see b/272181400).

Bug: 269721152
Bug: 272181400
Test: atest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1f635608637d76ad750e0a0675cb557c9fef3131)
Merged-In: Ibd84045b26efe2b46a33da9c220834e0f7c33fd8

Change-Id: I840d79e1132162b64f233979200309d53a39d36b
 2023-03-14 23:04:07 +00:00
Alexei Nicoara
3eb479c5e5 Merge "Updating RescueParty owners" 2023-03-14 22:33:57 +00:00
Xin Li
487d87cadc Merge "Merge Android 13 QPR2" 2023-03-14 21:40:43 +00:00
Sorin Basca
2fd4b16499 Enable ds-docs-switched 
Bug: 269717465
Test: m ds-docs-switched
Change-Id: I6ffe6bcb2cd3b465ac1d14ebb950b6a1e25c155c
 2023-03-14 20:51:48 +00:00
Linus Tufvesson
49c2bd7f78 Merge "Touch is not working" 2023-03-14 17:42:47 +00:00
Jack Yu
ee6492fc5b Merge "Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t..."" 2023-03-14 16:28:49 +00:00
Treehugger Robot
558b16bb25 Merge "Camera: Avoid holding locks during extension initialization" 2023-03-14 16:28:27 +00:00
Ray Essick
7ca9c3a6c8 Merge "ExifInterface: Use FileDescriptors whenever we can." 2023-03-14 15:29:01 +00:00
Alexei Nicoara
dbe364417f Updating RescueParty owners 
Change-Id: I1f2952116f671a8976ddd34a3191c510ac7f6e5b
 2023-03-14 15:17:03 +00:00
Ryan Savitski
244f318005 Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t..." 
Revert submission 2484175-revert-2481148-getSimStateForSlotIndex-UWFWFIPUUM

Reason for revert: reverting the revert as it caused build failures in downstream branches. Exact causes still TBD, see b/273394101.

Reverted changes: /q/submissionid:2484175-revert-2481148-getSimStateForSlotIndex-UWFWFIPUUM

Bug: 273394101
Change-Id: I9a40e3b7bafca0ee4f94576170cdcaf867d37cee
 2023-03-14 14:23:52 +00:00
Adrian Roos
447f3f2f22 Merge "WindowProcessController: Fix potential memory leak" 2023-03-14 13:34:54 +00:00
Wen Zhang
23db4a6835 [Bugfix]check whitelisted packages exclude nonsystem app 
avoid set uninstalled for nonsystem app when first boot

Bug:273457409
Change-Id: I77d19122de67869340decaf979b8f08f77070dd0
Test: Build
 2023-03-14 13:34:45 +00:00
Martijn Coenen
e69a12f356 ExifInterface: Use FileDescriptors whenever we can. 
This avoids a complex cyclic dependency between MediaProvider,
mediacodec and media.extractor.

Bug: 199822700
Bug: 260950919
Test: manual
Change-Id: I8863c539c7bded77fef24dfcedf28bdc59568940
 2023-03-14 11:36:07 +00:00
Eran Messeri
d37d9aadbf Merge "Keystore: Attestation fix for AOSP and GSI builds" 2023-03-14 11:27:20 +00:00
Adrian Roos
884e68eefb WindowProcessController: Fix potential memory leak 
Fixes an issue where the WindowProcessController may leak after process
death due to still having listeners registered.

Now unregisters all listeners when the process record gets removed.

Fixes: 273149525
Test: atest WindowProcessControllerTests WindowProcessControllerMapTests
Change-Id: I44323f280ed7aa641ab41c4e62a354a4525a4268
 2023-03-14 11:12:16 +00:00
Almaz Mingaleev
2f18344d98 Merge "Do not preload java.util.ImmutableCollections." 2023-03-14 10:12:31 +00:00
Hansen Kurli
519dbb2d81 Merge "Backup NETWORK_AVOID_BAD_WIFI setting." 2023-03-14 09:04:05 +00:00
Xin Li
24e88de38b Merge Android 13 QPR2 
Bug: 273316506
Merged-In: I90551b705381bee71df837b05bb0f3ff7ea98e54
Change-Id: I19a38ab2fb465a6a9ea5597e23ba73a8100839a5
 2023-03-13 23:11:05 -07:00
Thiébaud Weksteen
be72f04d26 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2023-03-14 05:35:00 +00:00
Thiébaud Weksteen
0b79c1e4a8 Merge "Add end-to-end tests for @EnforcePermission" am: cdac5de216 
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-14 04:28:25 +00:00
Thiébaud Weksteen
2743ae3749 [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  tests/EnforcePermission/service-app/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:92d8fc09b565214bf44eaf4b1bdb2d7c3bd9455d)
Merged-In: I276cd2c4c2fb077165f21442230f30e2d8adbe76

Change-Id: I07021e0c1adade9d00a08ca2db71007413a8801b
 2023-03-14 03:35:12 +00:00
Thiébaud Weksteen
cdac5de216 Merge "Add end-to-end tests for @EnforcePermission" 2023-03-14 03:30:05 +00:00
Thiébaud Weksteen
5407d0e888 Add end-to-end tests for @EnforcePermission 
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-14 02:13:31 +00:00
Veena Arvind
ebe1328c7a Merge "Fix deadlock in RebootEscrowManager" am: 13b99b7549 
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-14 01:56:27 +00:00
Veena Arvind
13b99b7549 Merge "Fix deadlock in RebootEscrowManager" 2023-03-14 01:21:52 +00:00
Jack Yu
e4157c3a4d Merge "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to 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 00:46:26 +00:00
Sebastian Pickl
7232772fdb [DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager" 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-14 00:45:58 +00:00
Jack Yu
5f43355071 Merge "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager"" 2023-03-13 23:58:33 +00:00
Treehugger Robot
70182fc006 Merge "CAS : Add missing converstion of message data" am: 0201f12911 
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-13 23:13:46 +00:00
Treehugger Robot
0201f12911 Merge "CAS : Add missing converstion of message data" 2023-03-13 23:05:56 +00:00
Dichen Zhang
a31af1d435 Merge "Fix javadoc error for MediaFormat.KEY_BITRATE_MODE" am: b7c18f231a 
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-13 22:58:20 +00:00
Dichen Zhang
b7c18f231a Merge "Fix javadoc error for MediaFormat.KEY_BITRATE_MODE" 2023-03-13 22:29:26 +00:00
Emilian Peev
6231472fb1 Camera: Avoid holding locks during extension initialization 
Holding the interface lock while initializing the extension
is not really necessary and can potentially result in a deadlock
in case of failure where callbacks try to close the camera capture
session in the handler thread, and another thread tries to close
the camera device acquiring the interface lock there:
Thread1:
 CameraDeviceImpl.close()
    acquire the device interface lock
    release advanced extension
        try to acquire the extension characteristics lock

Thread2:
 InitializationSessionHandler.onFailure()
    while holding the extension characteristics lock
    mCaptureSession.close()
        try to acquire the device interface lock

Additionally re-use the device interface lock for the extension session
synchronization. There is no real need to use a separate lock which
complicates the lock acquire order.

Bug: 270276341
Test: atest -c -d
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java

Change-Id: Ice808c8d5538e3adb3220d7ea51dea4b14cc2f44
 2023-03-13 15:04:16 -07:00
Sudheer Shanka
93da655f63 Merge "Fix: Firewall: NMS inverts default rule behavior" am: 627b64593d 
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-13 20:03:27 +00:00
Wessam Hassanein
832afca2df Merge "Improve Transition GC initiation by improving the Frameworks 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-13 20:02:10 +00:00
Almaz Mingaleev
185be70920 Do not preload java.util.ImmutableCollections. 
It has static int field SALT which is responsible for randomization
of iterator order.

Bug: n/a
Test: device boots
Change-Id: I3f1f4b4d56f37495914be1967cf83bd138354e2f
Merged-In: I3f1f4b4d56f37495914be1967cf83bd138354e2f
 2023-03-13 19:42:18 +00:00
Sudheer Shanka
627b64593d Merge "Fix: Firewall: NMS inverts default rule behavior" 2023-03-13 19:40:48 +00:00
Wessam Hassanein
9c6a8eb60a Merge "Improve Transition GC initiation by improving the Frameworks triggering signal" 2023-03-13 19:01:01 +00:00
Garfield Tan
b009140866 Merge "Add jorgegil@ to window decor owners" am: 07f7ff98df 
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-13 18:51:10 +00:00
Jack Yu
ad92e547cd Merge "Removed IWLAN legacy mode support" am: 71e4fc7a4c 
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-13 18:49:37 +00:00