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

Commit 1992cdb4 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "oct16c" 

* changes:
  Apply fixes for EfficientStrings.
  Apply fixes for EfficientStrings.
  Apply fixes for EfficientStringsChecker.
  Apply fixes for EfficientCollections.
  Trivial refactor for consistent naming.
  Expand formatSimple() to support widths.
  Refinement of EfficientStringsChecker.
parents ceabf520 c603ca2d

core/java/android/app/NotificationChannel.java

+1 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ public final class NotificationChannel implements Parcelable { 
    }



    private static String longArrayToString(long[] values) {

        StringBuffer sb = new StringBuffer();

        StringBuilder sb = new StringBuilder();

        if (values != null && values.length > 0) {

            for (int i = 0; i < values.length - 1; i++) {

                sb.append(values[i]).append(DELIMITER);

core/java/android/app/SystemServiceRegistry.java

+2 −2
Original line number Diff line number Diff line
@@ -1377,8 +1377,8 @@ public final class SystemServiceRegistry { 


    /** Throws {@link IllegalStateException} if not during a static initialization. */

    private static void ensureInitializing(String methodName) {

        Preconditions.checkState(sInitializing, "Internal error: " + methodName

                + " can only be called during class initialization.");

        Preconditions.checkState(sInitializing, "Internal error: %s"

                + " can only be called during class initialization.", methodName);

    }

    /**

     * Creates an array which is used to cache per-Context service instances.

core/java/android/content/ContentProviderOperation.java

+6 −6
Original line number Diff line number Diff line
@@ -533,21 +533,21 @@ public class ContentProviderOperation implements Parcelable { 
    @Override

    public String toString() {

        final StringBuilder sb = new StringBuilder("ContentProviderOperation(");

        sb.append("type=" + typeToString(mType) + " ");

        sb.append("type=").append(typeToString(mType)).append(' ');

        if (mUri != null) {

            sb.append("uri=" + mUri + " ");

            sb.append("uri=").append(mUri).append(' ');

        }

        if (mValues != null) {

            sb.append("values=" + mValues + " ");

            sb.append("values=").append(mValues).append(' ');

        }

        if (mSelection != null) {

            sb.append("selection=" + mSelection + " ");

            sb.append("selection=").append(mSelection).append(' ');

        }

        if (mSelectionArgs != null) {

            sb.append("selectionArgs=" + mSelectionArgs + " ");

            sb.append("selectionArgs=").append(mSelectionArgs).append(' ');

        }

        if (mExpectedCount != null) {

            sb.append("expectedCount=" + mExpectedCount + " ");

            sb.append("expectedCount=").append(mExpectedCount).append(' ');

        }

        if (mYieldAllowed) {

            sb.append("yieldAllowed ");

core/java/android/content/ContentProviderResult.java

+4 −4
Original line number Diff line number Diff line
@@ -143,16 +143,16 @@ public class ContentProviderResult implements Parcelable { 
    public String toString() {

        final StringBuilder sb = new StringBuilder("ContentProviderResult(");

        if (uri != null) {

            sb.append("uri=" + uri + " ");

            sb.append("uri=").append(uri).append(' ');

        }

        if (count != null) {

            sb.append("count=" + count + " ");

            sb.append("count=").append(count).append(' ');

        }

        if (extras != null) {

            sb.append("extras=" + extras + " ");

            sb.append("extras=").append(extras).append(' ');

        }

        if (exception != null) {

            sb.append("exception=" + exception + " ");

            sb.append("exception=").append(exception).append(' ');

        }

        sb.deleteCharAt(sb.length() - 1);

        sb.append(")");

core/java/android/content/Intent.java

+1 −0
Original line number Diff line number Diff line
@@ -7447,6 +7447,7 @@ public class Intent implements Parcelable, Cloneable { 


    /** @hide */

    @UnsupportedAppUsage

    @SuppressWarnings("AndroidFrameworkEfficientCollections")

    public static Intent parseCommandArgs(ShellCommand cmd, CommandOptionHandler optionHandler)

            throws URISyntaxException {

        Intent intent = new Intent();