Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3fbe9ce authored by Sorin Basca's avatar Sorin Basca Committed by Automerger Merge Worker
Browse files

Merge "Fix errorprone 2.15.0 errors" am: f9ae30fa am: 211af418 am:... 

Merge "Fix errorprone 2.15.0 errors" am: f9ae30fa am: 211af418 am: e2241149 am: dd8e8b2b am: 8180cfd0

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



Change-Id: I198be85ef2ec926c9e1e3bd31fb66fbf3dc68ad0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80e44b82 8180cfd0

core/java/android/preference/GenericInflater.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -8927,6 +8927,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,