Commit Graph

258667 Commits

Author SHA1 Message Date
TreeHugger Robot
d3fd3688b0 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.
2018-09-05 23:39:21 +00:00
TreeHugger Robot
9b9cbfe87f 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.
2018-09-05 22:24:16 +00:00
Android Build Merger (Role)
3290f3b22e [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5
Change-Id: Ic52ca75008a7a428fae62f9e1adc861ec51abc09
2018-09-05 20:39:05 +00:00
Android Build Merger (Role)
7ee280f8b5 [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009
Change-Id: I277a26c94cde1e77ddef8ddbc81dad3c963def8f
2018-09-05 20:38:53 +00:00
Wale Ogunwale
295af36009 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
2018-09-05 20:38:50 +00:00
Android Build Merger (Role)
defeb8c596 [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a
Change-Id: I1e986e823c9fcb1fc11e3d634e0c6b31725a57c5
2018-09-05 20:38:00 +00:00
Android Build Merger (Role)
50f6c53a1a [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9
Change-Id: Icec5121efdff64b3352ac985141f612277549b6d
2018-09-05 20:37:54 +00:00
Android Build Merger (Role)
3eb97a9bd9 [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd
Change-Id: I76ade50f15b706e3f4e6acc156884b83967e4b40
2018-09-05 20:37:48 +00:00
Wale Ogunwale
5c3f5a02bd 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
2018-09-05 20:37:34 +00:00
Android Build Merger (Role)
ee4a2aee83 [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342
Change-Id: I2f97a9e176348ae81e9d72f8cb3c22e3f74c0a81
2018-08-24 22:45:29 +00:00
Android Build Merger (Role)
eff2a46342 [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6
Change-Id: Idba111169b057b88a7b47dde4b734ede2c651310
2018-08-24 22:45:22 +00:00
Android Build Merger (Role)
7d153c56c6 [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608
Change-Id: I2c9174d4b065aada8c4ba95e864b3628dd1f0975
2018-08-24 22:45:15 +00:00
akirilov
8da6786608 RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions.
Bug: 111752150
Test: Manual local test
Change-Id: I0b48a20525f87fc6f5ab8d7e70aa7d11cd747f97
2018-08-24 22:45:13 +00:00
Mihai Popa
3504302bb2 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
2018-08-15 19:23:35 +00:00
Mihai Popa
0075139902 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
2018-08-15 19:23:35 +00:00
Mihai Popa
1425bb41aa 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
2018-08-15 19:23:35 +00:00
Mihai Popa
bf441335ea 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
2018-08-15 19:23:35 +00:00
Mihai Popa
25f2fa4cf7 Merge "Fix crash during cursor moving on BiDi text" into nyc-dev 2018-08-15 19:17:04 +00:00
Android Build Merger (Role)
a959ee227a [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4
Change-Id: I16bff43cf755e443ed53f7a45469351c498f977f
2018-08-15 19:13:04 +00:00
Android Build Merger (Role)
99e3f649b4 [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3
Change-Id: Iaf0aded3004f33fdb52dd0c19779329991b24746
2018-08-15 19:12:59 +00:00
Android Build Merger (Role)
12baaa2bc3 [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb
Change-Id: I221d974ba9402c088235d5bdb3c94e91cf4167ba
2018-08-15 19:12:52 +00:00
Seigo Nonaka
82c84d5fbb 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 960647d582)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
2018-08-15 19:12:50 +00:00
Android Build Merger (Role)
7693ce7eaf [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
2018-08-15 00:29:23 +00:00
Android Build Merger (Role)
f7f008f573 [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55
Change-Id: I680848db0e845617323ecca36c380fdf890789d9
2018-08-15 00:29:16 +00:00
Android Build Merger (Role)
74ffd2bc55 [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b
Change-Id: I27b2220f568a37ff16b0dfc3376d7e46cb3659c9
2018-08-15 00:29:09 +00:00
Android Build Merger (Role)
65082f8f5b [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9
Change-Id: Ic801a54fa6cb048ddf911c7b315849ab40bd7a52
2018-08-15 00:28:52 +00:00
Android Build Merger (Role)
04c7154fd9 [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f
Change-Id: If1607fb19bd806cb6d0f9b9010032e95df6549a8
2018-08-15 00:28:41 +00:00
Android Build Merger (Role)
723f13d01f [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2
Change-Id: I6995aab201805b64e81022db295356ef8abda30c
2018-08-15 00:26:19 +00:00
Android Build Merger (Role)
b7a2d47ec2 [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea
Change-Id: Id97c3f508a0dcd82978b06891b3a979921d4be3a
2018-08-15 00:26:10 +00:00
Seigo Nonaka
95218ce7ea 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
2018-08-15 00:26:02 +00:00
Atanas Kirilov
8aecc35a20 Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into nyc-dev 2018-08-14 19:40:27 +00:00
Atanas Kirilov
96e845cc4c 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.
2018-08-14 19:40:27 +00:00
Atanas Kirilov
7ae6e6566f 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.
2018-08-14 19:40:27 +00:00
Atanas Kirilov
fce27e8502 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.
2018-08-14 19:40:27 +00:00
Android Build Merger (Role)
b2e2b1386f [automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893
Change-Id: I4c0f715b12df5e7ffb4f3a1b7cf9ae5da4be22ca
2018-08-09 20:15:55 +00:00
Android Build Merger (Role)
424304f893 [automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8
Change-Id: I544bf2c6b5d0177aa70a6fb7bd4225d4d04881fd
2018-08-09 20:15:51 +00:00
Android Build Merger (Role)
c09bb997e8 [automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09
Change-Id: I6cdb5a5dd5531ad53ef02174ff5063788d11029d
2018-08-09 20:15:45 +00:00
Android Build Merger (Role)
ca5fd693bc [automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209
Change-Id: I92820ffe7b45077bc4beaf97144a7b7eb3117af0
2018-08-09 20:15:33 +00:00
Android Build Merger (Role)
97d0d2c209 [automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4
Change-Id: Ia9f489c55def0f592383ac2a10f5bd0b34c2663d
2018-08-09 20:15:28 +00:00
Android Build Merger (Role)
8ecd22c0a4 [automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd5652a
Change-Id: Ia877305c642c3b7741941d2e438fe77f1d1550f3
2018-08-09 20:15:19 +00:00
Jeff Sharkey
8e95967f09 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
2018-08-03 13:42:35 -06:00
Jeff Sharkey
286fd5652a 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
2018-08-03 13:38:31 -06:00
TreeHugger Robot
23162a8897 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2018-07-30 05:14:30 +00:00
TreeHugger Robot
36b8d42448 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2018-07-30 05:04:27 +00:00
Bill Yi
4c781e19f5 Import translations. DO NOT MERGE
Change-Id: I556f15b9dc9c144d1ddd3bee21f823a52afdfbf4
Auto-generated-cl: translation import
2018-07-29 08:53:11 -07:00
Bill Yi
1c484c5d96 Import translations. DO NOT MERGE
Change-Id: I544bbffa43bdf203519441dd1d1b66b54bb54238
Auto-generated-cl: translation import
2018-07-29 08:40:30 -07:00
Bill Yi
f9a5e160d0 Import translations. DO NOT MERGE
Change-Id: I2ae5687befc9fd492b9baa7a5ca0bc674a30ebb2
Auto-generated-cl: translation import
2018-07-29 07:40:09 -07:00
Android Build Merger (Role)
9310c5bdd3 [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815
Change-Id: Id6b495855c7ca0d33aa965556546622bff487dcd
2018-07-19 21:29:26 +00:00
Android Build Merger (Role)
a491c04815 [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7
Change-Id: I16ddc194ac2f38676e929f98aebf7776dcaeed53
2018-07-19 21:29:18 +00:00
Android Build Merger (Role)
7d252f5ed7 [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb
Change-Id: I7bfd11dd549f814b59742c7565c4a39ed3df66fe
2018-07-19 21:29:08 +00:00