OSDN Git Service
Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:40 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cd4aea64f6 skipped:
f028c34cdc
Change-Id: I5c0a1faf8d1dc7bf5d6fc831b61ab40697a422d5
Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:32 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cd4aea64f6
Change-Id: I8ba42b65a49ff3e9c30e56dc8664bc8a942b4d25
Bill Yi [Thu, 5 Jul 2018 21:45:03 +0000 (14:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib37886b826a61cf234e745494df8f57f58aafda6
Auto-generated-cl: translation import
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f skipped:
c3e741e530
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into nyc-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing
Atanas Kirilov [Wed, 27 Jun 2018 23:26:08 +0000 (23:26 +0000)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into nyc-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c
RESTRICT AUTOMERGE: Backporting of b/
77821568
Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c
RESTRICT AUTOMERGE: Backporting of b/
77821568
Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd skipped:
430c4395a3
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c
RESTRICT AUTOMERGE: Backporting of b/
77821568
Atanas Kirilov [Wed, 27 Jun 2018 23:25:27 +0000 (23:25 +0000)]
Merge "Backporting of b/
77821568" into oc-dev
TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4
Import translations. DO NOT MERGE
Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:12 +0000 (12:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
Change-Id: Iae0ad51f828f91b8211e0671900f2ffa1265c655
Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:05 +0000 (12:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4
Change-Id: I3f93da28223af89a03736689e7f35a723b864ff5
Bill Yi [Sun, 17 Jun 2018 12:13:32 +0000 (05:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I681a0e79a709f3cabf8b661ec5229480d99dd840
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 17 Jun 2018 10:03:39 +0000 (10:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b
Change-Id: I387f439df9441d64a658344837e4a2bd0f88a128
Android Build Merger (Role) [Sun, 17 Jun 2018 10:03:31 +0000 (10:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d
Change-Id: I6a3ddad855bdc4ae74eab3e6e2cd42290176aab4
Bill Yi [Sun, 17 Jun 2018 10:02:56 +0000 (03:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied5693d3e59e24f43a7a1577471819c269c7d6df
Auto-generated-cl: translation import
Makoto Onuki [Tue, 12 Jun 2018 20:01:42 +0000 (13:01 -0700)]
Backport Prevent shortcut info package name spoofing
Test: cts-tradefed run cts -m CtsShortcutManagerTestCases -t android.content.pm.cts.shortcutmanager.ShortcutManagerFakingPublisherTest
Bug:
109824443
Change-Id: I90443973aaef157d357b98b739572866125b2bbc
Merged-In: I78948446a63b428ae750464194558fd44a658493
Android Build Merger (Role) [Wed, 13 Jun 2018 21:43:03 +0000 (21:43 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f skipped:
c3e741e530
Change-Id: I7aaf06ed4a169b6db7857a6eaa79358cfce7054b
Android Build Merger (Role) [Wed, 13 Jun 2018 21:42:56 +0000 (21:42 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a am:
06848a3f8f
Change-Id: I0c720e9e4186238ba33eeceae2da377ba2831c29
Android Build Merger (Role) [Wed, 13 Jun 2018 21:42:48 +0000 (21:42 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am:
2f7d50058a
Change-Id: I1a8b7786bd91bf8c585da02891dad3ceee9db393
Makoto Onuki [Tue, 12 Jun 2018 20:01:42 +0000 (13:01 -0700)]
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing
Test: cts-tradefed run cts -m CtsShortcutManagerTestCases -t android.content.pm.cts.shortcutmanager.ShortcutManagerFakingPublisherTest
Bug:
109824443
Change-Id: I80b2680d9c7e067f1a36fc8ad1aac1d315022a71
Hongming Jin [Fri, 18 May 2018 17:47:57 +0000 (10:47 -0700)]
Backporting of b/
77821568
Enforce permission check before returning application info
Test: manually tested (see bug for repro steps)
Bug:
77821568
Change-Id: Iec13196250f0e5d8b54fd7060ed40e3fe3fe2827
Merged-In: I7554805c36c0c2552163dad7b07cfc5f552b624e
Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:48 +0000 (18:09 +0000)]
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd skipped:
430c4395a3
Change-Id: I38571525dec3ebc35284cc9a8ae0044a8e9e237c
Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:40 +0000 (18:09 +0000)]
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e am:
0eda2602cd
Change-Id: I9692df95413c51715508b664b5bc3ea02462da55
Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:32 +0000 (18:09 +0000)]
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4 am:
24d402096e
Change-Id: Ia7340c71283b7f88378e34584b373cce180262ec
Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:24 +0000 (18:09 +0000)]
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4
Change-Id: I8a090de1075d6d30590ac1e535de841164753758
Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:16 +0000 (18:09 +0000)]
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c
Change-Id: I12a6a00f11b2d94d3ac112a2f18284e13062a814
akirilov [Thu, 7 Jun 2018 21:36:25 +0000 (14:36 -0700)]
RESTRICT AUTOMERGE: Backporting of b/
77821568
Enforce permission check before returning application info
Test: manually tested (see bug for repro steps)
Bug:
77821568
Change-Id: I5d81345b2d958c2bb0a62bbcb8bd8c714a1cf41e
TreeHugger Robot [Mon, 11 Jun 2018 18:19:38 +0000 (18:19 +0000)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:19:38 +0000 (18:19 +0000)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:19:38 +0000 (18:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 11 Jun 2018 18:03:15 +0000 (18:03 +0000)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:03:15 +0000 (18:03 +0000)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:03:15 +0000 (18:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Sun, 10 Jun 2018 06:30:57 +0000 (06:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295
Change-Id: Idb34650f4e4ffa9086addb3fc25cf528c9b60aa8
Android Build Merger (Role) [Sun, 10 Jun 2018 06:30:51 +0000 (06:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4
Change-Id: Ic0e6aac64c5724221ca6fa3d75d0d0d463cfe9ab
Bill Yi [Sun, 10 Jun 2018 06:30:29 +0000 (23:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9dcb973ffe7bab8894c863087532615f8c360806
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 10 Jun 2018 06:24:19 +0000 (06:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464
Change-Id: I7b5711eabd8f101cc5c268c2469a7f94582e4144
Android Build Merger (Role) [Sun, 10 Jun 2018 06:24:12 +0000 (06:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa
Change-Id: I6e31b858c5da4119d4c331c2d568cb80e77711b5
Bill Yi [Sun, 10 Jun 2018 06:23:50 +0000 (23:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icccc1ebb6e107e09ed59b9b1b6a235e6d2f4f6fe
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 10 Jun 2018 05:32:27 +0000 (05:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d
Change-Id: I86175e2cc228f4675e51e31597dbb8df7139a84d
Android Build Merger (Role) [Sun, 10 Jun 2018 05:32:22 +0000 (05:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d
Change-Id: Iff4d2ee449e66e45d078e3ed7b756de703099f9c
Bill Yi [Sun, 10 Jun 2018 05:32:06 +0000 (22:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I78cebcdc6b07666675b4ef17fc9052e02b0ad087
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 10 Jun 2018 05:26:04 +0000 (05:26 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce
Change-Id: I73ec9c33f82e9c2e15430a95b61c500e06ae4c38
Android Build Merger (Role) [Sun, 10 Jun 2018 05:25:57 +0000 (05:25 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42
Change-Id: I3860b45554cd0577a1aab3242537ff1735339ed3
Bill Yi [Sun, 10 Jun 2018 05:25:32 +0000 (22:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I476e13a712f47f3341ffd397570789e43120b9ae
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 10 Jun 2018 05:14:01 +0000 (05:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4
Change-Id: I8b7d9d4aea3f4f8c049c7dc16bdb8294396c1606
Android Build Merger (Role) [Sun, 10 Jun 2018 05:13:55 +0000 (05:13 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743
Change-Id: Iedcf37b86d6a03f8a8f47f1f9be1ffec5b25d107
Bill Yi [Sun, 10 Jun 2018 05:13:39 +0000 (22:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1a91a7546288d359f218d7464c56941a60d67715
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 10 Jun 2018 05:01:56 +0000 (05:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39
Change-Id: I477c280a281f7b77477536bf3f3a4b09181f0333
Android Build Merger (Role) [Sun, 10 Jun 2018 05:01:49 +0000 (05:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58
Change-Id: Id7cfd1b43d8c60ebef0b5ffd6e88f2460d511ec3
Bill Yi [Sun, 10 Jun 2018 05:01:22 +0000 (22:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3ffe48b163bb272ff4b7daea639827cadba8a1c2
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 10 Jun 2018 04:15:10 +0000 (04:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe
Change-Id: Ibff061c7234a3805ed90d8460ce4ca79d3d112ee
Android Build Merger (Role) [Sun, 10 Jun 2018 04:15:01 +0000 (04:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8
Change-Id: Iae2ab9a66d4834c4a85e6bb9eadaa6df54914726
Bill Yi [Sun, 10 Jun 2018 04:14:35 +0000 (21:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0c0c18bb96c48d78238da765262543133e289c60
Auto-generated-cl: translation import
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into nyc-mr1-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into nyc-dr1-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into nyc-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f am:
648a950ce9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into nyc-mr2-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into cw-f-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into nyc-mr1-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into nyc-dr1-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into nyc-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030 am:
a659d7c233 am:
c51c6751d7
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030 am:
a659d7c233
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into nyc-mr2-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030 am:
a659d7c233
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into cw-f-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
Android Build Merger (Role) [Wed, 6 Jun 2018 17:13:15 +0000 (17:13 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f am:
648a950ce9
Change-Id: I313ac2c564ba5c8f094a37160d9ac5198f1d5aea
Android Build Merger (Role) [Wed, 6 Jun 2018 17:13:01 +0000 (17:13 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f
Change-Id: I2d0676d161e47b400d110c3239cdaaf002c72ec3
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:53 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628
Change-Id: Ia7adde45bd85d2b3a56ede7215732cc05d97d870
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:46 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
Change-Id: I6e7ab766f6c88e61b8c2993a2f1420efc177319a
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:39 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
Change-Id: I43c9c68ca69d26f6d4d2dee3cd2a66d5e4a73761
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:24 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
Change-Id: Ib9e372290f9b2e1fa73470db3f7fd67bc9190711
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:18 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
Change-Id: I0556ef6fb1ceb02f4972c7434895cfeb5e13188d
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:11 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
Change-Id: I17fcbac2b6a7860749ddaabf6324cd89e3b78570
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:04 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Change-Id: I17682a41fbacafd30a032bd78b176a883bc7bdd8
Ryan Mitchell [Wed, 30 May 2018 19:17:01 +0000 (12:17 -0700)]
Fix DynamicRefTable::load security bug
DynamicRefTables parsed from apks are missing bounds checks that prevent
buffer overflows. This changes verifies the bounds of the header before
attempting to preform operations on the chunk.
Bug:
79488511
Test: run cts -m CtsAppSecurityHostTestCases \
-t android.appsecurity.cts.CorruptApkTests
Change-Id: I02c8ad957da244fce777ac68a482e4e8fa70f846
Merged-In: I02c8ad957da244fce777ac68a482e4e8fa70f846
Android Build Merger (Role) [Wed, 6 Jun 2018 16:28:11 +0000 (16:28 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077
Change-Id: I2e91e2573efec1a54eef83a93dfc7b99f20cda7b
Android Build Merger (Role) [Wed, 6 Jun 2018 16:28:04 +0000 (16:28 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b
Change-Id: I0f2860081d8a65d239d0beba1499bb69c3527c2c
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:57 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887
Change-Id: I0e91789c55c400c15315c51e0f99f3a44ed2d913
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:50 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af
Change-Id: If7742e7a94602f120b1ec1db9ff763998adae344
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:43 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540
Change-Id: I3b08cf27f6407fdf5789f8a49c3b3aa49f1c1ecd
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:30 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93
Change-Id: I23ca86e3bf3df6684d88f1be575f2be1599ac9eb
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:24 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6
Change-Id: Ida4ae11d778115fb1f0d373523f71845fff88331
OSDN Git Service
