OSDN Git Service

android-x86/frameworks-base.git
5 years ago[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for reque...
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

5 years ago[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for reque...
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

5 years ago[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for reque...
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

5 years ago[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for reque...
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

5 years agoRESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions.
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

5 years agoMerge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into nyc-mr2-dev
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

5 years agoMerge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into cw-f-dev
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

5 years agoMerge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into nyc-mr1-dev
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

5 years agoMerge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into nyc-dr1-dev
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

5 years agoMerge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into nyc-dev
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

5 years agoMerge "Fix crash during cursor moving on BiDi text" into nyc-dev
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc...
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc...
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb
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

5 years agoFix crash during cursor moving on BiDi text
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: 78464361111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit 960647d582911ae7ab8b9491097898e6c313aaf1)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec...
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec...
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec...
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec...
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec...
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec...
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2
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

5 years ago[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea
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

5 years agoFix crash during cursor moving on BiDi text
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

5 years agoMerge "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 "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into nyc-dev

5 years agoMerge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-mr2-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.

5 years agoMerge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into cw-f-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 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.

5 years agoMerge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-mr1-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-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.

5 years agoMerge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-dr1-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-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.

5 years ago[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e959...
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

5 years ago[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e959...
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

5 years ago[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e959...
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

5 years ago[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e959...
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

5 years ago[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd...
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

5 years ago[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd...
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

5 years ago[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd...
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

5 years ago[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd...
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

5 years agoDO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.
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

5 years agoDO NOT MERGE. Execute "strict" queries with extra parentheses.
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

5 years agoMerge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into nyc-mr2-dev
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

5 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 30 Jul 2018 05:14:30 +0000 (05:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

5 years agoMerge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into nyc-mr2-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

5 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 30 Jul 2018 05:04:27 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5
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

5 years agoImport translations. DO NOT MERGE
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

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96
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

5 years agoImport translations. DO NOT MERGE
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

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0
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

5 years agoImport translations. DO NOT MERGE
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

6 years ago[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed packag...
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

6 years ago[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed packag...
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

6 years ago[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed packag...
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

6 years ago[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed packag...
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

6 years agoRESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
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

6 years agoMerge "Fix TrackInfo parcel write" into nyc-dev
TreeHugger Robot [Mon, 16 Jul 2018 19:25:14 +0000 (19:25 +0000)]
Merge "Fix TrackInfo parcel write" into nyc-dev

6 years ago[automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca...
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

6 years ago[automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca
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

6 years ago[automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7
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

6 years ago[automerger] Fix TrackInfo parcel write am: 0d2dc943dc
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

6 years agoFix TrackInfo parcel write
Robert Shih [Mon, 9 Jul 2018 20:38:31 +0000 (13:38 -0700)]
Fix TrackInfo parcel write

Bug: 77600398
Change-Id: Ia316f1c5dc4879f6851fdb78fe8b9039579be7bc

6 years agoMerge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into nyc-mr2-dev
TreeHugger Robot [Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)]
Merge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e
  Import translations. DO NOT MERGE

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 12 Jul 2018 19:18:55 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: e059d5fb83
Android Build Merger (Role) [Thu, 12 Jul 2018 01:50:52 +0000 (01:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: e059d5fb83

Change-Id: I119e6fba2ffa56ca9a8b24df821025abf4bf9580

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 12 Jul 2018 01:50:30 +0000 (18:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: I989a9b371c1dc0c713b67c0a8cef4f3bdc0c457c
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e
Android Build Merger (Role) [Wed, 11 Jul 2018 23:43:02 +0000 (23:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e

Change-Id: I37e47c3e87c8e9143731af2b4bf0d92fc4ce7f38

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 11 Jul 2018 23:42:32 +0000 (16:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9878d930e5aa4e4fe1883f28063e167240bb99b5
Auto-generated-cl: translation import

6 years ago[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am...
Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:14 +0000 (22:55 +0000)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc

Change-Id: I19c512999a0eae233e2cc7c4d31d0c62556e4ffd

6 years ago[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am...
Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:07 +0000 (22:55 +0000)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644

Change-Id: I87ad6c5bad9275df8b1a131b3ac0daf7ec8ed5e4

6 years ago[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am...
Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:02 +0000 (22:55 +0000)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4

Change-Id: I26b97af90ef6ea8b640ff7198b2883297d4fb03e

6 years ago[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a
Android Build Merger (Role) [Fri, 6 Jul 2018 22:54:55 +0000 (22:54 +0000)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a

Change-Id: Ieb925f073b80e4d624552e738d49b0996f0485ae

6 years agoResolve inconsistent parcel read in NanoAppFilter
Arthur Ishiguro [Mon, 25 Jun 2018 18:31:33 +0000 (11:31 -0700)]
Resolve inconsistent parcel read in NanoAppFilter

Bug: 77599679
Test: Compile only
Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:55:05 +0000 (02:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into nyc-mr2-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:55:05 +0000 (02:55 +0000)]
Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e
  Import translations. DO NOT MERGE

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into nyc-mr2-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)]
Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae
  Import translations. DO NOT MERGE

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:46:51 +0000 (02:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into nyc-mr2-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:46:51 +0000 (02:46 +0000)]
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557
  Import translations. DO NOT MERGE

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into nyc-mr2-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]
Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d
  Import translations. DO NOT MERGE

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into nyc-mr2-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]
Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
  Import translations. DO NOT MERGE

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into nyc-mr2-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into nyc-mr2-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
  Import translations. DO NOT MERGE

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae
Android Build Merger (Role) [Thu, 5 Jul 2018 22:39:28 +0000 (22:39 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae

Change-Id: I66b3bb58351d966fbe38e7448c985206e73af9d5

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 22:38:55 +0000 (15:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3ce8cc748d098e3854a7c2b19cdc0d0fe4281288
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
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

6 years agoImport translations. DO NOT MERGE
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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
Android Build Merger (Role) [Thu, 5 Jul 2018 21:38:36 +0000 (21:38 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec

Change-Id: I09e334aa2acf3c0d32b27b9d18193450db041c6a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 21:38:05 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie2a754e3f768b2de4d5ead7c9809143a0208a323
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d
Android Build Merger (Role) [Thu, 5 Jul 2018 21:26:12 +0000 (21:26 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d

Change-Id: I19af9b73c3da999252d25aa656b2ee5898b75662

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 21:25:39 +0000 (14:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3f4f14ff10346e7bd3ce6ae49fb7d62b0b97b29f
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557
Android Build Merger (Role) [Thu, 5 Jul 2018 20:56:29 +0000 (20:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557

Change-Id: Ia499ffa8340bfbf0f2b1ec7dd515ee5cf65f7fb8

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 20:55:54 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie0db7263c998f8b70aa35b99d5207ceab763f25c
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228
Android Build Merger (Role) [Thu, 5 Jul 2018 20:31:54 +0000 (20:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228

Change-Id: Ie556d4be250c4d6f4ade238bb905455aa0454b73

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 20:31:17 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: If9dfa14b67b352f0e43cec9c151e75bcaa361e4d
Auto-generated-cl: translation import

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e
Android Build Merger (Role) [Thu, 5 Jul 2018 20:24:50 +0000 (20:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e

Change-Id: I8214434dd8cb7b4e173b0ff49e3b5bf7618125f2

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 20:24:08 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE

Change-Id: I49d05b7d8f35cccb3dfe0fef1b04f5e08490e7de
Auto-generated-cl: translation import

6 years agoMerge "RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing" into nyc...
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge "RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing" into nyc-mr1-dev