OSDN Git Service
Atanas Kirilov [Sat, 29 Sep 2018 00:53:41 +0000 (17:53 -0700)]
Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev am:
7b08baaa2a
am:
86fd67ac10
Change-Id: Iae5fb04618205bd0c56a63ce160efe3b2eddc8a2
Atanas Kirilov [Sat, 29 Sep 2018 00:40:28 +0000 (17:40 -0700)]
Merge changes from topic "am-
9d36a543-b4f5-4e8c-89c9-
8dc49a83a644" into oc-dev am:
3262a5ad5f
am:
3bb25f8b87
Change-Id: Ie24920330ea3045c663c8717838883d67c26f0b1
Atanas Kirilov [Sat, 29 Sep 2018 00:30:48 +0000 (17:30 -0700)]
Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev am:
74d82f556d
am:
3f2bc41d8b
Change-Id: I73e9ef317927f133497b0fbf2b05f6e1b279f8c0
Atanas Kirilov [Sat, 29 Sep 2018 00:26:46 +0000 (17:26 -0700)]
Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev
am:
7b08baaa2a
Change-Id: Ie963bfc2a22b5c2cb84e71611af755dc23594086
Atanas Kirilov [Sat, 29 Sep 2018 00:22:01 +0000 (17:22 -0700)]
Merge changes from topic "am-
9d36a543-b4f5-4e8c-89c9-
8dc49a83a644" into oc-dev
am:
3262a5ad5f
Change-Id: I148aeead42b1f969cb8ff5153d7d296e84b0f4a7
Atanas Kirilov [Fri, 28 Sep 2018 23:54:41 +0000 (16:54 -0700)]
Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev
am:
74d82f556d
Change-Id: I4344edb030e161565b0a0b0203463668cbfd5a8b
Atanas Kirilov [Fri, 28 Sep 2018 23:21:09 +0000 (23:21 +0000)]
Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev
Atanas Kirilov [Fri, 28 Sep 2018 23:20:32 +0000 (23:20 +0000)]
Merge changes from topic "am-
9d36a543-b4f5-4e8c-89c9-
8dc49a83a644" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986 am:
79c6a599fe am:
446837c874 am:
84b50e6a10 skipped:
90b8425c0b
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986 am:
79c6a599fe am:
446837c874 am:
84b50e6a10
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986 am:
79c6a599fe am:
446837c874
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986 am:
79c6a599fe
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."
Atanas Kirilov [Fri, 28 Sep 2018 23:20:29 +0000 (23:20 +0000)]
Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev
Android Build Merger (Role) [Fri, 28 Sep 2018 20:35:10 +0000 (20:35 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986 am:
79c6a599fe am:
446837c874 am:
84b50e6a10 skipped:
90b8425c0b
Change-Id: I614084f668b63261c14748b9dc0faf7c94aaedbd
Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:53 +0000 (20:34 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986 am:
79c6a599fe am:
446837c874 am:
84b50e6a10
Change-Id: I2df84d1d165f276b0da0aa58c4945f9a5d89e31f
Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:40 +0000 (20:34 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986 am:
79c6a599fe am:
446837c874
Change-Id: I01bfdf7bcc657acf3827aa0b1675adf107562f8a
Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:28 +0000 (20:34 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986 am:
79c6a599fe
Change-Id: I094a6ffa8dee70d4f9f45c4f8d9929d92b078cec
Atanas Kirilov [Fri, 28 Sep 2018 20:22:08 +0000 (20:22 +0000)]
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."
This reverts commit
05dc947c63a2304adce53a0aef6b0e0a9db9343a.
Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug:
114365189
Change-Id: Id667b1c4d1a1af27837f553d7461283b22e5e41f
Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:21 +0000 (20:34 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986
Change-Id: I178b86c62e2b0e8d3399897adaa3bfc191daea2d
Atanas Kirilov [Fri, 28 Sep 2018 20:21:54 +0000 (20:21 +0000)]
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."
This reverts commit
8da6786608e374c20ae584b1c404fd4894786e46.
Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug:
114365189
Change-Id: I1826a5b6889f21fbbe16311a3da66c93e26383f3
Atanas Kirilov [Fri, 28 Sep 2018 20:16:37 +0000 (20:16 +0000)]
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
This reverts commit
821076440434443af4257c5ba0b7b1f037735041.
Reason for revert: triggers other issue.
Bug:
114365189
Change-Id: If6f500e8abdc343774c5e853ba8e7c457ffa5961
Wayne Lin [Thu, 13 Sep 2018 07:34:10 +0000 (15:34 +0800)]
[DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control
SUPL_ES=1 ensures the GnssLocationProvider and related framework code
accepts incoming SMS SUPL_INIT messages with ES-bit=1
(which allow redirection of the ESLP
end-point e.g. to the current local emergency services provider when
you are travelling) only during an emergency call
Bug:
115331218
Bug:
112159033
Test: Build pass
Change-Id: I5075f7887a184ce18bb1815b35a2ce7acd8bca10
Michael Wachenschwanz [Thu, 6 Sep 2018 02:01:27 +0000 (19:01 -0700)]
Merge changes from topic "am-
bdb0270e-8295-4ee6-be36-
2709e172d48f" into oc-dev am:
d32c2a4189
am:
1f5050c054
Change-Id: Ibae3dc08eabf5b12a8f1a03ea33bd54a28e0442e
Michael Wachenschwanz [Thu, 6 Sep 2018 01:46:57 +0000 (18:46 -0700)]
Merge changes from topic "am-
bdb0270e-8295-4ee6-be36-
2709e172d48f" into oc-dev
am:
d32c2a4189
Change-Id: Ie2ad590368e9c10f6222d9ae65470ebb12dabac2
Wale Ogunwale [Thu, 6 Sep 2018 01:33:33 +0000 (18:33 -0700)]
[automerger skipped] Merge "Hide overlay windows when requesting media projection permission." into oc-dev am:
0d4d38e3f9 -s ours
am:
79ee5768da -s ours
Change-Id: Ie429d150c54c05fa8eae11a9606352228eb86be1
TreeHugger Robot [Thu, 6 Sep 2018 01:29:28 +0000 (01:29 +0000)]
Merge changes from topic "am-
bdb0270e-8295-4ee6-be36-
2709e172d48f" into oc-dev
* changes:
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf am:
628cbe5c53 am:
433e4173ec am:
686897ddd9
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf am:
628cbe5c53 am:
433e4173ec
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf am:
628cbe5c53
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3
Verify number of Map entries written to Parcel
TreeHugger Robot [Thu, 6 Sep 2018 01:29:28 +0000 (01:29 +0000)]
Merge changes from topic "am-
bdb0270e-8295-4ee6-be36-
2709e172d48f" into nyc-mr2-dev
* changes:
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf am:
628cbe5c53 am:
433e4173ec
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf am:
628cbe5c53
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3
Verify number of Map entries written to Parcel
TreeHugger Robot [Thu, 6 Sep 2018 01:29:28 +0000 (01:29 +0000)]
Merge changes from topic "am-
bdb0270e-8295-4ee6-be36-
2709e172d48f" into cw-f-dev
* changes:
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf am:
628cbe5c53
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3
Verify number of Map entries written to Parcel
TreeHugger Robot [Thu, 6 Sep 2018 01:29:28 +0000 (01:29 +0000)]
Merge changes from topic "am-
bdb0270e-8295-4ee6-be36-
2709e172d48f" into nyc-mr1-dev
* changes:
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3
Verify number of Map entries written to Parcel
TreeHugger Robot [Thu, 6 Sep 2018 01:29:28 +0000 (01:29 +0000)]
Merge changes from topic "am-
bdb0270e-8295-4ee6-be36-
2709e172d48f" into nyc-dr1-dev
* changes:
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3
Verify number of Map entries written to Parcel
Wale Ogunwale [Thu, 6 Sep 2018 01:22:08 +0000 (18:22 -0700)]
Merge changes from topic "am-
51363a78-f167-48aa-956c-
f9bfd551a3a5" into oc-dev am:
471a4e6076
am:
5c6dd2cd0c
Change-Id: I678702bc19a9bf20c5e2884babd2395363c41f64
Wale Ogunwale [Thu, 6 Sep 2018 01:17:11 +0000 (18:17 -0700)]
[automerger skipped] Merge "Hide overlay windows when requesting media projection permission." into oc-dev
am:
0d4d38e3f9 -s ours
Change-Id: I021db34826711805dff7a43fd5f79f4d49a831bb
Wale Ogunwale [Thu, 6 Sep 2018 01:03:00 +0000 (18:03 -0700)]
Merge changes from topic "am-
51363a78-f167-48aa-956c-
f9bfd551a3a5" into oc-dev
am:
471a4e6076
Change-Id: Ie51140203150cd9ef361e713700dfef128651f4e
akirilov [Thu, 6 Sep 2018 00:52:31 +0000 (17:52 -0700)]
Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into oc-dev am:
08d2780e1e
am:
d55320b524
Change-Id: I28952a2c20d9fc0f7cff38774cd7a1e1cd6b12ab
TreeHugger Robot [Thu, 6 Sep 2018 00:48:33 +0000 (00:48 +0000)]
Merge "Hide overlay windows when requesting media projection permission." into oc-dev
Wale Ogunwale [Thu, 6 Sep 2018 00:47:44 +0000 (17:47 -0700)]
Merge changes from topic "am-
bada3a56-09dc-47f9-ba2e-
42434cf270e2" into oc-dev am:
59113c7a51
am:
9e6abebb10
Change-Id: Ifb11c9795b60056fa3407085d33b8a98a704b4e2
akirilov [Thu, 6 Sep 2018 00:32:07 +0000 (17:32 -0700)]
Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into oc-dev
am:
08d2780e1e
Change-Id: I3d963182b12d33718157576105d10c7da56ec228
TreeHugger Robot [Wed, 5 Sep 2018 23:39:21 +0000 (23:39 +0000)]
Merge changes from topic "am-
51363a78-f167-48aa-956c-
f9bfd551a3a5" into nyc-mr2-dev
* changes:
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9 skipped:
50f6c53a1a skipped:
defeb8c596
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9 skipped:
50f6c53a1a
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd
Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 23:39:21 +0000 (23:39 +0000)]
Merge changes from topic "am-
51363a78-f167-48aa-956c-
f9bfd551a3a5" into cw-f-dev
* changes:
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9 skipped:
50f6c53a1a
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd
Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 23:39:21 +0000 (23:39 +0000)]
Merge changes from topic "am-
51363a78-f167-48aa-956c-
f9bfd551a3a5" into nyc-mr1-dev
* changes:
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd
Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 23:39:21 +0000 (23:39 +0000)]
Merge changes from topic "am-
51363a78-f167-48aa-956c-
f9bfd551a3a5" into nyc-dr1-dev
* changes:
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd
Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 23:39:21 +0000 (23:39 +0000)]
Merge changes from topic "am-
51363a78-f167-48aa-956c-
f9bfd551a3a5" into oc-dev
* changes:
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9 skipped:
50f6c53a1a skipped:
defeb8c596 skipped:
6619efdd68
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9 skipped:
50f6c53a1a skipped:
defeb8c596
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9 skipped:
50f6c53a1a
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd
Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 23:19:12 +0000 (23:19 +0000)]
Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into oc-dev
TreeHugger Robot [Wed, 5 Sep 2018 23:01:36 +0000 (23:01 +0000)]
Merge "RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission." into oc-mr1-dev
Wale Ogunwale [Wed, 5 Sep 2018 22:57:16 +0000 (15:57 -0700)]
Merge changes from topic "am-
bada3a56-09dc-47f9-ba2e-
42434cf270e2" into oc-dev
am:
59113c7a51
Change-Id: I8111a46aaff0d20c4f1cc51292eb9567b196a5fa
akirilov [Wed, 5 Sep 2018 22:38:25 +0000 (15:38 -0700)]
[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am:
8da6786608 am:
7d153c56c6 am:
eff2a46342 am:
ee4a2aee83 skipped:
879ecd17ab am:
47a4d99c0c
am:
15682d0bd4
Change-Id: I248cce38784bf8ed892f2f3451e000b573770f6e
TreeHugger Robot [Wed, 5 Sep 2018 22:24:16 +0000 (22:24 +0000)]
Merge changes from topic "am-
bada3a56-09dc-47f9-ba2e-
42434cf270e2" into nyc-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009 am:
7ee280f8b5 am:
3290f3b22e
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009 am:
7ee280f8b5
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009
RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 22:24:16 +0000 (22:24 +0000)]
Merge changes from topic "am-
bada3a56-09dc-47f9-ba2e-
42434cf270e2" into cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009 am:
7ee280f8b5
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009
RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 22:24:16 +0000 (22:24 +0000)]
Merge changes from topic "am-
bada3a56-09dc-47f9-ba2e-
42434cf270e2" into nyc-mr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009
RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 22:24:16 +0000 (22:24 +0000)]
Merge "RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission." into nyc-dr1-dev
TreeHugger Robot [Wed, 5 Sep 2018 22:24:16 +0000 (22:24 +0000)]
Merge changes from topic "am-
bada3a56-09dc-47f9-ba2e-
42434cf270e2" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009 am:
7ee280f8b5 am:
3290f3b22e skipped:
2e5c1ed2ad
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009 am:
7ee280f8b5 am:
3290f3b22e
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009 am:
7ee280f8b5
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009
RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
akirilov [Wed, 5 Sep 2018 22:18:01 +0000 (15:18 -0700)]
[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am:
8da6786608 am:
7d153c56c6 am:
eff2a46342 am:
ee4a2aee83 skipped:
879ecd17ab
am:
47a4d99c0c
Change-Id: I92cf75e9261fdf866687dc31632714be257ca7f7
Wale Ogunwale [Wed, 16 May 2018 23:42:29 +0000 (16:42 -0700)]
RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
1: Cherry-pick ag/
4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS
updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow
2: Cherry-pick ag/
3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on
relayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded
3: Add permissions to SystemUI to allow it to hide non-system overlays
Bug:
34170870
Test: manual (see bug for poc)
Change-Id: I57cb0f390d9a78e721c5ddce49a377d385002753
Wale Ogunwale [Wed, 16 May 2018 23:42:29 +0000 (16:42 -0700)]
Hide overlay windows when requesting media projection permission.
1: Cherry-pick ag/
4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS
updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow
2: Cherry-pick ag/
3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on
relayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded
3: Add permissions to SystemUI to allow it to hide non-system overlays
Bug:
34170870
Test: manual (see bug for poc)
Change-Id: I57cb0f390d9a78e721c5ddce49a377d385002753
Merged-In: I57cb0f390d9a78e721c5ddce49a377d385002753
Android Build Merger (Role) [Wed, 5 Sep 2018 20:39:21 +0000 (20:39 +0000)]
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009 am:
7ee280f8b5 am:
3290f3b22e skipped:
2e5c1ed2ad
Change-Id: Iaec0b5ba5b3adeb6ac1150c7e2cc5534432def11
Android Build Merger (Role) [Wed, 5 Sep 2018 20:39:13 +0000 (20:39 +0000)]
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009 am:
7ee280f8b5 am:
3290f3b22e
Change-Id: If7b764f16eaf2bdc7f5327351e74458fad48d250
Android Build Merger (Role) [Wed, 5 Sep 2018 20:39:05 +0000 (20:39 +0000)]
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009 am:
7ee280f8b5
Change-Id: Ic52ca75008a7a428fae62f9e1adc861ec51abc09
Android Build Merger (Role) [Wed, 5 Sep 2018 20:38:53 +0000 (20:38 +0000)]
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009
Change-Id: I277a26c94cde1e77ddef8ddbc81dad3c963def8f
Wale Ogunwale [Wed, 16 May 2018 23:42:29 +0000 (16:42 -0700)]
RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
1: Cherry-pick ag/
4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS
updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow
2: Cherry-pick ag/
3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on
relayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded
3: Add permissions to SystemUI to allow it to hide non-system overlays
Bug:
34170870
Test: manual (see bug for poc)
Change-Id: I57cb0f390d9a78e721c5ddce49a377d385002753
Android Build Merger (Role) [Wed, 5 Sep 2018 20:38:14 +0000 (20:38 +0000)]
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9 skipped:
50f6c53a1a skipped:
defeb8c596 skipped:
6619efdd68
Change-Id: I228c8aa69b9a20c00153f961dc8459aa7d839e39
Android Build Merger (Role) [Wed, 5 Sep 2018 20:38:06 +0000 (20:38 +0000)]
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9 skipped:
50f6c53a1a skipped:
defeb8c596
Change-Id: Ia209169eb2587ede53cc0199c5eaa79f5819e674
Android Build Merger (Role) [Wed, 5 Sep 2018 20:38:00 +0000 (20:38 +0000)]
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9 skipped:
50f6c53a1a
Change-Id: I1e986e823c9fcb1fc11e3d634e0c6b31725a57c5
Android Build Merger (Role) [Wed, 5 Sep 2018 20:37:54 +0000 (20:37 +0000)]
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9
Change-Id: Icec5121efdff64b3352ac985141f612277549b6d
Android Build Merger (Role) [Wed, 5 Sep 2018 20:37:48 +0000 (20:37 +0000)]
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd
Change-Id: I76ade50f15b706e3f4e6acc156884b83967e4b40
Wale Ogunwale [Wed, 16 May 2018 23:42:29 +0000 (16:42 -0700)]
Hide overlay windows when requesting media projection permission.
1: Cherry-pick ag/
4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS
updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow
2: Cherry-pick ag/
3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on
relayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded
3: Add permissions to SystemUI to allow it to hide non-system overlays
Bug:
34170870
Test: manual (see bug for poc)
Change-Id: I57cb0f390d9a78e721c5ddce49a377d385002753
Android Build Merger (Role) [Thu, 30 Aug 2018 20:46:20 +0000 (20:46 +0000)]
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf am:
628cbe5c53 am:
433e4173ec am:
686897ddd9
Change-Id: I07c1d68a0c5d8da6ec81c717dff97d33dba86a16
Android Build Merger (Role) [Thu, 30 Aug 2018 20:46:12 +0000 (20:46 +0000)]
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf am:
628cbe5c53 am:
433e4173ec
Change-Id: I8375f1c1a860f5021efc5873e94b452a44d6c145
Android Build Merger (Role) [Thu, 30 Aug 2018 20:46:05 +0000 (20:46 +0000)]
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf am:
628cbe5c53
Change-Id: Id32bd5aa02d5689873bb311eebc87f367af9a9d9
Android Build Merger (Role) [Thu, 30 Aug 2018 20:45:59 +0000 (20:45 +0000)]
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf
Change-Id: Idaab5395d9e0970fe57b017bcba10f8757ffe3c7
Android Build Merger (Role) [Thu, 30 Aug 2018 20:45:51 +0000 (20:45 +0000)]
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3
Change-Id: Idb2572b46c48fe2f3e4b99c5cb4372dcfe6b20ce
Michael Wachenschwanz [Sat, 25 Aug 2018 04:50:35 +0000 (21:50 -0700)]
Verify number of Map entries written to Parcel
Make sure the number of entries written by Parcel#writeMapInternal
matches the size written. If a mismatch were allowed, an exploitable
scenario could occur where the data read from the Parcel would not
match the data written.
Fixes:
112859604
Test: cts-tradefed run cts -m CtsOsTestCases -t android.os.cts.ParcelTest
Change-Id: I325d08a8b66b6e80fe76501359c41b6656848607
Merged-In: I325d08a8b66b6e80fe76501359c41b6656848607
Android Build Merger (Role) [Fri, 24 Aug 2018 22:45:45 +0000 (22:45 +0000)]
[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am:
8da6786608 am:
7d153c56c6 am:
eff2a46342 am:
ee4a2aee83 skipped:
879ecd17ab
Change-Id: I8aa91170ea26a60a714f05ce59a27a8c510ac197
Android Build Merger (Role) [Fri, 24 Aug 2018 22:45:36 +0000 (22:45 +0000)]
[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am:
8da6786608 am:
7d153c56c6 am:
eff2a46342 am:
ee4a2aee83
Change-Id: Ieaa5386305a8d359b5b79d99925bd12696bbce2a
akirilov [Fri, 24 Aug 2018 22:43:05 +0000 (15:43 -0700)]
RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions.
Bug:
111752150
Test: Manual local test
Change-Id: I0b48a20525f87fc6f5ab8d7e70aa7d11cd747f97
Android Build Merger (Role) [Fri, 24 Aug 2018 22:45:29 +0000 (22:45 +0000)]
[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am:
8da6786608 am:
7d153c56c6 am:
eff2a46342
Change-Id: I2f97a9e176348ae81e9d72f8cb3c22e3f74c0a81
Android Build Merger (Role) [Fri, 24 Aug 2018 22:45:22 +0000 (22:45 +0000)]
[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am:
8da6786608 am:
7d153c56c6
Change-Id: Idba111169b057b88a7b47dde4b734ede2c651310
Android Build Merger (Role) [Fri, 24 Aug 2018 22:45:15 +0000 (22:45 +0000)]
[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am:
8da6786608
Change-Id: I2c9174d4b065aada8c4ba95e864b3628dd1f0975
akirilov [Fri, 24 Aug 2018 22:43:05 +0000 (15:43 -0700)]
RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions.
Bug:
111752150
Test: Manual local test
Change-Id: I0b48a20525f87fc6f5ab8d7e70aa7d11cd747f97
Todd Kennedy [Fri, 17 Aug 2018 19:47:28 +0000 (12:47 -0700)]
Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev am:
5b78b0015e
am:
dff5d48b7e
Change-Id: I4e419bcce7375da6b09c01c6a78e127de6dbf189
Todd Kennedy [Fri, 17 Aug 2018 19:19:09 +0000 (12:19 -0700)]
Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev
am:
5b78b0015e
Change-Id: I2da67334d41640ecac6f2b9b31c93d16ee48dc22
TreeHugger Robot [Fri, 17 Aug 2018 18:56:28 +0000 (18:56 +0000)]
Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev
Mihai Popa [Wed, 15 Aug 2018 21:01:02 +0000 (14:01 -0700)]
[automerger skipped] Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into oc-dev am:
fc28b6b724 -s ours
am:
e88da3d679 -s ours
Change-Id: Ic3ad5eefc164ba31cd4f256b9ee39d8bc3aa1d5a
Mihai Popa [Wed, 15 Aug 2018 20:48:07 +0000 (13:48 -0700)]
[automerger skipped] Merge changes from topic "am-
c709fe3e-1c07-4ecd-9998-
2477e3445dd4" into oc-dev am:
d5e6e1e83e -s ours
am:
e82c4b82cc -s ours
Change-Id: I1b7c3d8c456fa438233fa0884567b06f3b63eb4f
Mihai Popa [Wed, 15 Aug 2018 20:38:40 +0000 (13:38 -0700)]
[automerger skipped] Merge "Fix crash during cursor moving on BiDi text" into oc-dev am:
e385255db4
am:
06829a62b1 -s ours
Change-Id: I9563f6fc8afa112e8a8455ffde9a221432cbcbf9
Mihai Popa [Wed, 15 Aug 2018 20:04:26 +0000 (13:04 -0700)]
[automerger skipped] Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into oc-dev
am:
fc28b6b724 -s ours
Change-Id: I74179d805d746ccbb32546fb268cb52c8c9db514
Mihai Popa [Wed, 15 Aug 2018 19:52:34 +0000 (12:52 -0700)]
[automerger skipped] Merge changes from topic "am-
c709fe3e-1c07-4ecd-9998-
2477e3445dd4" into oc-dev
am:
d5e6e1e83e -s ours
Change-Id: Ie4fb9ca93c435f53cfe6db23b4902b094506b618
Mihai Popa [Wed, 15 Aug 2018 19:43:55 +0000 (12:43 -0700)]
Merge "Fix crash during cursor moving on BiDi text" into oc-dev
am:
e385255db4
Change-Id: Ib094039b1c515af77fcc3c051352de5cb15861cb
Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]
Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into nyc-mr2-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573 am:
7693ce7eaf
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]
Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into cw-f-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]
Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into nyc-mr1-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]
Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into nyc-dr1-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]
Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into nyc-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]
Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into oc-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573 am:
7693ce7eaf am:
11ba74cce9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573 am:
7693ce7eaf
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:17:04 +0000 (19:17 +0000)]
Merge changes from topic "am-
c709fe3e-1c07-4ecd-9998-
2477e3445dd4" into oc-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a am:
8f85f5ffd2
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:17:04 +0000 (19:17 +0000)]
Merge "Fix crash during cursor moving on BiDi text" into nyc-dev
Mihai Popa [Wed, 15 Aug 2018 19:16:40 +0000 (19:16 +0000)]
Merge "Fix crash during cursor moving on BiDi text" into oc-dev
Mihai Popa [Wed, 15 Aug 2018 19:16:21 +0000 (19:16 +0000)]
Merge "Fix crash during cursor moving on BiDi text" into oc-mr1-dev
Android Build Merger (Role) [Wed, 15 Aug 2018 19:13:15 +0000 (19:13 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a am:
8f85f5ffd2
Change-Id: If854f61c2516a61ac36426c10eafd30bf638e919
Android Build Merger (Role) [Wed, 15 Aug 2018 19:13:10 +0000 (19:13 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a
Change-Id: I7cb6623befc84f76e783b8800aa18ce28a8cc2b7
Android Build Merger (Role) [Wed, 15 Aug 2018 19:13:04 +0000 (19:13 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4
Change-Id: I16bff43cf755e443ed53f7a45469351c498f977f
Android Build Merger (Role) [Wed, 15 Aug 2018 19:12:59 +0000 (19:12 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3
Change-Id: Iaf0aded3004f33fdb52dd0c19779329991b24746
Android Build Merger (Role) [Wed, 15 Aug 2018 19:12:52 +0000 (19:12 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb
Change-Id: I221d974ba9402c088235d5bdb3c94e91cf4167ba
Seigo Nonaka [Thu, 19 Jul 2018 23:22:02 +0000 (16:22 -0700)]
Fix crash during cursor moving on BiDi text
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.
To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.
Bug:
78464361,
111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit
960647d582911ae7ab8b9491097898e6c313aaf1)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
Seigo Nonaka [Thu, 19 Jul 2018 23:22:02 +0000 (16:22 -0700)]
Fix crash during cursor moving on BiDi text
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.
To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.
Bug:
78464361,
111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit
960647d582911ae7ab8b9491097898e6c313aaf1)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
OSDN Git Service
