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

Commit 38a410f1 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 686d9ff5: merge from open-source master 

Merge commit '686d9ff5' into kraken

* commit '686d9ff5':
  Use isLocationProviderEnabled to test for enabled providers
  Added WEB_URL_PATTERN for Montenegro ".me"
  long modifier was on the wrong argument.
parents 4000e06e 686d9ff5

tools/aidl/aidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ test_document(document_item_type* d) 
            printf("parcelable %s %s;\n", b->package, b->name.data);

        }

        else {

            printf("UNKNOWN d=0x%08x d->item_type=%ld\n", (long)d, d->item_type);

            printf("UNKNOWN d=0x%08lx d->item_type=%d\n", (long)d, d->item_type);

        }

        d = d->next;

    }