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

Commit f9ae30fa authored by Sorin Basca's avatar Sorin Basca Committed by Gerrit Code Review
Browse files

Merge "Fix errorprone 2.15.0 errors"

parents 67d1bacd 94943514

core/java/android/preference/GenericInflater.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -406,7 +406,7 @@ abstract class GenericInflater<T, P extends GenericInflater.Parent> { 
            InflateException ie = new InflateException(attrs

            InflateException ie = new InflateException(attrs

                    .getPositionDescription()

                    .getPositionDescription()

                    + ": Error inflating class "

                    + ": Error inflating class "

                    + constructor.getClass().getName());

                    + constructor.getDeclaringClass().getName());

            ie.initCause(e);

            ie.initCause(e);

            throw ie;

            throw ie;

        }

        }

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -8786,6 +8786,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
     * @param incrementalMetrics metrics for apps installed on Incremental.

     * @param incrementalMetrics metrics for apps installed on Incremental.

     * @param errorId a unique id to append to the dropbox headers.

     * @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,

    public void addErrorToDropBox(String eventType,

            ProcessRecord process, String processName, String activityShortComponentName,

            ProcessRecord process, String processName, String activityShortComponentName,

            String parentShortComponentName, ProcessRecord parentProcess,

            String parentShortComponentName, ProcessRecord parentProcess,