)]}' { "log": [ { "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": "76507a64b530c757dc284f1f4d0807ffbfd9a701", "tree": "18ec820c1dd7fb03a97636fcc5451fd88e049cc2", "parents": [ "948682d15f1a4a6676318213a49b50b967cfae27", "72dc62ead214bdec5c46d42f4e859b139dba0a00" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 24 12:56:52 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 24 12:56:52 2015 +0000" }, "message": "am 72dc62ea: Merge \"Track removal of refcounts from FileMap.\"\n\n* commit \u002772dc62ead214bdec5c46d42f4e859b139dba0a00\u0027:\n Track removal of refcounts from FileMap.\n" }, { "commit": "688ff4cf0f93d1a886437884f23874e5595d59a3", "tree": "b8ef91775dfc3dff86d05aa5638b17dee597ca91", "parents": [ "adb52ef7034d4d3e0eee58cedae2a343d29771b9" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Feb 23 15:47:54 2015 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Feb 23 15:47:54 2015 +0000" }, "message": "Track removal of refcounts from FileMap.\n\nUse delete instead of release.\n\nChange-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076\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": "5baa164aec06a9973a68303bc7752aa76e5c68e5", "tree": "059ff600e32873cd11ff9e3a3a78495eb43f9504", "parents": [ "fce232b4080a12220821568ab670a0cdce4893c5" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jan 14 18:19:54 2015 -0800" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jan 14 18:19:54 2015 -0800" }, "message": "Restore write_delete_file\n\nChange-Id: Id93a59ae6c82f6068c58b22e2a651ff8a3b8f530\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": "1e14722167210e176cc1f6e702f1a7a98271c6d2", "tree": "8f5934e5c190670cf8e9fadcc047a54820328a56", "parents": [ "5849c0e4c6f8bf44de44e964ce365c0959070494", "d6c475dc246b1681f5c9af9e00ac74183812329c" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Jan 13 01:32:37 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 13 01:32:37 2015 +0000" }, "message": "am d6c475dc: am 595ae39f: Merge \"Use more intention-revealing tests for S_ISLNK and S_ISSOCK.\"\n\n* commit \u0027d6c475dc246b1681f5c9af9e00ac74183812329c\u0027:\n Use more intention-revealing tests for S_ISLNK and S_ISSOCK.\n" }, { "commit": "1bf248123399daf8d4bee9c30ba13b9887e5001e", "tree": "055e3fdc43d09f7d30253638bbd84507cfd171a0", "parents": [ "837261cc997cbb188de05e3d1194adb91cb75825" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Jan 12 14:33:04 2015 -0800" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Jan 12 14:33:04 2015 -0800" }, "message": "Use more intention-revealing tests for S_ISLNK and S_ISSOCK.\n\nChange-Id: Ia7f13eb7d5a36cf2b4c0a253b2b4d7f7af396951\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": "9438ad1599716176fb6c593e77a2e93b265bbcb5", "tree": "b8d7eef8c9baf5837a896a0e2ccbdd7f1d930a29", "parents": [ "723bce8a0d4fa900ca4344c03e5e82b5881fcf19", "e580d6617f67a1db5eff7ffe5450684cfc7e1a2b" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 02 23:07:43 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 02 23:07:43 2014 +0000" }, "message": "am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c\n\n* commit \u0027e580d6617f67a1db5eff7ffe5450684cfc7e1a2b\u0027:\n RRO idmap: pad with 0xffffffff, not 0x00000000\n RRO: reintroduce lost ResTable insert of assets\n" }, { "commit": "e89a286541e242ad96705fcdd1fe2c6a9eafb4a0", "tree": "c55e1a0c4cc7a2c22c4bb4dfa190a2fb38f6a3df", "parents": [ "acd01ff07668a608cb4890a2ea1533a2397149c8", "96198ebae8deab14b434645f628213db492abdbc" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 02 22:52:36 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 02 22:52:37 2014 +0000" }, "message": "Merge changes If2c7e09f,Ie21f227c\n\n* changes:\n RRO idmap: pad with 0xffffffff, not 0x00000000\n RRO: reintroduce lost ResTable insert of assets\n" }, { "commit": "ee46d1621f817d626e8dd42e9ffe7051f4a829eb", "tree": "5f32ddc31c7f34e797ceb3430ee0eafb7879fb14", "parents": [ "1da25f9331892be262289e3ce00dde23e685db03", "08e2fd7238c50b5d06af41bc944ee08acb023d51" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sat Nov 22 07:56:46 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Nov 22 07:56:46 2014 +0000" }, "message": "am 08e2fd72: am ff4dd15c: Merge \"We HAVE_LITTLE_ENDIAN.\"\n\n* commit \u002708e2fd7238c50b5d06af41bc944ee08acb023d51\u0027:\n We HAVE_LITTLE_ENDIAN.\n" }, { "commit": "9d074a1fb727b7b4990cd0501e4661596e828c40", "tree": "e0bc3432c5e9eb4e95356b1c90fff11a6a54813f", "parents": [ "f1058308c62f297c5bca9e9baf8451efeb200805" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Nov 21 23:36:45 2014 -0800" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Nov 21 23:36:45 2014 -0800" }, "message": "We HAVE_LITTLE_ENDIAN.\n\nChange-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4\n" }, { "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": "cd6f00c3a05717862a88b7409d11176ae53fd9a9", "tree": "0c5eee8aacc85e7722dcde4efee625da3782a58a", "parents": [ "cd75f59f8cdeda95a50155ad0c9f4abd559037ec", "a7d1d73a477fe512d9ea69ee2883084630ec24c4" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 17 19:39:15 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 17 19:39:17 2014 +0000" }, "message": "Merge \"Implement back-tracking when searching for attributes in XML or resource bag\" into lmp-mr1-dev" }, { "commit": "984d81c3937d46240fb9645ffa37c5166284a983", "tree": "6293ac0bbbe71a7c99113d0ee22f6581644a983c", "parents": [ "7346a1ad0a9eb3e93387b328b49d5d6a23336d3e", "c34e63598e318c9aa0debde09730a26c64bc1203" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Nov 10 22:10:21 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 10 22:10:21 2014 +0000" }, "message": "am c34e6359: Merge \"bionic\\\u0027s struct stat is now POSIX-compliant.\"\n\n* commit \u0027c34e63598e318c9aa0debde09730a26c64bc1203\u0027:\n bionic\u0027s struct stat is now POSIX-compliant.\n" }, { "commit": "4da9dc5a62c65b123087a08e124c446ea3a476d1", "tree": "11391a7652d335684d4201d2e85dca941398a02c", "parents": [ "5cce4c752eeeaed74f815b9154ec7f4f3f2397ec" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Nov 10 10:48:25 2014 -0800" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Nov 10 10:48:25 2014 -0800" }, "message": "bionic\u0027s struct stat is now POSIX-compliant.\n\nOne less hack needed...\n\nBug: 18298106\nChange-Id: I1e9e5ebf329bd6cbaf3445201f182793ee4871ce\n" }, { "commit": "5bbb52e8a4242efeea27921ac3e38cf6f9c56162", "tree": "0b99c4cd441a7c42e0e3e3a3605162c4df5bbf8e", "parents": [ "481fc7427b419efb98428f27c5b0e252183ff315", "189bf05616b854f0319c7329a96e63ad374fd6c0" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Sun Nov 09 00:48:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Nov 09 00:48:11 2014 +0000" }, "message": "am 189bf056: Merge \"Frameworks/base: Fix more warnings\"\n\n* commit \u0027189bf05616b854f0319c7329a96e63ad374fd6c0\u0027:\n Frameworks/base: Fix more warnings\n" }, { "commit": "25df5fba3afff403c749bab7d1d5652c3b929e06", "tree": "6828c6d566c437c022ef366322587da248d67c6d", "parents": [ "487ae9b8dc3e08c1a830d519a801a07cd59c8f2b" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 07 22:24:57 2014 -0800" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 07 22:24:57 2014 -0800" }, "message": "Frameworks/base: Fix more warnings\n\nExposed by switching the target to Clang, and GCC 4.9 used by\nMIPS.\n\nChange-Id: Icb79285ab2306c39c2d381e53ea2e643ee2d2947\n" }, { "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": "96198ebae8deab14b434645f628213db492abdbc", "tree": "5bd198f05925adf0110976f10eb8805c41329d3b", "parents": [ "30113131fb958850ef92c6a8f7f2aa2ed92a8ffe" ], "author": { "name": "Mårten Kongstad", "email": "marten.kongstad@sonymobile.com", "time": "Fri Nov 07 10:56:12 2014 +0100" }, "committer": { "name": "Zoran Jovanovic", "email": "zoran.jovanovic@sonymobile.com", "time": "Fri Nov 07 16:08:04 2014 +0100" }, "message": "RRO idmap: pad with 0xffffffff, not 0x00000000\n\nIn the new idmap format (version 0x1), 0x00000000 no longer represents a\nnon-existing entry: 0xffffffff should be used instead.\n\nBug: 17765434\nChange-Id: If2c7e09feba2224eeafe88fd9230e6392d81b9a7\n" }, { "commit": "30113131fb958850ef92c6a8f7f2aa2ed92a8ffe", "tree": "d6d1d9b3c5bbc4e67caaf67e7c967ebd0a4cbe0f", "parents": [ "840796a3c29183a6f9bcf3d50ecae45405b63d88" ], "author": { "name": "Mårten Kongstad", "email": "marten.kongstad@sonymobile.com", "time": "Fri Nov 07 10:52:17 2014 +0100" }, "committer": { "name": "Zoran Jovanovic", "email": "zoran.jovanovic@sonymobile.com", "time": "Fri Nov 07 16:07:42 2014 +0100" }, "message": "RRO: reintroduce lost ResTable insert of assets\n\nWith the recent introduction of AssetManager::appendPathToResTable,\noverlay packages were not properly added to the AssetManager, and once\nadded, were not properly inserted into the ResTable.\n\nBug: 17765434\nChange-Id: Ie21f227c654c98730f74a687d0e16ee2b80e747e\n" }, { "commit": "685d363d7a3e8833edc9368a3c59b69755e0ba29", "tree": "e04662b84ae8cc05665206336a148928c23b7cab", "parents": [ "b3d260222fd003c8b537bb9f86625a200bd0f999", "fb96e54ba8d43a9f3162c92760e53ab61c7486ff" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Nov 05 12:30:25 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Nov 05 12:30:25 2014 -0800" }, "message": "Merge commit \u0027fb96e54\u0027 into manualmerge\n\nConflicts:\n\ttools/aapt/Resource.cpp\n\nChange-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15\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": "3fd340028fc24198edb23ddf5eb5a0a100bab745", "tree": "489ffeed9998280d7402b74ed78bcc61d6cd8872", "parents": [ "7fd12db350a341eb7a50759aa329be5281556928", "78be0498af2b7d5b6855701ef316f488e2de6f14" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 18:03:53 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 18:06:22 2014 -0800" }, "message": "Merge commit \u002778be0498\u0027 into manualmerge\n\nConflicts:\n\tlibs/androidfw/ResourceTypes.cpp\n\ttools/aapt/Android.mk\n\ttools/aapt/StringPool.cpp\n\ttools/aapt/StringPool.h\n\nChange-Id: I9d69efdfb892032895ace12159d193304f02dc6c\n" }, { "commit": "de7de47fef1dcaa26d553665d89e4d3792325c3f", "tree": "0d9551d2f037b841f325bbbd3ba27a309e9441b3", "parents": [ "f7ffcaa7a478eaafc121e84b14dcaf2503dd5457" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 12:03:08 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 15:55:44 2014 -0800" }, "message": "Add error checking to aapt for split generation\n\nChange-Id: Ica627db6a671f6a6c35f98bfd9c03598ffe103ce\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": "9a77c8a279bfe3293295ed77c775ea29b88b2916", "tree": "b34b617ab6869b38151d8e8e6d1eebb0ab7db4d9", "parents": [ "370403dbdec3a1d769c31aca66e5fcbd6617c897", "3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Fri Oct 31 00:15:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 31 00:15:01 2014 +0000" }, "message": "am 3c5cc234: am 674a3a21: Merge \"Distinguish unspecified and explicit null values in resources\" into lmp-mr1-dev\n\n* commit \u00273c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3\u0027:\n Distinguish unspecified and explicit null values in resources\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": "d75d3eb5e423fbcc069dd3c40a4a5eeeaf8bcdab", "tree": "a783da6843ca37463443f0a0fa0eb7da0823274c", "parents": [ "d856afec47c069fe117cdf6c3e22c3d066565a11", "06caf1b1112a6a3e364a46d02b883451e9180a07" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Oct 28 18:09:20 2014 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 28 18:09:20 2014 +0000" }, "message": "am 31b76b66: Merge \"libandroidfw: Do not build device library when building SDK\" into lmp-mr1-dev\nautomerge: 06caf1b\n\n* commit \u002706caf1b1112a6a3e364a46d02b883451e9180a07\u0027:\n libandroidfw: Do not build device library when building SDK\n" }, { "commit": "f001e37b316a0d5b9c9eda08bbe53ea4b06562a3", "tree": "085f4aeed2b7271b3d573b143ad5e4be6657585e", "parents": [ "272b0a1d6acdb7c4d244a498f3769e20c35f43d1" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Oct 20 16:15:33 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Oct 24 18:39:56 2014 +0000" }, "message": "libandroidfw: Do not build device library when building SDK\n\nBuilding the windows SDK causes a build failure if the device\nlibandroidfw target is not omitted.\n\nChange-Id: I587b166342d0d047820911d279f192d2b39b6263\n" }, { "commit": "705f2ac42412c8a5a436f0044b84ebbcd1e9c729", "tree": "9d15a5a9b7c164938fe527deb852c5c08b4f302d", "parents": [ "44e203a6bf2c4b08277c05166fe2fa7f84950be0", "93b434451abd11ff58ada66abdcddb3f33bb5023" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Oct 24 02:01:16 2014 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 24 02:01:16 2014 +0000" }, "message": "am 879f237a: Merge \"Added some more Split density tests\" into lmp-mr1-dev\nautomerge: 93b43445\n\n* commit \u002793b434451abd11ff58ada66abdcddb3f33bb5023\u0027:\n Added some more Split density tests\n" }, { "commit": "60293197379e522c870c4a28462804207bab505d", "tree": "0b736bb0002e0d43109652d603ca0506524a064f", "parents": [ "74af6700196ed55a0aa39c7777293e735e7b4d73" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Oct 21 18:36:42 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Oct 23 16:01:58 2014 -0700" }, "message": "Added some more Split density tests\n\nChange-Id: I3b83515f1240e713bbcff5385cf054bba693f297\n" }, { "commit": "5a71f83227f0340a265f34b226d8fe01d4dd9773", "tree": "9e74435ad8e21fe6ace6a1c49ca2f596c60ced34", "parents": [ "52656916e35b08013bf776b3603d6cecba287a1e", "a0d07d49b8b0aae71beb48ec31b43f6923530d00" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 22 09:00:49 2014 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 22 09:00:49 2014 -0700" }, "message": "Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master\n\nChange-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43\n" }, { "commit": "827d00f2f416a4271249b7a345b1fcdf7f8a10ae", "tree": "feda8f7cb16647cca6c954fc3ec09c22a2fbcdca", "parents": [ "13078e15f34fed4d531200a1b87601b9b4195f8f", "3d23d557ff00010c041ec3fc655472db3d12509e" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Oct 21 16:11:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 21 16:11:52 2014 +0000" }, "message": "am 3d23d557: am 7f2bc6c7: Merge \"More LOCAL_ADDITIONAL_DEPENDENCIES.\"\n\n* commit \u00273d23d557ff00010c041ec3fc655472db3d12509e\u0027:\n More LOCAL_ADDITIONAL_DEPENDENCIES.\n" }, { "commit": "00b4e773ab8a8719e2ddf89e85e6a64945cc5265", "tree": "9e6f383b56f7159ed7a603393cf30db83f768b58", "parents": [ "e40974d92873462c4f1b100c7d03b3f41756c807" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Oct 21 08:58:39 2014 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Oct 21 08:58:39 2014 -0700" }, "message": "More LOCAL_ADDITIONAL_DEPENDENCIES.\n\nChange-Id: I9bf20507442b0722e93446fdb32d8236be974e28\n" }, { "commit": "97ce1a6a23bdb4213303384c6cf73b43cce6aa8f", "tree": "83998abd5715a43d595f15464ecad83f9f9ad460", "parents": [ "a22d2fc319069407d29a792e23910d8ba826ac34", "983b668bd8deb58cbd3faabb931c4fb2dd80bf2f" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Oct 10 17:14:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 10 17:14:41 2014 +0000" }, "message": "am 983b668b: am be003a35: am f23e3ea6: am aeef612f: Merge \"Search all packages for a given type string when looking up resources by name\" into lmp-dev\n\n* commit \u0027983b668bd8deb58cbd3faabb931c4fb2dd80bf2f\u0027:\n Search all packages for a given type string when looking up resources by name\n" }, { "commit": "73587de15470ecf04cf9c90bb3c1f603afbc7855", "tree": "009efbcb5d33082e9c8ee000811bbfe3885ded4f", "parents": [ "5ffb591b061d4044043fd342b0a5b0063de8c318", "aeef612f200b6b5cee214230271e1c3d718151ee" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Oct 09 19:15:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 09 19:15:36 2014 +0000" }, "message": "am aeef612f: Merge \"Search all packages for a given type string when looking up resources by name\" into lmp-dev\n\n* commit \u0027aeef612f200b6b5cee214230271e1c3d718151ee\u0027:\n Search all packages for a given type string when looking up resources by name\n" }, { "commit": "e60a87f5529b2867ba3f4e60b39d7b47b67f8ca3", "tree": "551bd0808ffd3dd737a2349d0e3801f9acc66612", "parents": [ "49c5ddd67793735a2d6fc036614cdfab944d56f6" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Oct 09 11:08:04 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Oct 09 11:26:19 2014 -0700" }, "message": "Search all packages for a given type string when looking up resources by name\n\nPreviously we would stop at the first match when looking for a type string,\nbut we should search all packages in case a feature Split added a type\nwith the same name.\n\nBug:17924027\n\nChange-Id: I6bc7ef073324db99448538cd8bdf566658f066ff\n" }, { "commit": "e18d68d6ab2f5354441162719ec87cb57de83519", "tree": "2cb0e8c9128ce020d36f04c03fecde706d9f2035", "parents": [ "30c284fc460218652ffa89aed3da41225ad9b7cc", "4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Oct 02 12:38:21 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 02 12:38:21 2014 +0000" }, "message": "am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge \"Revert \"Fix issue with using locally defined attrs in a shared lib\"\" into lmp-dev\n\n* commit \u00274e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35\u0027:\n Revert \"Fix issue with using locally defined attrs in a shared lib\"\n" }, { "commit": "e4275843fede011d7ba45cc8cdbf660e86fb6c33", "tree": "6e85b4addf8bc612202f1b099f4b0aef21b78cf3", "parents": [ "4979a6ade1d46dad1716319725d43b4e9cbb71d3", "c6a06d437cf2ee7926a01b2f8ee685555bfb3d81" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Oct 01 22:37:27 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 01 22:37:27 2014 +0000" }, "message": "am c6a06d43: Merge \"Revert \"Fix issue with using locally defined attrs in a shared lib\"\" into lmp-dev\n\n* commit \u0027c6a06d437cf2ee7926a01b2f8ee685555bfb3d81\u0027:\n Revert \"Fix issue with using locally defined attrs in a shared lib\"\n" }, { "commit": "908c748096d855d47da2f5e20fd4d9d31d1e603c", "tree": "8031415a8deef274fa5bc89ba5c9744d6378889b", "parents": [ "5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Oct 01 18:11:18 2014 +0000" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Oct 01 18:11:18 2014 +0000" }, "message": "Revert \"Fix issue with using locally defined attrs in a shared lib\"\n\nThis reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.\n\nThe reverted commit caused issues loading resources supplied by static libraries.\n\nBug 17748356\n\nChange-Id: I860a4f31451ee7c03c02974826472a67226b029f\n" }, { "commit": "7923da5f5d05f256179e0d926b3b55bbf1d29a8e", "tree": "fe4ac6fad31daf5deb739cbfc742d50c1172d6a6", "parents": [ "e5ee1dec2cb25a47b6193e752d4fc4c36022e3f0", "06f380e9efa4698c223077cacaa2df80a704ef96" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Oct 01 17:11:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 01 17:11:10 2014 +0000" }, "message": "am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge \"Fix issue with using locally defined attrs in a shared lib\" into lmp-dev\n\n* commit \u002706f380e9efa4698c223077cacaa2df80a704ef96\u0027:\n Fix issue with using locally defined attrs in a shared lib\n" }, { "commit": "d388b1fdde73124eeda35f18e5bcc2ed1c8cefaa", "tree": "f6935bdab61aadc052e52d039c3a6a0ea11ca391", "parents": [ "6a87fb2b29a98cba03366a796e06cb702fc85ef1", "cd8e73817d14798f9d2031ffd301a03a096b7907" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Oct 01 00:44:31 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 01 00:44:31 2014 +0000" }, "message": "am cd8e7381: Merge \"Fix issue with using locally defined attrs in a shared lib\" into lmp-dev\n\n* commit \u0027cd8e73817d14798f9d2031ffd301a03a096b7907\u0027:\n Fix issue with using locally defined attrs in a shared lib\n" }, { "commit": "5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6", "tree": "f0ddd3b922e53ed84c14558c6345724a588656ba", "parents": [ "75c33d9d04d8c0a9884a70077681261b57c7833c" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Sep 30 16:06:58 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Sep 30 16:18:09 2014 -0700" }, "message": "Fix issue with using locally defined attrs in a shared lib\n\nThe attribute name resource IDs were never fixed up with\nthe runtime package ID so we weren\u0027t finding attributes\nwhenever the runtime package ID was different than the build\ntime one, which happened to be when a shared lib referenced itself\n(0x00 vs 0x02).\n\nBug:17666947\nChange-Id: Icf3e874bcea0e27eebe42d60fbed626a34bf9266\n" }, { "commit": "5648b12da1357345b06ff86d41ff70a92d803093", "tree": "0feac9fbd911da45b6484100e9a860aa9cfa6f14", "parents": [ "e9b6cb80580eb0ec2eeb8b15a2d298723882ec8f", "8791ebf0cd6475770be25459df669fe5da99ebe1" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Fri Sep 19 15:50:13 2014 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Fri Sep 19 15:50:13 2014 -0700" }, "message": "resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp\n\nChange-Id: Ifedb15de5a4db6cb0238fec93aaa2d95f1844694\n" }, { "commit": "ece13f90ed7d5cd4d025af34a6651cd32c2cbaf3", "tree": "754b84e4f50c2ae93d3f874bc07b7ee3438eb775", "parents": [ "c058fbb5a0a4c9ba4951a07bf2786e0f41453be7", "8791ebf0cd6475770be25459df669fe5da99ebe1" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Fri Sep 19 15:37:15 2014 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Fri Sep 19 15:37:15 2014 -0700" }, "message": "resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aosp\n\nChange-Id: I9d0f81003f84d03a7a67420dd496fde18dd654d4\n" }, { "commit": "0fa7511db2ec1e2326938f92262d00f23876307e", "tree": "79fe6be8c92ccf3acef647bbaa3ee85e6f890890", "parents": [ "e83bc5932eba4af67e2cd7b76648ae26740b9b01", "a7d1a111c7176fdf853e53e74f6c7c7843c3c81c" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Sep 19 19:08:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 19 19:08:50 2014 +0000" }, "message": "am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge \"Fix backwards compat problem with AAPT public attrs\" into lmp-dev\n\n* commit \u00279ee3ba23395bd1a13bbfd3fe523ee611a5ca001b\u0027:\n Fix backwards compat problem with AAPT public attrs\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": "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": "bcaaebb8a881951720190f4a6b9ffcbf871542af", "tree": "258c9fa9e32da4e7403ea09438ca23cb50845c90", "parents": [ "296a712e6b3fd48b5ace1128fa68547fdb8de84d", "715d01aedf7e789a37f7aac8f41827bfddcc0634" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Sep 11 23:21:13 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 11 23:21:14 2014 +0000" }, "message": "Merge \"Clean up test makefiles.\"" }, { "commit": "715d01aedf7e789a37f7aac8f41827bfddcc0634", "tree": "ed25db7ba2977a255f1b2ac5f41b0f0540830b01", "parents": [ "f4eaaadb8cb0e2ff8d1704827883b5a62173311d" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Sep 08 18:41:01 2014 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Sep 11 15:49:57 2014 -0700" }, "message": "Clean up test makefiles.\n\nThe build system takes care of linking the correct STL and gtest\nlibraries for you, and specifying them manually confuses the build\nsystem when using libc++.\n\nChange-Id: I9f76ab26a63ace51293614cfb5ca002f37438e02\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": "d299fef90c3fcbb10ea1803f700d7a363769273a", "tree": "5cf90c86b36786e52dc7cdc9923b44f1dd7fd7e4", "parents": [ "28b4a5d058306b195597f80c696a8dd73885b05b", "ee9fe59050728b1a3a8d2cdff6928294c71aebf9" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 29 23:53:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 29 23:53:37 2014 +0000" }, "message": "am a7e85db1: am fe622efc: Merge \"Add test to ensure themes get copied from separate resource tables\" into lmp-dev\n\n* commit \u0027a7e85db12557c0480e3836c414519b28331d502c\u0027:\n Add test to ensure themes get copied from separate resource tables\n" }, { "commit": "9d9cc6233c7035c32d3b8622aa5dc7d413193dc7", "tree": "4cd16aa103935fadde447a88f2245159be3e8881", "parents": [ "0ae64a84af9304bb493bc9bf0e0f32cac564ec48" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 29 14:10:04 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 29 14:34:54 2014 -0700" }, "message": "Add test to ensure themes get copied from separate resource tables\n\nChange-Id: I94e9966cf1e9d0e7e6c7daa0606a87bb0f67705e\n" }, { "commit": "1ff88036da46581606fa4299717d67a80b15c4c1", "tree": "ca563e419494a000bf5480991deb5f4585825586", "parents": [ "d6fe30be04717aed8282da396607db8c44f165b3", "de99f4a2347a8cd5ac360097709bbe2f5ea33545" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 29 20:05:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 29 20:05:19 2014 +0000" }, "message": "am 0f885328: am b9095bac: Merge \"Clean up test allocations so real memory leaks are more visible\" into lmp-dev\n\n* commit \u00270f885328bc54e896d0f3cdf2faf25abaab95bece\u0027:\n Clean up test allocations so real memory leaks are more visible\n" }, { "commit": "d79e33379d56e20b7dd67baa992409b72a335ded", "tree": "94ad4f94d041493db6e92768299bd1ece0972dc0", "parents": [ "5283faba4a75a4d1fd9990637d22768e423895e3" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 29 12:29:31 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 29 12:29:31 2014 -0700" }, "message": "Clean up test allocations so real memory leaks are more visible\n\nChange-Id: Ic405f08c8d8e3e7fc4e4a991671e980752c19899\n" }, { "commit": "ec187b726b9227239f7a678e0872f52f53dfa271", "tree": "3eabd2079342b40b2be8773b290286a074e152fd", "parents": [ "2966c8689d372a78acd1c9e24ad32f68d4c7b17c", "88fff68115122e1a48099a9a6edc792cf411a22f" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 29 18:49:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 29 18:49:14 2014 +0000" }, "message": "am 1ec1f85d: am 995c771f: Merge \"Fix memory leak in ResTable\" into lmp-dev\n\n* commit \u00271ec1f85d6ebab39f3aad6f426e0fe0aeca2b04bb\u0027:\n Fix memory leak in ResTable\n" }, { "commit": "343cabb3164db138afbaaae5b145c0ff6a10814a", "tree": "d176151281dbd5a97f5db377c711b09efd94d2c3", "parents": [ "2419629be7c5721e062b5232a981b2918e07dad3", "9e05bd189b7e6a189ef89feb97adb34c16207826" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 29 18:48:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 29 18:48:33 2014 +0000" }, "message": "am 60f193fb: am e0cfbb61: Merge \"Stamp platform version code into app Apks\" into lmp-dev\n\n* commit \u002760f193fbe905f65750503cdaf8616d31c85016d6\u0027:\n Stamp platform version code into app Apks\n" }, { "commit": "a9aa9f045836ca03b378653728476f9a298f5260", "tree": "6a4fc4b0214ff261100811026fdacdc7e8b545a9", "parents": [ "97bf45464c056abecfef50a7cc52617344b22de1", "7f668d03ceec1ce1732f51cfe9828e6376bbecbc" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 29 05:27:46 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 29 05:27:49 2014 +0000" }, "message": "Merge \"Fix memory leak in ResTable\" into lmp-dev" }, { "commit": "7f668d03ceec1ce1732f51cfe9828e6376bbecbc", "tree": "fc6c026c372a9d8b7e32dcf81e1bf36a2d5aa3b2", "parents": [ "01abcaa295fc4eec7442a575d160b0ce2c250127" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Aug 28 18:32:32 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Aug 28 18:32:32 2014 -0700" }, "message": "Fix memory leak in ResTable\n\nWe were basically never cleaning any of the\ncached bags... oops :S\n\nBug:16683269\nChange-Id: Ic0a44218f660e16fbaac8df1d61ce6f1fdb0018b\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": "6d41a45679080f9caa7b223c1b186285fe121cd8", "tree": "e5554745adc6b8ab5ce6abfa144f30322b4a526b", "parents": [ "a6bf005a3e24479807d18dcf97b7edd92dcede05", "31341665d6b2f43ff70fc89630ac17c4e3f91400" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Aug 26 17:23:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 26 17:23:35 2014 +0000" }, "message": "am 1d3ecf16: am 1c959e92: Merge \"Introduce anydpi density resource qualifier\" into lmp-dev\n\n* commit \u00271d3ecf16766d92ef3d847f1420b9a622e871f6cd\u0027:\n Introduce anydpi density resource qualifier\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": "ad2d9357637ae6d0a9d721af26c6e72148b0b8cd", "tree": "6c677d20644c651b893c8d9a80bb81cb854e0d5f", "parents": [ "1e1d24390151b2ae710420f679007b3a91c4a49e", "c406bde7a10dbfe9fefa86b7a8e14dd2370cebed" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Aug 21 17:48:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 21 17:48:33 2014 +0000" }, "message": "am c931d0d8: am fcb42104: Merge \"AAPT: Fix regression generating dynamic ref table for shared libraries\" into lmp-dev\n\n* commit \u0027c931d0d8540f7648d5bb247fa1b03e492363debb\u0027:\n AAPT: Fix regression generating dynamic ref table for shared libraries\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": "fc1b26fc68573851029e8b988d351d081a08ed0d", "tree": "86edc779fb090ddc29cc3fcca778e94ee6d32ed2", "parents": [ "b47e183ca950213318f913a87af839e362c9a302", "626e1c65ef408fd9eb7d3bbbbb90137e90c82a4e" ], "author": { "name": "Piotr Jastrzebski", "email": "haaawk@google.com", "time": "Mon Aug 18 09:12:39 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 18 09:12:39 2014 +0000" }, "message": "am 626e1c65: am 8a28e16c: Merge \"Update ziparchive usage to the new API.\"\n\n* commit \u0027626e1c65ef408fd9eb7d3bbbbb90137e90c82a4e\u0027:\n Update ziparchive usage to the new API.\n" }, { "commit": "ab9b1f5b2a12352f901520445d113cbdd570cc95", "tree": "3ee20b2c6b038a7596751dbd6999ca82e02a678c", "parents": [ "a4dd2c336f289b67d194056b9d4acd9ab5676ab5", "9e4056b7af8c2297bd86983607d3fe3f01464e35" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 22:07:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 15 22:07:59 2014 +0000" }, "message": "am 5bcfb6b9: am 2fdf2db8: Merge \"Fix assumption about DynamicRefTable in aapt\" into lmp-dev\n\n* commit \u00275bcfb6b98261c94a6ff33438e6b29ca71bb3c0eb\u0027:\n Fix assumption about DynamicRefTable in aapt\n" }, { "commit": "2cb761e3ddb9d68ab430013e9cd15ecaab9fbc62", "tree": "2bd700b1bc3ae8d3855103c1a82c229d5d79e131", "parents": [ "4482e4bb8d1f5fe586b641bc3d6298dc7b8fee80" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 13:59:02 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 14:01:43 2014 -0700" }, "message": "Fix assumption about DynamicRefTable in aapt\n\nPackages without any resources should not expect to have\na DynamicRefTable.\n\nBug:16895517\nBug:17056720\nChange-Id: Id006f6bdbf08f30505f6ba5982bc9d1b09db0f0a\n" }, { "commit": "f6530bca9b67eebeefd534014d9b87e49aae078e", "tree": "7b250dc8479ed385be236944e8ad08bb21be441a", "parents": [ "0c32d01e2363a700694cd0b394a44666d1c3293a", "a25222f5dcc68815b012e2b3c2822ed80683af57" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 17:32:04 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 15 17:32:04 2014 +0000" }, "message": "am e9e52a2a: am 41cdc4c7: Merge \"Revert \"Fix aapt dump for APKs with no resources\"\" into lmp-dev\n\n* commit \u0027e9e52a2ae2e80286447767b9a83b04d88c41c112\u0027:\n Revert \"Fix aapt dump for APKs with no resources\"\n" }, { "commit": "e2134a4b5dafc37f2de7e9b4190819f24aac207c", "tree": "c549a9bc3e49676b74a449d3081cdaec1ff36a5f", "parents": [ "4179e88963456946fe6e580f2211341cc8ccba5c" ], "author": { "name": "Piotr Jastrzebski", "email": "haaawk@google.com", "time": "Wed Aug 13 07:50:20 2014 +0100" }, "committer": { "name": "Piotr Jastrzebski", "email": "haaawk@google.com", "time": "Fri Aug 15 14:41:08 2014 +0100" }, "message": "Update ziparchive usage to the new API.\n\nBug: 16162465\n\nChange-Id: If3064e2be3e7e85366b07434294a7879b0e5f9bc\n" }, { "commit": "ac44bd1c5bb6cedb5b9b052d1d66ef9165252bb9", "tree": "bae6dbc596fbd083a1ff47223f5719bad614eb9d", "parents": [ "30f5639cb793b0cc86dc6fac3c671e7facaa64f7", "5b9c045a6a716432dce2d04c6bceb5038facc7b6" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 11:51:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 15 11:51:01 2014 +0000" }, "message": "am 4e790e9e: am b4c3c976: Fix crash in ResStringPool\n\n* commit \u00274e790e9e4b820290284a78c4258d4d60e8d37320\u0027:\n Fix crash in ResStringPool\n" }, { "commit": "fd9205603a353a19e000dc8c529086e3874b0828", "tree": "50ac82e52f03aeb418b8942967a140f0dcc7ec83", "parents": [ "20ad556d759c87b5ecb2b52ab1b3c4ee8c1eec16", "bf4c1cfc5b95cffa9e7c526aeb8bcbfdc848264d" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 11:49:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 15 11:49:20 2014 +0000" }, "message": "am f3e588ba: am 83b8dc7e: Merge \"Fix aapt dump for APKs with no resources\" into lmp-dev\n\n* commit \u0027f3e588bae0b6bdfef1c09f739b68b3e07548f58f\u0027:\n Fix aapt dump for APKs with no resources\n" }, { "commit": "20ad556d759c87b5ecb2b52ab1b3c4ee8c1eec16", "tree": "98fb26ea58cd78479b90c214c3b200c4d66a7705", "parents": [ "90955a5c626f11c35c846c178e074772270328d9", "76245611014a9a0d9823cb64edf7cd124a67b515" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 11:49:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 15 11:49:15 2014 +0000" }, "message": "am 3c9b2a54: am b6355bcb: Merge \"Print xxxhdpi from ResTable_config::toString\" into lmp-dev\n\n* commit \u00273c9b2a540e123a17c91883dd48fb703c6a31982d\u0027:\n Print xxxhdpi from ResTable_config::toString\n" }, { "commit": "4b2d0f20db2e0f9395a0c12ed5d4b6020eb272cb", "tree": "c3f363ba74a9f6ce48ca3318b8672dea2a43ff0d", "parents": [ "82d6d337b389ef088879a5e527d44c75c41c5b44" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Aug 14 17:58:37 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 06:39:01 2014 +0000" }, "message": "Fix crash in ResStringPool\n\nWhen a String isn\u0027t found in the StringPool,\nwe should not try to construct a String8 object\nfrom the NULL string.\n\nBug:15163956\nChange-Id: I51e701918b10a72c18a860b8a36dce2afd9c0b82\n" }, { "commit": "89147ed84b140d83e144ad9eaa568cc9c6fb514c", "tree": "176f1f15bcd79de7ebe99a7d8684e8bd104ba6ce", "parents": [ "261e240c05a32aec20022ae3f527dafea5f3f0d8", "18560886cbb7825c1bb034c96e5d0cd4dbdbb8ee" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 17:19:51 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 15 04:37:53 2014 +0000" }, "message": "Merge \"Revert \"Fix aapt dump for APKs with no resources\"\" into lmp-dev" }, { "commit": "18560886cbb7825c1bb034c96e5d0cd4dbdbb8ee", "tree": "a286eed127d66b4d09a4a2cb6caf8656bf83a2ff", "parents": [ "e23a91e2bdab06e3c0c64201e88e50ab76c6b74b" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 17:18:21 2014 +0000" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 17:18:21 2014 +0000" }, "message": "Revert \"Fix aapt dump for APKs with no resources\"\n\nThis reverts commit 0e475302cd196f45a01a525c49089018b238d4ba.\n\nI\u0027ll re-upload this CL with the correct fix in LoadedApk.\n\nChange-Id: I17c6381f8e5907dab9f996f89c5d435b9c08a13a\n" }, { "commit": "e23a91e2bdab06e3c0c64201e88e50ab76c6b74b", "tree": "aba593b1c33e6f76fc7efca40e50a976dbff4480", "parents": [ "0204938659d93347081caec107661ea3734f1a65" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Aug 14 13:53:34 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Aug 14 21:20:41 2014 +0000" }, "message": "Fix aapt dump for APKs with no resources\n\nAll APKs are expected to have at least one resource table (even if\nit is empty). We were missing the creation of an empty DynamicRefTable.\n\nBug:16895517\nChange-Id: I6a6e887f91b3b4bbcc52b3fd2741ef3d05fab1fd\n" }, { "commit": "d7df9d7b38064b81e1b035893001499e79fc3cc0", "tree": "72ff9f9e57ab56729a9d76bc208eeb6fba616c49", "parents": [ "ea39c1be300dd1ebfec4a90052f4b44847a278f9", "e23a91e2bdab06e3c0c64201e88e50ab76c6b74b" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 15 01:15:51 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 14 16:46:52 2014 +0000" }, "message": "Merge \"Fix aapt dump for APKs with no resources\" into lmp-dev" }, { "commit": "8d5667d2a283bc9e35cfe8a7e77c9143c8957004", "tree": "543816072cca333b4515c741a693e01b07f576ec", "parents": [ "4473ec5a5b39248377ce1596cdae83715b513413" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Aug 13 21:02:57 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Aug 14 21:35:37 2014 +0000" }, "message": "Print xxxhdpi from ResTable_config::toString\n\nChange-Id: I2e1a07649cb498c12023b198d8e50534f9d91840\n" }, { "commit": "9014777956e248d9f47015380a10b0310302400c", "tree": "711b4100de8d98f9057090c57cba843590be5bc0", "parents": [ "41ab2709a9deca041f5e2789b9e1c1cba122ee6f", "f9706b9e6a4d31e896d3cafea895a06baf2ea25c" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Aug 11 18:03:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 11 18:03:20 2014 +0000" }, "message": "am ff8afc33: am 248da634: Merge \"Fix shared library bug in bag attributes\" into lmp-dev\n\n* commit \u0027ff8afc3309d98796767a8859a9a2e262fe1fc165\u0027:\n Fix shared library bug in bag attributes\n" }, { "commit": "ccf25c7bf69eb8c04246e3f79da31b52c2922a80", "tree": "c0b7f90e9ad86e32c3fac4d289a49eaf69db99eb", "parents": [ "1584609f422c338ade65b8b4078b434ba3a81253" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 08 15:32:40 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Aug 11 09:16:01 2014 -0700" }, "message": "Fix shared library bug in bag attributes\n\nA ResTable_map entry has a name attribute, which\ncould be a dynamic reference if it comes from\na shared library. It was not being patched with\nthe correct package id.\n\nBug:16795890\nChange-Id: Ia8df6a943269b2fefb2132c3ed74eb1997d7701b\n" }, { "commit": "6da63f63a215c4bb6582bb7657e209eeae4d2f19", "tree": "0c53b34fd3c304729b7dcd3aabac3334c94f1437", "parents": [ "9b03b15907c570034262a02cf5f32a3e151a7d79", "388aedee0483ed7132849584816b86c1a4377799" ], "author": { "name": "Piotr Jastrzebski", "email": "haaawk@google.com", "time": "Mon Aug 11 10:04:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 11 10:04:56 2014 +0000" }, "message": "am 388aedee: am 07291ccc: Merge \"Remove memory leak.\"\n\n* commit \u0027388aedee0483ed7132849584816b86c1a4377799\u0027:\n Remove memory leak.\n" }, { "commit": "1a68b079d714b1de52775e1153359f2867340754", "tree": "1f0ff93c4689f72fec09b5975b80c464df25f189", "parents": [ "94f3e47da5acc48b1003b64acdc539cdf6cbe30c" ], "author": { "name": "Piotr Jastrzebski", "email": "haaawk@google.com", "time": "Fri Aug 08 12:52:39 2014 +0100" }, "committer": { "name": "Piotr Jastrzebski", "email": "haaawk@google.com", "time": "Mon Aug 11 08:20:35 2014 +0100" }, "message": "Remove memory leak.\n\nCall EndIteration in endIteration to free memory allocated for cookie in\nStartIteration.\n\nChange-Id: I3d58a461c2f3676565cfd7922dc6d8d5c35feae9\n" }, { "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": "f28d505dc5f72d82cd791a5b9c7be3775eab75e5", "tree": "f49a0df6b4763d401be0a80a749dc1cc069109e7", "parents": [ "f4bf67012b2109ead9a4cb9c4407563fc3671255" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jul 25 15:25:04 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jul 29 17:42:34 2014 +0000" }, "message": "Ensure the ResTable data is at least the size of a ResTable_header\n\nChange-Id: Ib8d5574bd6a125797a582837987332e66721e84d" }, { "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": "6a4deeda70698d7574d20a97c746ed2ba52f5b8d", "tree": "8a5a645cd3c681fa27835f14a712bac998840867", "parents": [ "92b1896dfd42079c264e68f819273ba71f177fea" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Jul 09 16:58:28 2014 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Jul 09 16:58:28 2014 -0700" }, "message": "Switch frameworks/base/libs/androidfw to the new icu.\n\nChange-Id: Id82830750dd7e83bbc66811a1133b403cc697c97\n" } ], "next": "e8e968a7c6f08c8db0603143d775863301cb03d6" }