diff options
| author | 2022-09-22 14:32:50 +0000 | |
|---|---|---|
| committer | 2022-09-22 14:32:50 +0000 | |
| commit | dd8e8b2bfd93192e26a9bbbaefd2b0f192794ebf (patch) | |
| tree | 4f0e250925bae3d68209917ed012a1d61e11f1db | |
| parent | e302eeec127273d7664a0ed50699321f827406b1 (diff) | |
| parent | e224114968c7cc359e9f611994aeb0a59ecfb559 (diff) | |
Merge "Fix errorprone 2.15.0 errors" am: f9ae30fa6f am: 211af41853 am: e224114968
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220922
Change-Id: Ia370f421a1b9336cd0a56007630fa5938206eb38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/preference/GenericInflater.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/preference/GenericInflater.java b/core/java/android/preference/GenericInflater.java index 7edc987ee0c1..fe53d4eeff64 100644 --- a/core/java/android/preference/GenericInflater.java +++ b/core/java/android/preference/GenericInflater.java @@ -406,7 +406,7 @@ abstract class GenericInflater<T, P extends GenericInflater.Parent> { InflateException ie = new InflateException(attrs .getPositionDescription() + ": Error inflating class " - + constructor.getClass().getName()); + + constructor.getDeclaringClass().getName()); ie.initCause(e); throw ie; } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 91d813803ac4..da914716bf19 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8786,6 +8786,7 @@ public class ActivityManagerService extends IActivityManager.Stub * @param incrementalMetrics metrics for apps installed on Incremental. * @param errorId a unique id to append to the dropbox headers. */ + @SuppressWarnings("DoNotCall") // Ignore warning for synchronous to call to worker.run() public void addErrorToDropBox(String eventType, ProcessRecord process, String processName, String activityShortComponentName, String parentShortComponentName, ProcessRecord parentProcess, |