-
- Downloads
Merge changes from topic "merge_8391262" into stage-aosp-master
* changes: Fixup OWNERS file merge conflicts. Merge Android 12 QPR3 ab/8391262
No related branches found
No related tags found
Showing
- apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java 4 additions, 2 deletions...ce/java/com/android/server/alarm/AlarmManagerService.java
- core/api/test-current.txt 2 additions, 0 deletionscore/api/test-current.txt
- core/java/android/app/Activity.java 4 additions, 1 deletioncore/java/android/app/Activity.java
- core/java/android/app/IActivityManager.aidl 1 addition, 1 deletioncore/java/android/app/IActivityManager.aidl
- core/java/android/app/IActivityTaskManager.aidl 1 addition, 1 deletioncore/java/android/app/IActivityTaskManager.aidl
- core/java/android/app/TEST_MAPPING 12 additions, 10 deletionscore/java/android/app/TEST_MAPPING
- core/java/android/app/admin/DevicePolicyManager.java 43 additions, 8 deletionscore/java/android/app/admin/DevicePolicyManager.java
- core/java/android/app/admin/IDevicePolicyManager.aidl 2 additions, 1 deletioncore/java/android/app/admin/IDevicePolicyManager.aidl
- core/java/android/content/AttributionSource.java 42 additions, 4 deletionscore/java/android/content/AttributionSource.java
- core/java/android/content/TEST_MAPPING 17 additions, 15 deletionscore/java/android/content/TEST_MAPPING
- core/java/android/content/om/TEST_MAPPING 3 additions, 1 deletioncore/java/android/content/om/TEST_MAPPING
- core/java/android/content/pm/IPackageInstallerSession.aidl 1 addition, 0 deletionscore/java/android/content/pm/IPackageInstallerSession.aidl
- core/java/android/content/pm/LauncherApps.java 6 additions, 4 deletionscore/java/android/content/pm/LauncherApps.java
- core/java/android/content/pm/PackageInstaller.java 12 additions, 0 deletionscore/java/android/content/pm/PackageInstaller.java
- core/java/android/content/pm/TEST_MAPPING 10 additions, 8 deletionscore/java/android/content/pm/TEST_MAPPING
- core/java/android/content/res/TEST_MAPPING 3 additions, 1 deletioncore/java/android/content/res/TEST_MAPPING
- core/java/android/debug/AdbManager.java 3 additions, 0 deletionscore/java/android/debug/AdbManager.java
- core/java/android/hardware/face/FaceManager.java 27 additions, 22 deletionscore/java/android/hardware/face/FaceManager.java
- core/java/android/hardware/face/IFaceService.aidl 5 additions, 4 deletionscore/java/android/hardware/face/IFaceService.aidl
- core/java/android/hardware/fingerprint/FingerprintManager.java 18 additions, 12 deletions...java/android/hardware/fingerprint/FingerprintManager.java
Loading
Please register or sign in to comment