Commits · bb4dcd1099cac4e0b3602e3d2ac088b796df3691 · e / os / android_frameworks_base

This project is mirrored from https://github.com/LineageOS/android_frameworks_base.git. Pull mirroring updated Sep 18, 2020.

28 Sep, 2018 1 commit

RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared... · bb4dcd10

Atanas Kirilov authored Sep 28, 2018

RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."

This reverts commit 05dc947c.

Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug: 114365189

Change-Id: Id667b1c4d1a1af27837f553d7461283b22e5e41f

bb4dcd10

24 Aug, 2018 1 commit
- RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. · 05dc947c
  akirilov authored Aug 24, 2018
```
Bug: 111752150
Test: Manual local test
Change-Id: I0b48a20525f87fc6f5ab8d7e70aa7d11cd747f97
```
  05dc947c
17 Aug, 2018 1 commit
- Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev · 5b78b001
  TreeHugger Robot authored Aug 17, 2018
  
  5b78b001
15 Aug, 2018 20 commits

Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into oc-dev · fc28b6b7

Mihai Popa authored Aug 15, 2018

* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc am: f7f008f5 am: 7693ce7e am: 11ba74cc
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc am: f7f008f5 am: 7693ce7e
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc am: f7f008f5
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7
  Fix crash during cursor moving on BiDi text

fc28b6b7

Merge changes from topic "am-c709fe3e-1c07-4ecd-9998-2477e3445dd4" into oc-dev · d5e6e1e8

Mihai Popa authored Aug 15, 2018

* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f am: 12baaa2b am: 99e3f649 am: a959ee22 am: 8f85f5ff
  [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f am: 12baaa2b am: 99e3f649 am: a959ee22
  [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f am: 12baaa2b am: 99e3f649
  [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f am: 12baaa2b
  [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f
  Fix crash during cursor moving on BiDi text

d5e6e1e8

Merge "Fix crash during cursor moving on BiDi text" into oc-dev · e385255d
Mihai Popa authored Aug 15, 2018

e385255d

[automerger] Fix crash during cursor moving on BiDi text am: am:... · dfec065b

Android Build Merger (Role) authored Aug 15, 2018

[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f am: 12baaa2b am: 99e3f649 am: a959ee22 am: 8f85f5ff

Change-Id: If854f61c2516a61ac36426c10eafd30bf638e919

dfec065b

[automerger] Fix crash during cursor moving on BiDi text am: am:... · 8f85f5ff

Android Build Merger (Role) authored Aug 15, 2018

[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f am: 12baaa2b am: 99e3f649 am: a959ee22

Change-Id: I7cb6623befc84f76e783b8800aa18ce28a8cc2b7

8f85f5ff

[automerger] Fix crash during cursor moving on BiDi text am: am:... · a959ee22

Android Build Merger (Role) authored Aug 15, 2018

[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f am: 12baaa2b am: 99e3f649

Change-Id: I16bff43cf755e443ed53f7a45469351c498f977f

a959ee22

[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f am: 12baaa2b · 99e3f649
Android Build Merger (Role) authored Aug 15, 2018
```
Change-Id: Iaf0aded3004f33fdb52dd0c19779329991b24746
```
99e3f649
[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f · 12baaa2b
Android Build Merger (Role) authored Aug 15, 2018
```
Change-Id: I221d974ba9402c088235d5bdb3c94e91cf4167ba
```
12baaa2b

Fix crash during cursor moving on BiDi text · 82c84d5f

Seigo Nonaka authored Jul 19, 2018

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

82c84d5f

Fix crash during cursor moving on BiDi text · f496a7cd

Seigo Nonaka authored Jul 19, 2018

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

f496a7cd

[automerger] Fix crash during cursor moving on BiDi text am: am:... · 01ff91a0

Android Build Merger (Role) authored Aug 15, 2018

[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc am: f7f008f5 am: 7693ce7e am: 11ba74cc

Change-Id: Ia5fad0a4e89e6ff44c546ab71f37f657a3313f0d

01ff91a0

[automerger] Fix crash during cursor moving on BiDi text am: am:... · 11ba74cc

Android Build Merger (Role) authored Aug 15, 2018

[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc am: f7f008f5 am: 7693ce7e

Change-Id: Ic311029be8ab99f4aaae526d980da0f2436c5459

11ba74cc

[automerger] Fix crash during cursor moving on BiDi text am: am:... · 7693ce7e

Android Build Merger (Role) authored Aug 15, 2018

[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc am: f7f008f5

Change-Id: I4122a5c548c4b3395bb546c459c34f10b319ad29

7693ce7e

[automerger] Fix crash during cursor moving on BiDi text am: am:... · f7f008f5

Android Build Merger (Role) authored Aug 15, 2018

[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f am: 74ffd2bc

Change-Id: I680848db0e845617323ecca36c380fdf890789d9

f7f008f5

[automerger] Fix crash during cursor moving on BiDi text am: am:... · 74ffd2bc

Android Build Merger (Role) authored Aug 15, 2018

[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f am: 65082f8f

Change-Id: I27b2220f568a37ff16b0dfc3376d7e46cb3659c9

74ffd2bc

[automerger] Fix crash during cursor moving on BiDi text am: am:... · 65082f8f

Android Build Merger (Role) authored Aug 15, 2018

[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0 am: 04c7154f

Change-Id: Ic801a54fa6cb048ddf911c7b315849ab40bd7a52

65082f8f

[automerger] Fix crash during cursor moving on BiDi text am: am:... · 04c7154f

Android Build Merger (Role) authored Aug 15, 2018

[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e skipped: 723f13d0

Change-Id: If1607fb19bd806cb6d0f9b9010032e95df6549a8

04c7154f

[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 am: b7a2d47e · 723f13d0
Android Build Merger (Role) authored Aug 15, 2018
```
Change-Id: I6995aab201805b64e81022db295356ef8abda30c
```
723f13d0
[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7 · b7a2d47e
Android Build Merger (Role) authored Aug 15, 2018
```
Change-Id: Id97c3f508a0dcd82978b06891b3a979921d4be3a
```
b7a2d47e

Fix crash during cursor moving on BiDi text · 95218ce7

Seigo Nonaka authored Jul 19, 2018

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

95218ce7

14 Aug, 2018 7 commits

Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev · 9d85c1ff

Atanas Kirilov authored Aug 14, 2018

* changes:
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725 am: 7d252f5e am: a491c048 am: 9310c5bd skipped: c565a7f7
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725 am: 7d252f5e am: a491c048 am: 9310c5bd
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725 am: 7d252f5e am: a491c048
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725 am: 7d252f5e
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725
  RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.

9d85c1ff

Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-mr2-dev · cdc0a14f

Atanas Kirilov authored Aug 14, 2018

* changes:
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725 am: 7d252f5e am: a491c048 am: 9310c5bd
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725 am: 7d252f5e am: a491c048
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725 am: 7d252f5e
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725
  RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.

cdc0a14f

Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into cw-f-dev · 96e845cc

Atanas Kirilov authored Aug 14, 2018

* changes:
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725 am: 7d252f5e am: a491c048
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725 am: 7d252f5e
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725
  RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.

96e845cc

Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-mr1-dev · 7ae6e656

Atanas Kirilov authored Aug 14, 2018

* changes:
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725 am: 7d252f5e
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725
  RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.

7ae6e656

Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-dr1-dev · fce27e85

Atanas Kirilov authored Aug 14, 2018

* changes:
  [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725
  RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.

fce27e85

Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into nyc-dev · 8aecc35a
Atanas Kirilov authored Aug 14, 2018

8aecc35a
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into oc-dev · 5315bbfb
Atanas Kirilov authored Aug 14, 2018

5315bbfb

10 Aug, 2018 1 commit

Merge changes from topic "back111085900" into oc-dev · f0095ec4

Jeff Sharkey authored Aug 10, 2018

* changes:
  DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.
  DO NOT MERGE. Execute "strict" queries with extra parentheses.

f0095ec4

09 Aug, 2018 9 commits

[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.... · 4ccfb1d0

Android Build Merger (Role) authored Aug 09, 2018

[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f am: c09bb997 am: 424304f8 am: b2e2b138 skipped: a2ad2596

Change-Id: I18dbb198314da3b3722e5b0dfbd9f1dd1e203d4a

4ccfb1d0

[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.... · a2ad2596

Android Build Merger (Role) authored Aug 09, 2018

[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f am: c09bb997 am: 424304f8 am: b2e2b138

Change-Id: Icdb977d8cb260d5210d103f306de550b3f8fed96

a2ad2596

[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.... · b2e2b138

Android Build Merger (Role) authored Aug 09, 2018

[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f am: c09bb997 am: 424304f8

Change-Id: I4c0f715b12df5e7ffb4f3a1b7cf9ae5da4be22ca

b2e2b138

[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.... · 424304f8

Android Build Merger (Role) authored Aug 09, 2018

[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f am: c09bb997

Change-Id: I544bf2c6b5d0177aa70a6fb7bd4225d4d04881fd

424304f8

[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f · c09bb997
Android Build Merger (Role) authored Aug 09, 2018
```
Change-Id: I6cdb5a5dd5531ad53ef02174ff5063788d11029d
```
c09bb997

[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses.... · f5c1a7ca

Android Build Merger (Role) authored Aug 09, 2018

[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd565 am: 8ecd22c0 am: 97d0d2c2 am: ca5fd693 skipped: 19d2af61

Change-Id: I66ddfbffbec736061780c86c9c9e542fe2a200ba

f5c1a7ca

[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses.... · 19d2af61

Android Build Merger (Role) authored Aug 09, 2018

[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd565 am: 8ecd22c0 am: 97d0d2c2 am: ca5fd693

Change-Id: Iccacb48d382a3fd8012dff81c3d8482afe0e5f14

19d2af61

[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses.... · ca5fd693

Android Build Merger (Role) authored Aug 09, 2018

[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd565 am: 8ecd22c0 am: 97d0d2c2

Change-Id: I92820ffe7b45077bc4beaf97144a7b7eb3117af0

ca5fd693

[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses.... · 97d0d2c2

Android Build Merger (Role) authored Aug 09, 2018

[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd565 am: 8ecd22c0

Change-Id: Ia9f489c55def0f592383ac2a10f5bd0b34c2663d

97d0d2c2