OSDN Git Service
Android Build Merger (Role) [Sun, 30 Sep 2018 14:22:35 +0000 (14:22 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f6e12d6972
Change-Id: I26a0651ab8352744f54468d34f0409d0eb8f7930
Bill Yi [Sun, 30 Sep 2018 14:22:12 +0000 (07:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I450f670e7cbe292d8d106331fe13c8439e076861
Auto-generated-cl: translation import
Atanas Kirilov [Fri, 28 Sep 2018 23:21:47 +0000 (23:21 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846 am:
94e1a09bc6 am:
84756be0be am:
276f6cbb70
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846 am:
94e1a09bc6 am:
84756be0be
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846 am:
94e1a09bc6
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
Atanas Kirilov [Fri, 28 Sep 2018 23:21:47 +0000 (23:21 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846 am:
94e1a09bc6 am:
84756be0be
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846 am:
94e1a09bc6
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
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
Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:21 +0000 (20:34 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846 am:
94e1a09bc6 am:
84756be0be am:
276f6cbb70
Change-Id: If5cdbd2e616e8441fe469950342114c6771d1571
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
Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:04 +0000 (20:34 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846 am:
94e1a09bc6 am:
84756be0be
Change-Id: I83b2b097d30d2ea1fae3361cc06c503d61a444e8
Android Build Merger (Role) [Fri, 28 Sep 2018 20:33:53 +0000 (20:33 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846 am:
94e1a09bc6
Change-Id: Ie3b9caf9452711a136f50a5ac8aa4946fa0d2767
Android Build Merger (Role) [Fri, 28 Sep 2018 20:33:45 +0000 (20:33 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846
Change-Id: Ib9aa56a12fff0fb53848b9856fb89c6bb4de3793
Atanas Kirilov [Fri, 28 Sep 2018 20:16:49 +0000 (20:16 +0000)]
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
This reverts commit
fa69d725eb99b8c20a15135304bf5be4ea811573.
Reason for revert: triggers other issue.
Bug:
114365189
Change-Id: I746c74b00f4524575279cdaa831435d12425de20
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
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 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
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: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: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: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
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
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:17:04 +0000 (19:17 +0000)]
Merge "Fix crash during cursor moving on BiDi text" into nyc-dev
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
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:30 +0000 (00:29 +0000)]
[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
Change-Id: Ic311029be8ab99f4aaae526d980da0f2436c5459
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:23 +0000 (00:29 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55 am:
f7f008f573
Change-Id: I4122a5c548c4b3395bb546c459c34f10b319ad29
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:16 +0000 (00:29 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55
Change-Id: I680848db0e845617323ecca36c380fdf890789d9
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:09 +0000 (00:29 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
Change-Id: I27b2220f568a37ff16b0dfc3376d7e46cb3659c9
Android Build Merger (Role) [Wed, 15 Aug 2018 00:28:52 +0000 (00:28 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
Change-Id: Ic801a54fa6cb048ddf911c7b315849ab40bd7a52
Android Build Merger (Role) [Wed, 15 Aug 2018 00:28:41 +0000 (00:28 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
Change-Id: If1607fb19bd806cb6d0f9b9010032e95df6549a8
Android Build Merger (Role) [Wed, 15 Aug 2018 00:26:19 +0000 (00:26 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
Change-Id: I6995aab201805b64e81022db295356ef8abda30c
Android Build Merger (Role) [Wed, 15 Aug 2018 00:26:10 +0000 (00:26 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Change-Id: Id97c3f508a0dcd82978b06891b3a979921d4be3a
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:
111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into nyc-dev
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815 am:
9310c5bdd3
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-mr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-dr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Android Build Merger (Role) [Thu, 9 Aug 2018 20:16:00 +0000 (20:16 +0000)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8 am:
424304f893 am:
b2e2b1386f
Change-Id: Icdb977d8cb260d5210d103f306de550b3f8fed96
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:55 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8 am:
424304f893
Change-Id: I4c0f715b12df5e7ffb4f3a1b7cf9ae5da4be22ca
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:51 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8
Change-Id: I544bf2c6b5d0177aa70a6fb7bd4225d4d04881fd
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:45 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09
Change-Id: I6cdb5a5dd5531ad53ef02174ff5063788d11029d
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:39 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4 am:
97d0d2c209 am:
ca5fd693bc
Change-Id: Iccacb48d382a3fd8012dff81c3d8482afe0e5f14
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:33 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4 am:
97d0d2c209
Change-Id: I92820ffe7b45077bc4beaf97144a7b7eb3117af0
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:28 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4
Change-Id: Ia9f489c55def0f592383ac2a10f5bd0b34c2663d
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:19 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a
Change-Id: Ia877305c642c3b7741941d2e438fe77f1d1550f3
Jeff Sharkey [Wed, 25 Jul 2018 20:52:14 +0000 (14:52 -0600)]
DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.
Developers often accept selection clauses from untrusted code, and
SQLiteQueryBuilder already supports a "strict" mode to help catch
SQL injection attacks. This change extends the builder to support
update() and delete() calls, so that we can help secure those
selection clauses too.
Bug:
111085900
Test: atest packages/providers/DownloadProvider/tests/
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
Change-Id: Ib4fc8400f184755ee7e971ab5f2095186341730c
Merged-In: Ib4fc8400f184755ee7e971ab5f2095186341730c
Jeff Sharkey [Wed, 25 Jul 2018 20:01:59 +0000 (14:01 -0600)]
DO NOT MERGE. Execute "strict" queries with extra parentheses.
SQLiteQueryBuilder has a setStrict() mode which can be used to
detect SQL attacks from untrusted sources, which it does by running
each query twice: once with an extra set of parentheses, and if that
succeeds, it runs the original query verbatim.
This sadly doesn't catch inputs of the type "1=1) OR (1=1", which
creates valid statements for both tests above, but the final executed
query ends up leaking data due to SQLite operator precedence.
Instead, we need to continue compiling both variants, but we need
to execute the query with the additional parentheses to ensure
data won't be leaked.
Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
Bug:
111085900
Change-Id: I6e8746fa48f9de13adae37d2990de11c9c585381
Merged-In: I6e8746fa48f9de13adae37d2990de11c9c585381
TreeHugger Robot [Mon, 30 Jul 2018 05:14:30 +0000 (05:14 +0000)]
Merge changes from topic "am-
c65d7988-0ca0-4757-9d9c-
21f4575eec01" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
1c484c5d96
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 30 Jul 2018 05:14:30 +0000 (05:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 30 Jul 2018 05:04:27 +0000 (05:04 +0000)]
Merge changes from topic "am-
1155d171-2145-4903-8420-
80ecfd6c6b08" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f9a5e160d0
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 30 Jul 2018 05:04:27 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Sun, 29 Jul 2018 15:53:26 +0000 (15:53 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c781e19f5
Change-Id: Ib62c14bc0bb4d205821e8f3b6312c5dca7773fde
Bill Yi [Sun, 29 Jul 2018 15:53:11 +0000 (08:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I556f15b9dc9c144d1ddd3bee21f823a52afdfbf4
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 29 Jul 2018 15:40:50 +0000 (15:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1c484c5d96
Change-Id: I5f7b6e78d38bebadba08ce1e2d18302f5e7464ee
Bill Yi [Sun, 29 Jul 2018 15:40:30 +0000 (08:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I544bbffa43bdf203519441dd1d1b66b54bb54238
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 29 Jul 2018 14:40:54 +0000 (14:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f9a5e160d0
Change-Id: Ic133994f8f27708e96772601a2dcb5e6173dae28
Bill Yi [Sun, 29 Jul 2018 14:40:09 +0000 (07:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ae5687befc9fd492b9baa7a5ca0bc674a30ebb2
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 19 Jul 2018 21:29:33 +0000 (21:29 +0000)]
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815 am:
9310c5bdd3
Change-Id: I83e62233a15ffa1a02ac62e7d1323d342876756f
Android Build Merger (Role) [Thu, 19 Jul 2018 21:29:26 +0000 (21:29 +0000)]
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815
Change-Id: Id6b495855c7ca0d33aa965556546622bff487dcd
Android Build Merger (Role) [Thu, 19 Jul 2018 21:29:18 +0000 (21:29 +0000)]
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7
Change-Id: I16ddc194ac2f38676e929f98aebf7776dcaeed53
Android Build Merger (Role) [Thu, 19 Jul 2018 21:29:08 +0000 (21:29 +0000)]
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
Change-Id: I7bfd11dd549f814b59742c7565c4a39ed3df66fe
akirilov [Thu, 19 Jul 2018 00:50:05 +0000 (17:50 -0700)]
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Bug:
67319274
Test: run cts-dev --module CtsPermissionTestCases --test android.permission.cts.RemovePermissionTest#permissionShouldBeRevokedIfRemoved
Change-Id: I69edee8ed044cc2a8cdb01515f7996b004209c81
TreeHugger Robot [Mon, 16 Jul 2018 19:25:14 +0000 (19:25 +0000)]
Merge "Fix TrackInfo parcel write" into nyc-dev
Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:15 +0000 (06:57 +0000)]
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675
Change-Id: I1f39ec37a6e4fa163caf51702e0924cc9c89ee04
Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:08 +0000 (06:57 +0000)]
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca
Change-Id: I29f00c9b6dca76c5b780d659d122e08a0d7e581c
Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:02 +0000 (06:57 +0000)]
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7
Change-Id: Ida72e9fed175aa9497af5c5f607640c07cb04cf5
Android Build Merger (Role) [Fri, 13 Jul 2018 06:56:56 +0000 (06:56 +0000)]
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc
Change-Id: I7ea941c8cffa147d2c6a46f0428899bf001a2672
OSDN Git Service
