Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

14a57c14

Commit 14a57c14 authored 11 months ago by Treehugger Robot Committed by Automerger Merge Worker 11 months ago

Downloads
- Plain Diff

Merge changes I0e61db91,Icb7ab995 into main am: 0d60b075 am: 73a91e92

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

Change-Id: I0b6248135f1aeec61054161f6c1ab132b85d038e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c0e6644b 73a91e92

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

packages/CrashRecovery/services/java/com/android/server/PackageWatchdog.java 3 additions, 3 deletions

...ery/services/java/com/android/server/PackageWatchdog.java
packages/CrashRecovery/services/java/com/android/server/RescueParty.java 2 additions, 2 deletions

...ecovery/services/java/com/android/server/RescueParty.java
packages/CrashRecovery/services/java/com/android/utils/ArrayUtils.java 0 additions, 115 deletions

...hRecovery/services/java/com/android/utils/ArrayUtils.java
packages/CrashRecovery/services/java/com/android/utils/BackgroundThread.java 0 additions, 103 deletions

...ery/services/java/com/android/utils/BackgroundThread.java
packages/CrashRecovery/services/java/com/android/utils/FileUtils.java 0 additions, 128 deletions

...shRecovery/services/java/com/android/utils/FileUtils.java
packages/CrashRecovery/services/java/com/android/utils/HandlerExecutor.java 0 additions, 46 deletions

...very/services/java/com/android/utils/HandlerExecutor.java
packages/CrashRecovery/services/java/com/android/utils/LongArrayQueue.java 0 additions, 188 deletions

...overy/services/java/com/android/utils/LongArrayQueue.java
packages/CrashRecovery/services/java/com/android/utils/XmlUtils.java 0 additions, 118 deletions

...ashRecovery/services/java/com/android/utils/XmlUtils.java
tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java 2 additions, 2 deletions

...eWatchdog/src/com/android/server/PackageWatchdogTest.java

with 7 additions and 705 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment