)]}' { "log": [ { "commit": "571c5a26f767f67118f34ca0d426aeeb4a287b2c", "tree": "c6019f3417f18d7b7c80342aae5f78cfd649ca80", "parents": [ "d693690aee3ee94878ab59ee86d8db8ce5bb3789", "1b4f316651096f0ef9301b4ffde4816a08a54ab5" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Apr 14 23:25:26 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 14 23:25:27 2015 +0000" }, "message": "Merge \"Fix UB in ResourceTable::stringToInt.\"" }, { "commit": "a18cee52d953196ce12550df2ac5a14fbf359802", "tree": "eeb5ce69df8d5b1ea15ad991fc6ed3d449802faf", "parents": [ "47c1cf4b35616059409a0674382c2318494e877b" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Apr 07 18:38:42 2015 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Apr 09 10:41:38 2015 -0700" }, "message": "Ensure alignment of Res_png_9patch.\n\nThis doesn\u0027t alter the alignment of the data within the struct, but\nenforces that this structure will be appropriately aligned when used.\n\nThe image_info struct has this struct preceded by a bool, which causes\nodd alignment for the members of this struct.\n\nChange-Id: Ia2ef5c81b2f961c0f61858a10a7821d82f600919\n" }, { "commit": "1b4f316651096f0ef9301b4ffde4816a08a54ab5", "tree": "f141604343f4114337483ed0fb30fe36f4750310", "parents": [ "47c1cf4b35616059409a0674382c2318494e877b" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Apr 07 18:43:15 2015 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Apr 08 14:12:21 2015 -0700" }, "message": "Fix UB in ResourceTable::stringToInt.\n\nWas here because UBsan found integer overflow in the parsing for hex\nnumbers, since hex numbers here are actually unsigned but assigned to\na signed integer.\n\nAlso fixes a number of missing error conditions.\n\nChange-Id: Iaea576daedfc6c75521cde02de3fe9dd0198a3b7\n" }, { "commit": "847514499f5920d073f5cd402dd0d3bbd19ac2c1", "tree": "f6b20dcbbdb9809a4d0f9678f9c2a04626a03c62", "parents": [ "6e14c5705c5acf9d6036060252f257a084cd7578", "3523e4fcb3c74a5dee2f4497e2b8ec7b9e2b5e57" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Jan 27 18:33:46 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 27 18:33:46 2015 +0000" }, "message": "am 3523e4fc: am efe085ff: Merge \"Handle bad ninepatch data.\" into lmp-mr1-dev\n\n* commit \u00273523e4fcb3c74a5dee2f4497e2b8ec7b9e2b5e57\u0027:\n Handle bad ninepatch data.\n" }, { "commit": "a730ef3f77fc495bc90199b4d45efab26d609782", "tree": "f88830bbe9186aacc9f79c849dce761f61ef875a", "parents": [ "aa6945ac7904611499ae4ad33799d1f1fe434d32" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Jan 27 11:12:02 2015 -0500" }, "committer": { "name": "Leon Scroggins", "email": "scroggo@google.com", "time": "Tue Jan 27 16:41:16 2015 +0000" }, "message": "Handle bad ninepatch data.\n\nChanges proposed by Ben Hawkes of Google Project Zero.\n\nNinePatchPeeker.cpp:\nInstead of asserting, return false for bad data.\n\nResourceTypes.h:\nStore ninepatch values as unsigned.\n\nBUG:19151999\nChange-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2\n" }, { "commit": "d9bd08864eaf9d8847d974eadb81806b9e086a2d", "tree": "7f3f1caed8501f6409955deb27db6fa211fbca62", "parents": [ "a9c122af60621597f1d008c8a283074309383aac", "554a6f5278ec05077d8252249afc911897fbfe76" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jan 20 21:55:12 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 20 21:55:12 2015 +0000" }, "message": "am aee7225e: Merge \"Process base APK\" into lmp-mr1-dev\nautomerge: 554a6f5\n\n* commit \u0027554a6f5278ec05077d8252249afc911897fbfe76\u0027:\n Process base APK\n" }, { "commit": "42eea270a0a2bc54f454312817c41ac357e3a884", "tree": "36a4b3f3f658c40be17f3ce7c4bc3b6836bc817a", "parents": [ "8d47bc97e642cd0d0caf31d09efe05d8dc233f27" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jan 15 17:01:39 2015 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jan 16 14:11:30 2015 -0800" }, "message": "Process base APK\n\nThe base APK may have resources with configurations that compete\nagainst some splits. The base APK must be involved in the selection\nof splits.\n\nBug:18982001\nChange-Id: Ieb29b5a36cf2c68e7831484d98a9fd275acd97e8\n" }, { "commit": "49138184dee54357b1923f302e4b3fedd73ca34f", "tree": "865df305f680cb41daf7216664d4b2a0edc133b3", "parents": [ "b8794c76d677ef04c96b9edc002fe6e1f53022c7", "9568307cf32c8abc6703dc7a1b0b0fee56c4f8f5" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jan 15 01:39:29 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 15 01:39:29 2015 +0000" }, "message": "am 9568307c: am 43a4a8c7: Fix redundant file backups\n\n* commit \u00279568307cf32c8abc6703dc7a1b0b0fee56c4f8f5\u0027:\n Fix redundant file backups\n" }, { "commit": "43a4a8c777fbb8f71540ac7fbe82674489ef557b", "tree": "ab4f4b3a27124b244aa8b3cbb013c674da07731d", "parents": [ "a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jan 08 18:42:33 2015 -0800" }, "committer": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Wed Jan 14 16:36:30 2015 -0800" }, "message": "Fix redundant file backups\n\nWe\u0027d observed a bug in which an unchanged file was nevertheless\nbeing redundantly transmitted for backup on every backup pass.\nThe underlying issue turns out to have been the FileBackupHelper\nbase implementation\u0027s logic for diffing the prior-state file\nset against the current state, in the case when there had been\ndeletions of prior files. In addition, there was also a\nparallel bug in which file checksums were not calculated\nproperly in some cases, leading to at least one additional\nredundant backup of the file in question.\n\nBug 18694053\n\nChange-Id: Ie0dec06486b5fef4624561737019569c85d6b2a0\n" }, { "commit": "347040cf84401601b0d5cbb1d76e4648d1c8a461", "tree": "55aaab9d50d252ad2ed6bc03f35bf42ebe0cec3e", "parents": [ "a349a9e71aecf93d7d6d7d3e0d93d3e06291a519", "740acf213c56c406132294790fa2fadd0380cfa7" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Dec 11 00:07:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 11 00:07:02 2014 +0000" }, "message": "am 740acf21: am c7801877: Merge \"Fix issue where non-resource attributes would cause obtainStyleAttributes to fail\" into lmp-mr1-dev\n\n* commit \u0027740acf213c56c406132294790fa2fadd0380cfa7\u0027:\n Fix issue where non-resource attributes would cause obtainStyleAttributes to fail\n" }, { "commit": "5dce5e67dbdcd14882edf3f64fba671c77577ee4", "tree": "685d15b6cbb42c2d3bd50825f0b4198c3bd1ee7d", "parents": [ "4df65bf1eb454814954421403da9f8b5fcb82180" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 10 10:47:53 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 10 10:51:48 2014 -0800" }, "message": "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail\n\nA sentinal value of 0x00000000 was used to mark the first time an AttributeFinder\nwas used. If the resource ID of an attribute was also 0x00000000 (which occurs with\nnon-resource attributes, like \u0027style\u0027), then it would be mistaken as the sentinel\nstart value.\n\nBug:18421787\nChange-Id: I4be353e0f8c940cb6f262d155129f048dcc444ae\n" }, { "commit": "e97908d32ee8ea80138d085260a0eac93841c722", "tree": "0fb24cd7ef6cf6236d3451296937262b78fe2efc", "parents": [ "501bf216dc9068c8169687437d8d6594cd1e1165", "0953ab276449cf8d2b27d4f68cb213dfe317a3b4" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Dec 05 11:06:21 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Dec 05 11:06:21 2014 -0800" }, "message": "Merge commit \u00270953ab27\u0027 into manualmerge\n\nChange-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32\n" }, { "commit": "8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58", "tree": "e395d9177a329782dd5be2a5ec228b1abe3093a2", "parents": [ "c0707c007d8322338e9f46f5ccb04b5582e75845", "503071ae41374a66f61e53e05a91243473db83b9" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Dec 04 09:21:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 09:21:45 2014 +0000" }, "message": "am 503071ae: am a2b5067a: Merge \"RRO: prevent duplicate system overlays\"\n\n* commit \u0027503071ae41374a66f61e53e05a91243473db83b9\u0027:\n RRO: prevent duplicate system overlays\n" }, { "commit": "9b624c186cb6059dfb3ec24bfb6386a0fc17b88c", "tree": "e57516e076eddb75d4c657704522f43067153c2a", "parents": [ "92ad4dd017a13364b4001bdb04911202932f81c2" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Nov 19 17:49:26 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 03 15:59:20 2014 -0800" }, "message": "AAPT: Move private attrs to new type for framework\n\nPrivate attributes are typically placed after public\nattributes in the resource table. Each time a new version\nof the Android framework is released, new public attributes\ntake the place of the private attributes, and the private\nattributes are shifted after the new public ones.\n\nThis means that any apps built against the newer SDK\nmay inadvertently be using private attributes on older\ndevices.\n\nThis change moves all private attributes to a completely\ndifferent type ID, so there will never be collisions across\nversions.\n\nThese private attributes are automatically moved to a synthesized\ntype only for the system resources.\n\nBug:18263655\n\nChange-Id: I7a850512953fadcc9f3524d509cea30249782db8\n" }, { "commit": "a2b5067aeef5b2d68a7a2f7b4edc7ee0908b5d5b", "tree": "db4b1a0c53a697fb010a6feba69e9b2bb11250fd", "parents": [ "abdaa32dd79c915d0e419560c8eaa64e3d946b77", "cb7b63d928cd562ea66d10d816056b984f50193a" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 03 17:44:17 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 03 17:44:18 2014 +0000" }, "message": "Merge \"RRO: prevent duplicate system overlays\"" }, { "commit": "11bdd5b10b5f921b657283fa94463263171218d5", "tree": "f439482e80559f310178bb050de770ca86fb0b23", "parents": [ "a9a3e24835b08828aa252bf079067a5f810a0792", "06d8b7b8d216cbfcd4cd987649672a5856ccd797" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 17 12:17:16 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 17 12:17:16 2014 -0800" }, "message": "Merge commit \u002706d8b7b8\u0027 into manualmerge\n\nConflicts:\n\tcore/jni/android_util_AssetManager.cpp\n\nChange-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca\n" }, { "commit": "5bf0c65eef972e743ca02e93f8d5ad7df5097931", "tree": "28c3f347ee4b4c25547911cb737f38614b18b3b1", "parents": [ "bc1d97556d32a45ceca5db3e2af12cd3d4cf5590", "f89a2fdacb2ba907f180188dc79f9de81e3eb254" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Sat Nov 08 02:04:43 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Nov 08 02:04:43 2014 +0000" }, "message": "am f89a2fda: Merge \"Frameworks/base: Fix two warnings in cmds\"\n\n* commit \u0027f89a2fdacb2ba907f180188dc79f9de81e3eb254\u0027:\n Frameworks/base: Fix two warnings in cmds\n" }, { "commit": "ebee1379eaf4306eb2de9437844009aa7eb18c28", "tree": "165544f1e460464e14c41e8b88f73107e1668494", "parents": [ "487ae9b8dc3e08c1a830d519a801a07cd59c8f2b" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 07 16:28:19 2014 -0800" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Sat Nov 08 01:04:45 2014 +0000" }, "message": "Frameworks/base: Fix two warnings in cmds\n\nChange-Id: Ifb9c7fb7a2d28c13010ddc186bea5f5f0daefb4a" }, { "commit": "dc9c109af815100d497184e6dadebceed7f3bf1d", "tree": "51bb2aa4ff78b0ebcdbe1cc474c76dd2d38d7a37", "parents": [ "9a0aa553ad9f6657cbbf0a182566c481e191e6b7", "487ae9b8dc3e08c1a830d519a801a07cd59c8f2b" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 07 15:03:46 2014 -0800" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 07 15:14:02 2014 -0800" }, "message": "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp\n\nChange-Id: I395f184d885a7ef30aa113ab01fcaacc94243008\n" }, { "commit": "2204f0bf56af53b588a01701b8cf9cd05b1b3ff9", "tree": "d163b59ccc8d10a3181bc77ea99f83c94e6748ce", "parents": [ "59701b9ba5c453e327bc0e6873a9f6ff87a10391" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Oct 21 23:04:54 2014 -0700" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 07 13:35:05 2014 -0800" }, "message": "Frameworks/base: Wall Werror in libs/androidfw\n\nTurn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor\nsome code.\n\nChange-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd\n" }, { "commit": "cb7b63d928cd562ea66d10d816056b984f50193a", "tree": "0078c4cd3321ca9d533432f7092da58d2a6fa2f0", "parents": [ "96198ebae8deab14b434645f628213db492abdbc" ], "author": { "name": "Mårten Kongstad", "email": "marten.kongstad@sonymobile.com", "time": "Fri Nov 07 10:57:15 2014 +0100" }, "committer": { "name": "Zoran Jovanovic", "email": "zoran.jovanovic@sonymobile.com", "time": "Fri Nov 07 16:08:22 2014 +0100" }, "message": "RRO: prevent duplicate system overlays\n\nSystem overlays, ie overlays with targetPackage\u003d\"android\", were loaded\ntwice, which caused all sorts of issues. Ensure they are only loaded\nonce, which will be during Zygote initialization.\n\nBug: 17765434\nChange-Id: Ia5064045c77f713c58fb78adc3942f6af1abdc93\n" }, { "commit": "a7d1d73a477fe512d9ea69ee2883084630ec24c4", "tree": "bbc94feb57cfcead2f9d44d8a4192085ee4d7d6a", "parents": [ "efd8a85d30c35ca4a274835f10e371289bb9bc5e" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Oct 01 18:24:54 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Nov 04 16:34:34 2014 -0800" }, "message": "Implement back-tracking when searching for attributes in XML or resource bag\n\nShared libraries have their package ID assigned at run-time, so some\nof the guarantees we used to have about sort order of attributes in\nbags or XML elements no longer hold.\n\nThis CL adds back-tracking and can jump to the nearest attribute with the\nsame package ID and continue searching.\n\nThis means that attributes with the same package ID must be sorted by increasing\nresource ID, as was the case before.\n\nAttributes with the same package ID must be grouped together, but the groups can\nbe in any order. Ex: 0x02010001, 0x02010002, 0x01010000, 0x01010010, 0x7f010032\n\nBug:17666947\nChange-Id: I9c198bbb6ca788849aac85b6323606ea5d9550d6\n" }, { "commit": "668f0a356cba44c22d8ca0c9f4711613885d46a9", "tree": "2a761d729c706abe8c4fca98e89d818e961a5168", "parents": [ "3c7efdc00506e6561ca08933f0b2acf5e3f16b02", "4bf58108d442b37ab4adf5ce3a4ecd63472ce254" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 23:38:42 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 03 23:38:43 2014 +0000" }, "message": "Merge \"Fix issues that will be present in C++11\" into lmp-mr1-dev" }, { "commit": "4bf58108d442b37ab4adf5ce3a4ecd63472ce254", "tree": "2b6359ad85861bf339e6a45813c599ab683fc7c3", "parents": [ "e8d9810cdef5b3e288f54f42adc3205532343406" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 11:21:19 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 11:49:47 2014 -0800" }, "message": "Fix issues that will be present in C++11\n\n- char16_t is a distinct type, so stay consistent\n with it throughout the code base.\n- char16_t is defined as minimum size of 16 bits.\n Since we mmap and cast data structures onto raw memory,\n we need a precise definition (uint16_t), so we cast between\n that (and static_assert that they are the same size).\n\nChange-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c\n" }, { "commit": "f2969405020a72e282c348a6ea201d56e9f8d4ba", "tree": "e128dfe858f314d151ad3462e77f18d4aa973f66", "parents": [ "720a5c51beb5beab442832ea8d169aa5b4edb43f" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Oct 29 17:09:36 2014 -0700" }, "committer": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Oct 29 17:09:36 2014 -0700" }, "message": "Distinguish unspecified and explicit null values in resources\n\nBUG: 17919345\nChange-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea\n" }, { "commit": "8d2556f0de2786367babaafbf1c34b24926e48ca", "tree": "fcd53787b65f0ff0e1449b3ba1794d5edc79be32", "parents": [ "26d5da351e5fbeb23605a643923e896bb3a0d57c", "ecdaa576af69361538738b9982b22d25017012a3" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Sep 19 18:37:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 19 18:37:15 2014 +0000" }, "message": "am 8bdb265f: am 19f9d54f: Merge \"Fix backwards compat problem with AAPT public attrs\" into lmp-dev\n\n* commit \u00278bdb265f0a73bc6f2114ca70f141c214a23696c7\u0027:\n Fix backwards compat problem with AAPT public attrs\n" }, { "commit": "b6812b64c42ee15a1afa295fe341103fe02006ae", "tree": "d831675ce920785f8bf13cdffc42ba54cb4b4fbf", "parents": [ "ddc5e5f1c60f5fc491c9299a0afd280f8fdc252b", "82a2dd8efe48d3a4e04655f01329da857ace4b7d" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Sep 19 18:19:56 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 19 18:19:58 2014 +0000" }, "message": "Merge \"Fix backwards compat problem with AAPT public attrs\" into lmp-dev" }, { "commit": "99f8f21c166cf262489633b2e6a8dbe5f1771a8d", "tree": "ba84300fb29a436c3bd57e4e8650fdf416833f8d", "parents": [ "0bdf25b090c4b85b392f83a0f6db78e5e9f517a5", "652bf9c9d88eb892a3c112ef6c2ef6dbb1b2b23d" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Sep 19 03:56:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 19 03:56:19 2014 +0000" }, "message": "am d3d6ecdb: am 52e5e359: Merge \"USB string descriptors are not UTF8, so it is not safe to treat them as such.\" into lmp-dev\n\n* commit \u0027d3d6ecdb7a6b00347920c5e706275017854849af\u0027:\n USB string descriptors are not UTF8, so it is not safe to treat them as such.\n" }, { "commit": "51938c205f41da95486b17ea645fd0ce2a73be82", "tree": "80b23ecf19607c803605a5f9fa173e11a9a9a744", "parents": [ "3540c462d95a0720e2931c30e1fe9820d0d63c51", "9ee5e7e17f7d65620f21d1a42865981e7bc56593" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Sep 19 02:00:25 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 19 02:00:26 2014 +0000" }, "message": "Merge \"USB string descriptors are not UTF8, so it is not safe to treat them as such.\" into lmp-dev" }, { "commit": "82a2dd8efe48d3a4e04655f01329da857ace4b7d", "tree": "9c5ec064aeba43cf4b27fd4bb36e31f0bf425f35", "parents": [ "49c0e7375b237bc6eff8746ae91466ea6a660233" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Sep 17 18:34:15 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Sep 18 14:05:24 2014 -0700" }, "message": "Fix backwards compat problem with AAPT public attrs\n\nAAPT has traditionally assigned resource IDs to public attributes,\nand then followed those public definitions with private attributes.\n\n--- PUBLIC ---\n| 0x01010234 | attr/color\n| 0x01010235 | attr/background\n\n--- PRIVATE ---\n| 0x01010236 | attr/secret\n| 0x01010237 | attr/shhh\n\nEach release, when attributes are added, they take the place of the private\nattributes and the private attributes are shifted down again.\n\n--- PUBLIC ---\n| 0x01010234 | attr/color\n| 0x01010235 | attr/background\n| 0x01010236 | attr/shinyNewAttr\n| 0x01010237 | attr/highlyValuedFeature\n\n--- PRIVATE ---\n| 0x01010238 | attr/secret\n| 0x01010239 | attr/shhh\n\nPlatform code may look for private attributes set in a theme. If an app\ncompiled against a newer version of the platform uses a new public\nattribute that happens to have the same ID as the private attribute\nthe older platform is expecting, then the behavior is undefined.\n\nWe get around this by detecting any newly defined attributes (in L),\ncopy the resource into a -v21 qualified resource, and delete the\nattribute from the original resource. This ensures that older platforms\ndon\u0027t see the new attribute, but when running on L+ platforms, the\nattribute will be respected.\n\nWe still need to address this problem in the platform moving forward,\nas this will only help us in the transition from pre L to L.\n\nBug:17520380\nChange-Id: Ia2a985798b50006c21c7c3431d30d9598f27cd91\n" }, { "commit": "c846e61639c3808889ac394366dd4db5379a3b88", "tree": "c308f1c266a4f6e94e8162a72a2162f835bc559a", "parents": [ "4c4b3b8f78891d37d04430622bffc1dc2df361f2", "0836f2f08b5bfc5359a1de833a6f55fc596fde08" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Sep 12 05:45:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 12 05:45:07 2014 +0000" }, "message": "am a38e59b1: am 683872af: Merge \"Clean entire arg block when setting process name.\" into lmp-dev\n\n* commit \u0027a38e59b1b4164a33c38fc522e56601d886c49833\u0027:\n Clean entire arg block when setting process name.\n" }, { "commit": "00c0cd4a24bd0f040055f9e786e2df1fa3b7d2d3", "tree": "87654f391f5e9dca11fd5e84901545890d3d5b16", "parents": [ "98ff7bce66f03da14e39fa7e532a7202bde7dce6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 10 16:48:46 2014 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Sep 11 14:19:52 2014 -0700" }, "message": "Clean entire arg block when setting process name.\n\nWhen Android processes fork from Zygote, we rewrite the command line\nwith a new name, eg. \"system_server\". When we do this, we should\nfill the entire block with zeros to remove corrupted argument\ninformation that may otherwise remain in the /proc/\u003cpid\u003e/cmdline buffer\nand be seen in tools and stack dumps.\n\nFixed an issue where VM options could be overwritten after setting\nthe nice name if the name was too long.\n\nBug: 17474152\nChange-Id: Ie6cf9ed7752a04300a340e26cd6812bb35c59e1b\n" }, { "commit": "20ec4fa2294a91e5ff87839280904aba4a050cf6", "tree": "975bff3addce4062cb4227f7d96d1f36a16c7ed0", "parents": [ "ddb605d4b2fa544bab69a72a288e578f2dd37f52", "6c585756b4c66058af85bb8d6524ffa94af79e62" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Sep 08 22:25:54 2014 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Sep 08 22:25:54 2014 -0700" }, "message": "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp\n\nChange-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96\n" }, { "commit": "2ffa4aabd76353a907ee89a3e0c6f1961237f257", "tree": "155ccc475b02ef260666cc118fcfd8fc3a2474f7", "parents": [ "5a6934c07946743e622df52ba1155d97129b37f0", "f348c15ecf78e9d58b8238ffcf1d78a279e3a862" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Sep 09 04:30:34 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 09 04:30:35 2014 +0000" }, "message": "Merge \"Use char16_t for char things.\"" }, { "commit": "f348c15ecf78e9d58b8238ffcf1d78a279e3a862", "tree": "fad413b2f2b3d849eaf83e607a8336683adb8b63", "parents": [ "2a1ed46decbc8e21a39367a4b7770111392167c3" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Sep 08 18:28:00 2014 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Sep 08 18:30:08 2014 -0700" }, "message": "Use char16_t for char things.\n\nWhen compiling in C++ mode, the compiler will complain about conversions\nfrom uint16_t to char16_t. Be consistent in using char16_t for strings.\n\nChange-Id: I052b6176ced635162920b31560052d9a64f92764\n" }, { "commit": "9ee5e7e17f7d65620f21d1a42865981e7bc56593", "tree": "9e65103e7fc4429505ba2cd8c4a2ce84bddd39cb", "parents": [ "3afd6e3fc612e12ad55de53747641f63f457bb42" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Sep 08 16:15:21 2014 -0700" }, "committer": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Mon Sep 08 17:05:44 2014 -0700" }, "message": "USB string descriptors are not UTF8, so it is not safe to treat them as such.\n\nAdd AndroidRuntime::NewStringLatin1() to convert non-UTF8 strings to Java strings.\n\nBug: 17427781\nChange-Id: I7df1d4e94a7beebc8b1a74c0c0a163b794025ae8\n" }, { "commit": "ad2d07d2d98a46babb2a9472413fe9ce5080ca76", "tree": "40be93c366de29a74421b20cf8ae10c34ac34dfd", "parents": [ "032402cff1fe5dc3a6b2adae3d4c13fb771cd91f" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Aug 27 16:21:08 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Aug 27 18:28:49 2014 -0700" }, "message": "Stamp platform version code into app Apks\n\nThe versionCode of theframework resources that an app is built against\ngets stamped inside an app\u0027s AndroidManifest.xml in the \u003cmanifest\u003e\ntag as \"platformBuildVersionCode\" and \"platformBuildVersionName\"\nattributes.\n\nBug:17207635\nChange-Id: Id573c3dffcbca38eec9c0eb3e89f4a547e3361d3\n" }, { "commit": "31245b4f06003f1c8cd44c31b387c96ab4e282f9", "tree": "ec59d73e6b6e563876ed8c4e5de331b4df17549e", "parents": [ "5b8e5a7d4c930b42e1a3c2b3e67144b89d37efa2" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 22 19:10:56 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Aug 25 17:47:30 2014 -0700" }, "message": "Introduce anydpi density resource qualifier\n\nThis is meant to be used with scaleable vector\ndrawables, and are chosen as the best match unless\nthere is a configuration that matches the density\nrequested exactly.\n\nBug:17007265\nChange-Id: Ic3288d0236fe0bff20bb1599aba2582c25b0db32\n" }, { "commit": "6022debdbcc4498736580640c6287b57872617a2", "tree": "17fa702311166e6f78ad07af3e767ca672817135", "parents": [ "e02f340d9a0c4f841376c3db8ec93f65e7e58417" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Aug 20 14:59:19 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Aug 20 17:55:33 2014 -0700" }, "message": "AAPT: Fix regression generating dynamic ref table for shared libraries\n\nAAPT stopped generating dynamic reference tables for shared libraries.\n\nChange-Id: Ib0025811bdca1a4756eb21080dd6b6bb3fc1ca3d\n" }, { "commit": "ec64709ce042bcf456f9749e079e5f6981cfbbb9", "tree": "9ac12058f26bbf10fb5c2909de4149a3d25b77fc", "parents": [ "c1bf40f5c46e5c7597d5cd3f80d8eda83773683e", "833f3ccbc8f4dd1ec8abb9121988b99ff34ec4c1" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Sat Aug 09 01:48:35 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 09 00:40:15 2014 +0000" }, "message": "Merge \"AAPT support for feature splits\" into lmp-dev" }, { "commit": "833f3ccbc8f4dd1ec8abb9121988b99ff34ec4c1", "tree": "a57e8389088178108de1424faf41ea3bb87c934a", "parents": [ "5c09e8ad5ee8e67976066366527ee58792551953" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jun 18 15:06:01 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Aug 04 18:48:14 2014 -0700" }, "message": "AAPT support for feature splits\n\nThis change allows the developer to add a base package for\nwhich to build a feature split. The generated resource types\nwill begin after the base APK\u0027s defined types so as not\nto collide or override resources.\n\nMultiple features can be generated by first choosing an\narbitrary order for the features. Then for each feature,\nthe base APK and any preceding features are specified\nwith the --feature-of flags.\n\nSo with a base APK \u0027A\u0027 and features, \u0027B\u0027, and \u0027C\u0027,\n\u0027B\u0027 would be built with\n\naapt package [...] --feature-of A [...]\n\nand \u0027C\u0027 would be built with\n\naapt package [...] --feature-of A --feature-of B [...]\n\nChange-Id: I1be66e3f8df9a737b21c71f8a93685376c7e6780\n" }, { "commit": "0d8fb019633300a6636f1bf99f0716e8579dab35", "tree": "6a5302c69e3dd5d07bb383bcb274bae009488f39", "parents": [ "3fbfbb4adeec1dda1e149758ea302c386101f267" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jul 30 12:11:41 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Aug 06 22:25:01 2014 -0700" }, "message": "Disable compilation based on vold.decrypt. [frameworks/base]\n\nBug: 15165413\n\n(cherry picked from commit 4fd561637a173c7fa6a1d71e9115db1db90514ff)\n\nChange-Id: I2a13b63f9d4a7ffd69a8d21666c6dce84739c6ed\n" }, { "commit": "3fbfbb4adeec1dda1e149758ea302c386101f267", "tree": "e24c0a50c90acfeabf8c79e19c1635910ffe8078", "parents": [ "a25dc2bbe70b7449dc57e9619778ba592c198003" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Mon Jul 28 19:13:28 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Aug 06 22:25:00 2014 -0700" }, "message": "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]\n\nThis will allow us to conditionally change the compiler-filter based on other properties.\n\nBug: 15165413\n\n(cherry picked from commit f60d3a4702f6d00d7edb5d348c53b9b03ae16b76)\n\nChange-Id: I293c81ba817e9abbf9c05b3fb554ef2f0ad0c4ed\n" }, { "commit": "4fd561637a173c7fa6a1d71e9115db1db90514ff", "tree": "10c08ccbadc0ef804e90990e40e3a956b65606d2", "parents": [ "f60d3a4702f6d00d7edb5d348c53b9b03ae16b76" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jul 30 12:11:41 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Thu Jul 31 14:27:29 2014 -0700" }, "message": "Disable compilation based on vold.decrypt. [frameworks/base]\n\nBug: 15165413\nChange-Id: I1972c5af5f392c2ed247888ef33c03e9ffe4d588\n" }, { "commit": "f60d3a4702f6d00d7edb5d348c53b9b03ae16b76", "tree": "0cef1223c6b75570744b97539e2f9bb019b184ea", "parents": [ "8c57cead83105ce273351024bfa745c979f9dc48" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Mon Jul 28 19:13:28 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Thu Jul 31 14:27:29 2014 -0700" }, "message": "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]\n\nThis will allow us to conditionally change the compiler-filter based on other properties.\n\nBug: 15165413\nChange-Id: I1676987c69a3cad4217dc4b56465ef3ae886122a\n" }, { "commit": "590b8d3601a518f6c3e00a28e88add36142bde22", "tree": "49028c5103fa9c63d725a983c912ae1fe30d3ed7", "parents": [ "9679410db578e179c7559e7a52bb21c8082e9631", "09d5cddf67b676018700bcc10a72242641cd7eec" ], "author": { "name": "Bo Liu", "email": "boliu@google.com", "time": "Mon Jul 28 21:44:10 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 24 20:48:02 2014 +0000" }, "message": "Merge \"Add kModeSync\" into lmp-dev" }, { "commit": "09d5cddf67b676018700bcc10a72242641cd7eec", "tree": "92b8ab435be040a30ba9cb2d77246aaaca68e5a1", "parents": [ "4f994eb2ddbe68b0eada89dcaae34c079df55c7e" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu Jul 24 10:36:08 2014 -0700" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu Jul 24 10:36:08 2014 -0700" }, "message": "Add kModeSync\n\n Bug: 16526750\n\nChange-Id: I4c087160e80432739321172fd57880846c8de6e0\n" }, { "commit": "cae05e0b4c4726236487bdd7c23b82e93f85fd23", "tree": "2a00d269e21ce193fd0bfa166067d4c48dc2c893", "parents": [ "ed1391a9297db5e2a8671bbf2d83654ee5d28702" ], "author": { "name": "Derek Sollenberger", "email": "djsollen@google.com", "time": "Thu Jul 24 15:22:13 2014 -0400" }, "committer": { "name": "Derek Sollenberger", "email": "djsollen@google.com", "time": "Fri Jul 25 11:39:37 2014 -0400" }, "message": "Move Canvas.h to a new location so that it can be shared with HWUI.\n\nBug: 15672762\nChange-Id: Ia59e986cd4034e16b2e54e8d594e6941a6c9fb1b\n" }, { "commit": "7df3625d5bb28d11cce9ac23429f5e3c6ebac030", "tree": "432f9013a91bede42c82486575b37507cd66718d", "parents": [ "999d394adee533c55fce38bd632ffd4f1af91362" ], "author": { "name": "Martin Kosiba", "email": "mkosiba@google.com", "time": "Thu Jan 16 16:25:56 2014 +0000" }, "committer": { "name": "Marcin Kosiba", "email": "mkosiba@google.com", "time": "Thu Jul 17 18:10:02 2014 +0100" }, "message": "Allow for appending of resources to an AssetManager.\n\nBUG: 11505352\nChange-Id: Ifa290580a6dc63c2f471d0bbf5f066db14aed4d7\n" }, { "commit": "6d77eb99bfc5471f9765e3fa7ea42022197aa9f5", "tree": "80adaf06dc7f28d6ed56bef1b3e77eb8a37c2ef7", "parents": [ "08881385a86bf887669a555ae03759c374ec9c50" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Tue Jul 08 10:40:59 2014 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Tue Jul 08 15:05:41 2014 -0700" }, "message": "Make dex2oat heap size product configurable [frameworks/base]\n\nBug: 15919420\nChange-Id: I9b7b4f60826fc9b0cc6bb3765ceaa36542425006\n" }, { "commit": "21949631815703ef2f04b304b4cedff3646a0d73", "tree": "b615e5a1d99c582576585b5de7db479055500d77", "parents": [ "3081f82742b5dcab7014ac90b313e56a07be5a61", "ce75618e12deebe302c551281ce56c0d60138e0f" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jul 09 15:07:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 09 15:07:35 2014 +0000" }, "message": "am ce75618e: am 5aba0149: am b85afb38: Merge \"Make dex2oat heap size product configurable [frameworks/base]\"\n\n* commit \u0027ce75618e12deebe302c551281ce56c0d60138e0f\u0027:\n Make dex2oat heap size product configurable [frameworks/base]\n" }, { "commit": "ce75618e12deebe302c551281ce56c0d60138e0f", "tree": "54aacc8f75a71d52a4815ee0b9846cbb8cfd2ef4", "parents": [ "e5d9dca16fa629d5cf5bdac38199de8052eb8336", "5aba0149b953fb8e85851811dde995fb35c10051" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jul 09 12:36:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 09 12:36:47 2014 +0000" }, "message": "am 5aba0149: am b85afb38: Merge \"Make dex2oat heap size product configurable [frameworks/base]\"\n\n* commit \u00275aba0149b953fb8e85851811dde995fb35c10051\u0027:\n Make dex2oat heap size product configurable [frameworks/base]\n" }, { "commit": "f90f2f8dc36e7243b85e0b6a7fd5a590893c827e", "tree": "b2fb1fc49961c7c5f5c1712872ce2ffcfe550a89", "parents": [ "c802c8cda234129c1ce3c7a939bd68a1d5813ce6" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jun 06 14:27:00 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jun 18 19:20:08 2014 +0000" }, "message": "Support multiple resource tables with same package\n\nIn order to support APK split features, the resource\ntable needs to support loading multiple resource\ntables with the same package but potentially new set\nof type IDs.\n\nThis adds some complexity as the type ID space changes\nfrom dense and ordered to potentially sparse.\n\nA ByteBucketArray is used to store the type IDs in\na memory efficient way that allows for fast retrieval.\n\nIn addition, the IDMAP format has changed. We no longer\nneed random access to the type data, since we store the\ntypes differently. However, random access to entries of\na given type is still required.\n\nChange-Id: If6f5be680b405b368941d9c1f2b5d2ddca964160\n" }, { "commit": "f967a5486a78db244624fde4c105aa5e6fa914b9", "tree": "4b4f9cfe09af0e82e625b13f4818af297000dbc3", "parents": [ "241cdab7597c9f6f203057125c9d629c285d574d" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Mon Apr 28 16:31:11 2014 -0700" }, "committer": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Fri May 16 23:25:51 2014 -0700" }, "message": "camera2: Plumb DngCreator to native library.\n\nChange-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850\n" }, { "commit": "8ee0b48d607fd6afc5e75f56bdadce19272c60ff", "tree": "d021d0fbdebf4b9d1607a359f69adb3a51283034", "parents": [ "a981e3b01ae6af2b67e582f0d1cbb95560d05626", "97175deb446cdaca7f3910b71940cb443bda3cc4" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 14:06:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 14:06:10 2014 +0000" }, "message": "am 97175deb: am 3856a219: am cecfb94f: Merge \"Clean up argc / argv processing for runtime args.\"\n\n* commit \u002797175deb446cdaca7f3910b71940cb443bda3cc4\u0027:\n Clean up argc / argv processing for runtime args.\n" }, { "commit": "97175deb446cdaca7f3910b71940cb443bda3cc4", "tree": "7f316f4f074f8427d3046f99b683b97136cc3b14", "parents": [ "dc7eb9c947f36cbd34021663845bcbb090c3169d", "3856a219fa414ee53c5ef3a0c35dae35e2ca80b1" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 14:02:08 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 09 14:02:08 2014 +0000" }, "message": "am 3856a219: am cecfb94f: Merge \"Clean up argc / argv processing for runtime args.\"\n\n* commit \u00273856a219fa414ee53c5ef3a0c35dae35e2ca80b1\u0027:\n Clean up argc / argv processing for runtime args.\n" }, { "commit": "22ec1eefa4dc8e12f7da8e8750d4770144941526", "tree": "f5ca6c4f0055e8c4ef01cf484abc65d983ec990b", "parents": [ "a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Apr 07 12:44:58 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 09 13:39:41 2014 +0100" }, "message": "Clean up argc / argv processing for runtime args.\n\n- Make copies of argc, argv before argv is potentially\n overwritten with the process name.\n- Allow multiple command line arguments to be passed to\n ZygoteInit (this is required for some of the 64 bit\n zygote work).\n- Add an explanatory comment about how these argments\n are processed.\n\nChange-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0\n" }, { "commit": "0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec", "tree": "ee5502e236507ebf43a8b365bcf10466b49be61b", "parents": [ "dd79334f7ecb39135058c2049cd933b4b930a3d1", "642421aa7f284817cc1a972a7f9c7a64696a0116" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Fri Apr 04 19:34:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 04 19:34:11 2014 +0000" }, "message": "am 642421aa: am 5c31e487: Merge \"Introduce new UI_MODE_TYPE_WATCH and qualifier.\" into klp-modular-dev\n\n* commit \u0027642421aa7f284817cc1a972a7f9c7a64696a0116\u0027:\n Introduce new UI_MODE_TYPE_WATCH and qualifier.\n" }, { "commit": "642421aa7f284817cc1a972a7f9c7a64696a0116", "tree": "e51a5b2c212bd95c4a052fcbd6b0bb0f0fce4976", "parents": [ "8f81d29558bb0c97187d5ae3a7ee696ec13b264a", "5c31e487c4577e1c47ee7c949325d6a13f0d462e" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Fri Apr 04 19:28:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 04 19:28:09 2014 +0000" }, "message": "am 5c31e487: Merge \"Introduce new UI_MODE_TYPE_WATCH and qualifier.\" into klp-modular-dev\n\n* commit \u00275c31e487c4577e1c47ee7c949325d6a13f0d462e\u0027:\n Introduce new UI_MODE_TYPE_WATCH and qualifier.\n" }, { "commit": "6c191299a73388cd593809c0b66bafbd08fd2982", "tree": "86466cc5d46bb13d87ae71c906349957edd3a7fb", "parents": [ "8db6d9af58b9b81dbd764acd3f6a379afb539bf6" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Thu Apr 03 16:37:27 2014 -0400" }, "committer": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Fri Apr 04 15:21:53 2014 -0400" }, "message": "Introduce new UI_MODE_TYPE_WATCH and qualifier.\n\nDefault ui mode to watch if we have FEATURE_WATCH.\n\nBug:13395758\nChange-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd\n" }, { "commit": "c6f6ba3265d2b07649277682fd3ca0f9ce4d011a", "tree": "94f163ea0ae453d5beb396fc82b250924bf89895", "parents": [ "33822312e65a38400b189c6deda59b8d047b89cf", "71ae2bd42be21de6d25d1f8c52e3973c172462df" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 03 16:56:32 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 03 16:56:32 2014 +0000" }, "message": "am 71ae2bd4: am f87b3a25: am 374db6c3: Merge \"Remove ProcessState::mArgc,mArgV,mArgLen\"\n\n* commit \u002771ae2bd42be21de6d25d1f8c52e3973c172462df\u0027:\n Remove ProcessState::mArgc,mArgV,mArgLen\n" }, { "commit": "a23fcd7be8e40078a913b1a99222cdd89229e67b", "tree": "9580df860d196b7b1edab40837c0c08fbc4ff6da", "parents": [ "369a00574da218975718ce07ffe6abba5c17bf92" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Mar 28 13:39:21 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Apr 03 12:29:07 2014 +0000" }, "message": "Remove ProcessState::mArgc,mArgV,mArgLen\n\nThese look like historical oddities, and weren\u0027t really being\nused for anything useful.\n\nProcess:setArgV0 was being called by android.util.Process, but\nthat functionality can be moved directly into the implementation\nof that class.\n\nbug: 13647418\n\nChange-Id: I216c8f8a4c065f0cf3a61f19f9e32decd26f93f6" }, { "commit": "0d1f634f4b5e1bb37aa51777efb6a68619488d01", "tree": "d936b60a47e95c58e7c47363b6e23cdc8b4df7d9", "parents": [ "c75db8266b352ef3a7a6b76654f770d7a24d547a" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Fri Mar 28 20:30:27 2014 -0700" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Fri Mar 28 20:57:32 2014 -0700" }, "message": "Add invokeFunctor\n\nChange-Id: I09e675d3e02e3e528642175ada00b2b17fab7652\n" }, { "commit": "750ca6dbdb259aea0ca5b77380a9303e586ef3ea", "tree": "c24155dbc56810e618ee8a837470145d77aee38d", "parents": [ "0e14f2d45557527242f27ce7de9027e6ccaa45d6" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Fri Mar 28 16:33:18 2014 -0700" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Fri Mar 28 16:43:15 2014 -0700" }, "message": "Remove kStatusInvoke \u0026 kStatusDraw\n\n They are unused\n\nChange-Id: I44ecf1164dc6bc1b09438e733976d5a97a25f00e\n" }, { "commit": "de898ff42912bd7ca1bfb099cd439562496765a4", "tree": "849b591a99a7e6a8fd790aedca3afff6f6b6eade", "parents": [ "05f79758cd2688f89444a38baba326a0a1c1a438" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jan 29 18:20:45 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Mar 25 12:09:56 2014 -0700" }, "message": "Shared library resource support\n\nShared libraries can now export resources for applications\nto use.\n\nExporting resources works the same way the framework exports\nresources, by defining the public symbols in res/values/public.xml.\n\nBuilding a shared library requires aapt to be invoked with the\n--shared-lib option. Shared libraries will be assigned a package\nID of 0x00 at build-time. At runtime, all loaded shared libraries\nwill be assigned a new package ID.\n\nCurrently, shared libraries should not import other shared libraries,\nas those dependencies will not be loaded at runtime.\n\nAt runtime, reflection is used to update the package ID of resource\nsymbols in the shared library\u0027s R class file. The package name of\nthe R class file is assumed to be the same as the shared library\u0027s\npackage name declared in its manifest. This will be customizable in\na future commit.\n\nSee /tests/SharedLibrary/ for examples of a shared library and its\nclient.\n\nBug:12724178\nChange-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7\n" }, { "commit": "b5c4e7fd3866bbe30d7ea4d7bc463da5a70970e2", "tree": "1348a14b7c5edf6d71960411b9c05defbac1f57b", "parents": [ "df897d08cebb013795ae679eef842a38b5153252", "92860a74c6e57fb66b28afe95c13e7c0f97f831e" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Mar 10 10:57:05 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Mar 10 10:57:05 2014 +0000" }, "message": "resolved conflicts for merge of 92860a74 to master\n\nChange-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e\n" }, { "commit": "6381dd4ff212a95be30d2b445d40ff419ab076b4", "tree": "ea96f7e229cafae41f7be46a3cf0345edd2dc869", "parents": [ "3fc3b9fd1bf71351bf1ff2d49d6e10b6acabf068" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Mar 03 17:12:03 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Mar 10 10:00:02 2014 +0000" }, "message": "LP64: Make 9 patches architecture agnostic.\n\nThe Res_png_9patch struct had several pointer members\nwhose size differed between 32 and 64 bit platforms.\n\nThese members have been replaced by uint32_t offsets\nto serialized data. The serialized form for 9patches\nplaces a Res_png_9patch object at the beginning of\nserialized data, followed by int32_t arrays of xDivs,\nyDivs and colors.\n\nNote that these offsets are not strictly required,\nsince they can be computed from the values of numXDivs,\nnumYDivs \u0026 numColors, however they are called in tight\nloops so having them computed once is a beneficial.\n\nThis change also removed the unused patch_equals function\nfrom aapt\u0027s Image.cpp.\n\nChange-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531\n" }, { "commit": "aa1d023bb9a9be36106423b567291b3f2174860f", "tree": "c1332e813cd72b7102058292970c488f9856c5c8", "parents": [ "216ce34d045cde0c5383f844ba0375aac476cb9e", "674fd6c442cd3886b3ab12be1d36c5d05ef48cdb" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Mar 05 20:09:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 20:09:52 2014 +0000" }, "message": "am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge \"Add dex2oat-flags plumbing to AndroidRuntime\"\n\n* commit \u0027674fd6c442cd3886b3ab12be1d36c5d05ef48cdb\u0027:\n Add dex2oat-flags plumbing to AndroidRuntime\n" }, { "commit": "3beff1e023193b485c67a3003a7f363f105d96d4", "tree": "9ba68b9b10d7bb91f2fedf63433264acd4000e0a", "parents": [ "22f66b76f5e49704f3be76ad3fff7e4b5456864d" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Fri Feb 28 23:27:22 2014 -0800" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Tue Mar 04 14:08:46 2014 -0800" }, "message": "Add dex2oat-flags plumbing to AndroidRuntime\n\nChange-Id: Idaa7e5351e146d76e1972cbe4d93af69f0b999a6\n" }, { "commit": "788fa41482b9d398591b7db8b0b01839029611ad", "tree": "ab94d4040351d79cca717a8b7e21fc6be5d0fcb5", "parents": [ "48620f1d1b03e1cb4e0dce4999e0a4c2daf3a1b2" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 21 15:32:36 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Feb 14 14:08:57 2014 +0000" }, "message": "Extended locales in AAPT / AssetManager.\n\nSupport 3 letter language codes, script codes \u0026\nvariants. The bulk of the changes are related to\nthe implementation of command line filtering of\nlocales etc. The previous code assumed that the\nvalue of each \"axis\" (locale, density, size etc.)\ncould be represented by a 4 byte type. This is\nno longer the case.\n\nThis change introduces a new class, AaptLocaleValue\nwhich holds a (normalized) locale parsed from a\ndirectory name or a filter string. This class takes\nresponsibility for parsing locales as well as\nwriting them to ResTable_config structures, which is\ntheir representation in the resource table.\n\nThis includes minor changes at the java / JNI level\nfor AssetManager. We now call locale.toLanguageTag()\nto give the native layer a well formed BCP-47 tag.\nI\u0027ve removed some duplicated parsing code in\nAssetManager.cpp and replaced them with functions on\nResTable_config. The native getLocales function has\nbeen changed to return well formed BCP-47 locales as\nwell, so that the corresponding java function can use\nLocale.forLanguageTag to construct a Locale object\nout of it.\n\nFinally, this change introduces default and copy\nconstructors for ResTable_config to prevent having\nto memset() the associated memory to 0 on every\nstack allocation.\n\n(cherry-picked from commit 91447d88f2bdf9c2bf8d1a53570efef6172fba74)\n\nChange-Id: I1b43086860661012f949fb8e5deb7df44519b854\n" }, { "commit": "48620f1d1b03e1cb4e0dce4999e0a4c2daf3a1b2", "tree": "f3cb2956e73be5cddeef2792622d52a638f643a7", "parents": [ "24d8fa739b7ca0791174af260ed95cdc139e0903" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 20 13:57:11 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Feb 14 14:08:23 2014 +0000" }, "message": "AssetManager support for 3 letter lang/country codes.\n\n- 3 letter codes are packed into the existing 32 bit locale\n field in ResTable_config\n- We introduce new fields for script / variant information.\n\nNote that we define a \"match\" between two ResTable_config\nstructures to be purely on the basis of their language \u0026\ncountry (disregarding the script and the variant). However,\nconfigs with scripts and variants are considered to be more\nspecific than those without.\n\n(cherry picked from commit 378c6775a62d9c461cde51f06c1b14bb014c78fd)\n\nChange-Id: I7dce82a3fe2412834252723f458826ae41535a78\n" }, { "commit": "d430354c6b6b3b39c35e8af90007414c325ccb2d", "tree": "5a7a6dc7796b3594f182bad99ecf55b675c27349", "parents": [ "04f0cab79d1499a5fe27330bb30dd94151b82880", "9ae000ca8c05ad6f700ad7bf119bbc92fb964b57" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Feb 13 17:22:48 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 13 17:22:49 2014 +0000" }, "message": "Merge \"Revert \"Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.\"\"" }, { "commit": "9ae000ca8c05ad6f700ad7bf119bbc92fb964b57", "tree": "39535e468bacaef05410d512d0794c41d27f8181", "parents": [ "7825334929b098b36e1144872200e75ba6d24b13" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Feb 13 17:22:33 2014 +0000" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Feb 13 17:22:33 2014 +0000" }, "message": "Revert \"Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.\"\n\nThis reverts commit 7825334929b098b36e1144872200e75ba6d24b13.\n\nChange-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4\n" }, { "commit": "04f0cab79d1499a5fe27330bb30dd94151b82880", "tree": "f3d5102898d98059da36881bb9f6637cbde1f645", "parents": [ "f6475c7204759a57bc730e2bbaefb3448a77c141", "7825334929b098b36e1144872200e75ba6d24b13" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Feb 13 16:35:02 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 13 16:35:03 2014 +0000" }, "message": "Merge \"Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.\"" }, { "commit": "7825334929b098b36e1144872200e75ba6d24b13", "tree": "18f4d807ba8d59e0849ccd2032164d1613dddb9b", "parents": [ "faa91f852e9526b2f112122da9ae0956526cf662" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Feb 06 15:25:25 2014 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Feb 12 15:00:05 2014 -0800" }, "message": "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.\n\nAndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need\nto link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()\nthus minimizing build dependencies.\n\nChange-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b\n" }, { "commit": "d5c8044e7e1f1402fdd4a035690329294ab07b33", "tree": "7963a5beae4395899c6b3892d18f1fd8f08e9606", "parents": [ "cbdec7dd8c45f70c678029783ab2f5657f6b36bd", "1cbea39fe1740d7d1c3e4aa0e4771a99a56c79ef" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Wed Feb 12 14:41:25 2014 -0800" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Wed Feb 12 14:41:25 2014 -0800" }, "message": "resolved conflicts for merge of 1cbea39f to master\n\nChange-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700\n" }, { "commit": "1cbea39fe1740d7d1c3e4aa0e4771a99a56c79ef", "tree": "609e7c7ad6a58d44191de97af33a11d9a5e1c78d", "parents": [ "7594767e55e011101ed9341f01d40730fdbd4cc7", "dd3d95f182a634acdcc1b1e8e4954234d048eb54" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Wed Feb 12 14:05:30 2014 -0800" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Wed Feb 12 14:08:06 2014 -0800" }, "message": "resolved conflicts for merge of dd3d95f1 to klp-volantis-dev\n\nChange-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f\n" }, { "commit": "4385d37813897be979ff13262bc464979c74e3dd", "tree": "96a45d931fc70ae774e7532f8117515ebece3708", "parents": [ "f991771f81953f5d355eb905d05a784ed7287016" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Feb 11 13:56:21 2014 -0800" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Feb 12 10:11:34 2014 +0000" }, "message": "Fix build.\n\nAt least part of what is broken. Other stuff still seems to be.\n\n(cherry picked from 32bb5fae353b5bb6275e75952e89c514c7369cee)\n\nChange-Id: I280376645166fe772ff7a31ff2e8494dce2adbf8\n" }, { "commit": "ecbeae74f299f44f9ec4c79ddd885e999d4e1b64", "tree": "060184a770f7410ef85c57416bb2422f0abea051", "parents": [ "89492190b39e301d8203d0a9a9f6b11120c16ecb" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Feb 11 18:02:06 2014 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Feb 11 18:02:06 2014 -0800" }, "message": "Use size_t* in AssetManager::createIdmap\n\nResTable::createIdmap takes a size_t*, and the idmap command is\npassing in a size_t*, make AssetManager::createIdmap take a\nsize_t*. Should fix the mac build.\n\nChange-Id: Idc16dedfe2aa7367c75f89a937a8242d494e8f8e\n" }, { "commit": "d9e385b111ebf811beb0f29178a2fbd4d667509f", "tree": "99be89e7fadb00b002536146ee76ac5d415c5a3d", "parents": [ "4e795ebe1783623a28a988f77b4f0f11d54e73be" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Feb 11 13:56:21 2014 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@google.com", "time": "Tue Feb 11 22:47:42 2014 +0000" }, "message": "Fix build.\n\nAt least part of what is broken. Other stuff still seems to be.\n\nChange-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591\n(cherry picked from commit 32bb5fae353b5bb6275e75952e89c514c7369cee)" }, { "commit": "32bb5fae353b5bb6275e75952e89c514c7369cee", "tree": "e1cb0e8fbdd8c7aa03f1971e4a55da7f8e6d7b68", "parents": [ "6adfd86ca94f3eabb93fb1b4a0b9b0ea50895dcd" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Feb 11 13:56:21 2014 -0800" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Feb 11 14:22:14 2014 -0800" }, "message": "Fix build.\n\nAt least part of what is broken. Other stuff still seems to be.\n\nChange-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591\n" }, { "commit": "47b80be208fcc1d4824bc24959080233a44041db", "tree": "2aacece40a95afd54ecd3e446c83fb0a7db4a448", "parents": [ "43750f19e74edf64c1f1332a2e39de0372845d38", "be49403a0362c18edaeafe59ac09baac14294dee" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@android.com", "time": "Tue Feb 11 20:44:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 11 20:44:38 2014 +0000" }, "message": "am be49403a: am 0cd115e1: am 578087e3: Merge \"New command line tool \\\u0027idmap\\\u0027\"\n\n* commit \u0027be49403a0362c18edaeafe59ac09baac14294dee\u0027:\n New command line tool \u0027idmap\u0027\n" }, { "commit": "d6b473713f43dec0828971854fe1018642cfaf27", "tree": "4f946766a00098f6f7e33ed74a6e6df7dbab40df", "parents": [ "66ebe94757b18146d429855274e451545ed7ea75" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Mon Feb 10 15:56:36 2014 -0800" }, "committer": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Tue Feb 11 10:47:36 2014 -0800" }, "message": "Move inputservice over to frameworks/native\n\nRemove all of the pieces except the PointerController and SpriteController over\nto frameworks/native in preparation for inputflinger. Those two need to stay in\nframeworks/base for now because they depend on Skia currently. In the long run\nthey should be merged into either the InputManager or the WindowManager rather\nthan as a part of the inputservice / inputflinger.\n\nTry 2.\n\nChange-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed\n" }, { "commit": "91447d88f2bdf9c2bf8d1a53570efef6172fba74", "tree": "dc46e96130696c26e8fd3883227314ef5c0b7ad1", "parents": [ "378c6775a62d9c461cde51f06c1b14bb014c78fd" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 21 15:32:36 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Feb 10 15:50:16 2014 +0000" }, "message": "Extended locales in AAPT / AssetManager.\n\nSupport 3 letter language codes, script codes \u0026\nvariants. The bulk of the changes are related to\nthe implementation of command line filtering of\nlocales etc. The previous code assumed that the\nvalue of each \"axis\" (locale, density, size etc.)\ncould be represented by a 4 byte type. This is\nno longer the case.\n\nThis change introduces a new class, AaptLocaleValue\nwhich holds a (normalized) locale parsed from a\ndirectory name or a filter string. This class takes\nresponsibility for parsing locales as well as\nwriting them to ResTable_config structures, which is\ntheir representation in the resource table.\n\nThis includes minor changes at the java / JNI level\nfor AssetManager. We now call locale.toLanguageTag()\nto give the native layer a well formed BCP-47 tag.\nI\u0027ve removed some duplicated parsing code in\nAssetManager.cpp and replaced them with functions on\nResTable_config. The native getLocales function has\nbeen changed to return well formed BCP-47 locales as\nwell, so that the corresponding java function can use\nLocale.forLanguageTag to construct a Locale object\nout of it.\n\nFinally, this change introduces default and copy\nconstructors for ResTable_config to prevent having\nto memset() the associated memory to 0 on every\nstack allocation.\n\nChange-Id: I899a56a9a182ee6be52b9389d1ae59266f5482e9\n" }, { "commit": "378c6775a62d9c461cde51f06c1b14bb014c78fd", "tree": "a91dcdabe03325db4f22b07ed863bbd012a70efb", "parents": [ "dd99d87a125526fc31ef3601a5f1c0edace99a7a" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 20 13:57:11 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Feb 10 15:33:30 2014 +0000" }, "message": "AssetManager support for 3 letter lang/country codes.\n\n- 3 letter codes are packed into the existing 32 bit locale\n field in ResTable_config\n- We introduce new fields for script / variant information.\n\nNote that we define a \"match\" between two ResTable_config\nstructures to be purely on the basis of their language \u0026\ncountry (disregarding the script and the variant). However,\nconfigs with scripts and variants are considered to be more\nspecific than those without.\n\nChange-Id: I3c2e909ebbebdbbd0ab72a639d531b2b9fdbd9b9\n" }, { "commit": "48d22323ce39f9aab003dce74456889b6414af55", "tree": "510aa964078d251874e2c0e7c8556f237b5710c4", "parents": [ "65a05fd56dbc9fd9c2511a97f49c445a748fb3c5" ], "author": { "name": "Mårten Kongstad", "email": "marten.kongstad@sonymobile.com", "time": "Fri Jan 31 14:43:27 2014 +0100" }, "committer": { "name": "Zoran Jovanovic", "email": "zoran.jovanovic@sonymobile.com", "time": "Mon Feb 03 11:20:30 2014 +0100" }, "message": "Runtime resource overlay, iteration 2\n\nSupport any number of overlay packages. Support any target package.\n\nUPDATED PACKAGE MATCHING\n------------------------\nIn Runtime resource overlay, iteration 1, only a single overlay package\nwas considered. Package matching was based on file paths:\n/vendor/overlay/system/framework-res.apk corresponded to\n/system/framework-res.apk. Introduce a more flexible matching scheme\nwhere any package is an overlay package if its manifest includes\n\n \u003coverlay targetPackage\u003d\"com.target.package\"/\u003e\n\nFor security reasons, an overlay package must fulfill certain criteria\nto take effect: see below.\n\nTHE IDMAP TOOL AND IDMAP FILES\n------------------------------\nIdmap files are created by the \u0027idmap\u0027 binary; idmap files must be\npresent when loading packages. For the Android system, Zygote calls\n\u0027idmap\u0027 as part of the resource pre-loading. For application packages,\n\u0027idmap\u0027 is invoked via \u0027installd\u0027 during package installation (similar\nto \u0027dexopt\u0027).\n\nUPDATED FLOW\n------------\nThe following is an outline of the start-up sequences for the Android\nsystem and Android apps. Steps marked with \u0027+\u0027 are introduced by this\ncommit.\n\nZygote initialization\n Initial AssetManager object created\n+ idmap --scan creates idmaps for overlays targeting \u0027android\u0027, \\\n stores list of overlays in /data/resource-cache/overlays.list\n AssetManager caches framework-res.apk\n+ AssetManager caches overlay packages listed in overlays.list\n\nAndroid boot\n New AssetManager\u0027s ResTable acquired\n AssetManager re-uses cached framework-res.apk\n+ AssetManager re-uses cached \u0027android\u0027 overlays (if any)\n\nApp boot\n ActivityThread prepares AssetManager to load app.apk\n+ ActivityThread prepares AssetManager to load app overlays (if any)\n New AssetManager\u0027s ResTable acquired as per Android boot\n\nSECURITY\n--------\nOverlay packages are required to be pre-loaded (in /vendor/overlay).\nThese packages are trusted by definition. A future iteration of runtime\nresource overlay may add support for downloaded overlays, which would\nlikely require target and overlay signatures match for the overlay to\nbe trusted.\n\nLOOKUP PRIORITY\n---------------\nDuring resource lookup, packages are sequentially queried to provide a\nbest match, given the constraints of the current configuration. If any\npackage provide a better match than what has been found so far, it\nreplaces the previous match. The target package is always queried last.\n\nWhen loading a package with more than one overlay, the order in which\nthe overlays are added become significant if several packages overlay\nthe same resource.\n\nHad downloaded overlays been supported, the install time could have been\nused to determine the load order. Regardless, for pre-installed\noverlays, the install time is randomly determined by the order in which\nthe Package Manager locates the packages during initial boot. To support\na well-defined order, pre-installed overlay packages are expected to\ndefine an additional \u0027priority\u0027 attribute in their \u003coverlay\u003e tags:\n\n \u003coverlay targetPackage\u003d\"com.target.package\" priority\u003d\"1234\"/\u003e\n\nPre-installed overlays are loaded in order of their priority attributes,\nsorted in ascending order.\n\nAssigning the same priority to several overlays targeting the same base\npackage leads to undefined behaviour. It is the responsibility of the\nvendor to avoid this.\n\nThe following example shows the ResTable and PackageGroups after loading\nan application and two overlays. The resource lookup framework will\nquery the packages in the order C, B, A.\n\n +------+------+- -+------+------+\n | 0x01 | | ... | | 0x7f |\n +------+------+- -+------+------+\n | |\n \"android\" Target package A\n |\n Pre-installed overlay B (priority 1)\n |\n Pre-installed overlay C (priority 2)\n\nChange-Id: If49c963149369b1957f7d2303b3dd27f669ed24e\n" }, { "commit": "65a05fd56dbc9fd9c2511a97f49c445a748fb3c5", "tree": "f832a1d344dc2102ebbf247a46dcd2839761161a", "parents": [ "c064a1b5d9a68bb5513e6ed64a067ab822e98764" ], "author": { "name": "Mårten Kongstad", "email": "marten.kongstad@sonymobile.com", "time": "Fri Jan 31 14:01:52 2014 +0100" }, "committer": { "name": "Zoran Jovanovic", "email": "zoran.jovanovic@sonymobile.com", "time": "Mon Feb 03 09:47:16 2014 +0100" }, "message": "New command line tool \u0027idmap\u0027\n\nIntroduce a new tool \u0027idmap\u0027 to handle generation and verification of\nidmap files. The tool is modelled on \u0027dexopt\u0027, and is intended to be\nused similarly, notably by \u0027installd\u0027.\nSee cmds/idmap/idmap.cpp for further documentation on \u0027idmap\u0027.\n\nNote: this commit is interdependent on a commit in project build/ to add\n\u0027idmap\u0027 to PRODUCT_PACKAGES.\n\nNote: the changes to androidfw are only stubs. The actual implementation\nwill be provided in Runtime resource overlay, iteration 2.\n\nChange-Id: I7131b74ece1e46c8a9c0a31d103e686aa07da2bb\n" }, { "commit": "7c4887f66bfa3dad16f8b03dc825ade96d7de130", "tree": "9ed404cd4e19d5a28b75fe132fae66bce4550276", "parents": [ "e05b7b50e234e8ed2471f5ad96bb3d715067e9f3" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 27 17:32:37 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Jan 31 13:47:27 2014 +0000" }, "message": "Change ResourceType cookies to int32_t.\n\nAlso change the order of parameters in ResTable constructors\nto avoid ambiguity.\n\n(cherry picked from commit 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1)\n\nChange-Id: I874c5d03c134dc3c331fba423b5280366296287c\n" }, { "commit": "00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1", "tree": "d1d6075692ef537e80d05255a13204a61f0f8a04", "parents": [ "729b12c7a91f9caa65af77197cf6a8814a5a2051" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 27 17:32:37 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 28 16:27:52 2014 +0000" }, "message": "Change ResourceType cookies to int32_t.\n\nAlso change the order of parameters in ResTable constructors\nto avoid ambiguity.\n\nChange-Id: If7bfa1f640dddca39b9f26a3ce84081fa7b6e6e3\n" }, { "commit": "a0c6260705c841f501282e0e337970ca9a00e064", "tree": "5bbe084bd77b819306f743d5fba14ab4a9fff55e", "parents": [ "f85e41f29a0e9313c2d4725f9d9648591ea49f3b" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Jan 24 13:51:51 2014 +0000" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Jan 27 10:31:11 2014 -0800" }, "message": "AssetManager cookies should be int32_t and not void*.\n\nCookies are really indices into vectors and arrays, so\nthey don\u0027t need to be void*. We choose int32_t instead\nof size_t to allow their width to be well specified.\n\nChange-Id: I319f271bd4f102dee7cb9f00df4c75ea697456f5\n" }, { "commit": "ca0b0c18e7eef130e40679b0e77bbcd9a8c901cc", "tree": "0de7e7dc08faddb8fc32dbd148fb85e6fa48fda3", "parents": [ "90f58dbf79057b185b04c5003c8bcae10116409b" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Mon Dec 16 15:04:10 2013 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Jan 27 10:31:11 2014 -0800" }, "message": "Fix MCC/MNC typo\n\nManual merge of https://android-review.googlesource.com/70831 across\nthe header refactoring.\n\nChange-Id: I28b6a61e89b68d914124122882976a9d2f81a609\n" }, { "commit": "560566d2915c03bed338fc532ac7f7aa3620cfdf", "tree": "05c38c1fdcea2989eab2ff6e2934afa4f1f09326", "parents": [ "e1aa223657dd1def8609b377afa86a024bfd4e14" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Dec 03 13:16:03 2013 +0000" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Jan 27 10:31:11 2014 -0800" }, "message": "Reimplement ZipFileRO in terms of libziparchive.\n\nThis lets us share zip archive processing code with both\nthe runtime (Art, dalvik) and critical java code\n(StrictJarFile).\n\nThis change also moves several utility methods to ZipUtils\nand dedups code across several zip inflation methods.\n\nOne of the side effects of this change is that several\nprocessing loops are now O(n) instead of O(n^2).\n\nbug: 10193060\n\n(cherry picked from commit afd31e08299008fdc5c2813f21b2573f29dc53df)\n\nChange-Id: Iae67e62f1dc6dfc3f43e29bc38e3ffd1cb14d191\n" }, { "commit": "16c4d154dca43c662571129af31b27433b919a32", "tree": "ca326aee44fd70c7db61f7a9632c0d29f6565414", "parents": [ "9ab9b93eae8b2fc747d6101cf0e4c19b2218715f" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jan 24 13:27:13 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Jan 27 10:31:10 2014 -0800" }, "message": "Revert \"move libandroidfw to frameworks/native\"\n\nThis reverts commit 84b6292c33d71b5739828d08aa8101d1954577f2.\n" }, { "commit": "745d4efc8369d255341d810790132660e33d3b61", "tree": "f28ae30721d932409fd8189ac6ef5c0289d106c2", "parents": [ "9fc157a4767f54d1cff53dc9489638b67aec2da3" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 27 11:17:22 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Jan 27 11:20:24 2014 +0000" }, "message": "AssetManager cookies should be int32_t and not void*.\n\nCookies are really indices into vectors and arrays, so\nthey don\u0027t need to be void*. We choose int32_t instead\nof size_t to allow their width to be well specified.\n\n(cherry picked from commit ebfdd0f467e39c3af8d92cade78263935340acb7)\n(cherry picked from commit a7fa2e592e2e579e5acdb903dba83fc074ebc215)\n(cherry picked from commit a9d5701b034ed2d9771b3f0943e1add00741d7cd)\n\nChange-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda\n" }, { "commit": "4482e7cb67c516453a67d73e98a085a5f3576953", "tree": "c3e17c68af640b8ed4c4f1881e7798ef4095f154", "parents": [ "a0ab49bb52f44eac97f81117d6864edd6a2e0487" ], "author": { "name": "Mårten Kongstad", "email": "marten.kongstad@sonymobile.com", "time": "Tue Nov 26 14:48:22 2013 +0100" }, "committer": { "name": "Zoran Jovanovic", "email": "zoran.jovanovic@sonymobile.com", "time": "Mon Dec 16 12:42:36 2013 +0100" }, "message": "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)\n\nIn commit 08d5b8f, the ResTable_config::CONFIG_* enum was incorrectly\nchanged to assign the same value to both CONFIG_MCC and CONFIG_MNC:\n - CONFIG_MCC \u003d 0x0001,\n - CONFIG_MNC \u003d 0x0002,\n + CONFIG_MCC \u003d ACONFIGURATION_MCC,\n + CONFIG_MNC \u003d ACONFIGURATION_MCC,\n\nThis commit assigns CONFIG_MNC the value ACONFIGURATION_MNC, as\nintended.\n\nChange-Id: I3b8799914a55debdb3ff30a82ada7ad990c49970\n" }, { "commit": "afd31e08299008fdc5c2813f21b2573f29dc53df", "tree": "7f83dd8f1e7ed71d4fe8ce280841e43ce275ac6d", "parents": [ "6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Dec 03 13:16:03 2013 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Dec 09 16:23:16 2013 +0000" }, "message": "Reimplement ZipFileRO in terms of libziparchive.\n\nThis lets us share zip archive processing code with both\nthe runtime (Art, dalvik) and critical java code\n(StrictJarFile).\n\nThis change also moves several utility methods to ZipUtils\nand dedups code across several zip inflation methods.\n\nOne of the side effects of this change is that several\nprocessing loops are now O(n) instead of O(n^2).\n\nbug: 10193060\n\nChange-Id: I3c7188496837a47246c4f342e45485a70fef3169\n" }, { "commit": "84b6292c33d71b5739828d08aa8101d1954577f2", "tree": "d39f8bbaf0f20fa086038741e117278bb67ba1b2", "parents": [ "92a6f3018ace5aa2d5ea74e7d378b6960b5e053e" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Oct 03 10:30:18 2013 -0700" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Oct 03 10:30:18 2013 -0700" }, "message": "move libandroidfw to frameworks/native\n\nChange-Id: Ic5b8a2742c7141156ab0f00ca29097bfe92bce60\n" }, { "commit": "87eac99a21772ae56018cb81db6966557b459554", "tree": "f41cab7353b4ffd8c757bc67a95e34091ca7f971", "parents": [ "bdd61696c6720faa14ca9fdf180e519138b3d087" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Mon Sep 09 17:44:59 2013 -0700" }, "committer": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Tue Sep 10 20:47:43 2013 -0700" }, "message": "Remove dependency on JNIHelp header side effects.\n\nBug: 10680559\nChange-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2\n" }, { "commit": "52a9a10b6b8c7b7a9f97777541841b94d4fd9754", "tree": "aaf72e50f157c69abc8be70991c16e93bef47fc4", "parents": [ "0dff7064897afd4e07993bac28ae877aaeb1b5e3" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Aug 02 01:38:38 2013 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Aug 06 13:07:42 2013 -0700" }, "message": "Clearly separate consumer and producer interfaces\n\nBug: 9265647\nChange-Id: Ic68e91788d0a05251e1d2fb9f9d4de403c7099bf\n" }, { "commit": "83ad4e393ae8223745924ac9b37949c8efbce3f2", "tree": "469ca23b4b673f98a9c5e17983778b3b41201443", "parents": [ "0281b406365080bce90d8562950cfcfd83b48303" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Aug 05 13:27:39 2013 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Aug 05 14:12:50 2013 -0700" }, "message": "Remove an unused C zip API.\n\nChange-Id: I10ae849bdedf3e3bb97547c4f9e5a20742e9d6b1\n" } ], "next": "d45c68dd24fe3dd510af5a9591b5e2f509b56772" }