OSDN Git Service

android-x86/frameworks-base.git
6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743
Android Build Merger (Role) [Sun, 10 Jun 2018 05:13:55 +0000 (05:13 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743

Change-Id: Iedcf37b86d6a03f8a8f47f1f9be1ffec5b25d107

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 10 Jun 2018 05:13:39 +0000 (22:13 -0700)]
Import translations. DO NOT MERGE

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

6 years agoMerge changes from topic "dynamic-ref-se-mnc-dev" into nyc-mr2-dev
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into nyc-mr2-dev

* changes:
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a am: c7e3991628 am: c3aa2a4d3f
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a am: c7e3991628
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0
  Fix DynamicRefTable::load security bug

6 years agoMerge changes from topic "dynamic-ref-se-mnc-dev" into cw-f-dev
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into cw-f-dev

* changes:
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a am: c7e3991628
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce
  [automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0
  Fix DynamicRefTable::load security bug

6 years agoMerge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into nyc-mr2-dev
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into nyc-mr2-dev

* changes:
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983 am: ad43c89030 am: a659d7c233
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983 am: ad43c89030
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008
  ResStringPool: Prevenet boot loop from se fix

6 years agoMerge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into cw-f-dev
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into cw-f-dev

* changes:
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983 am: ad43c89030
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008
  ResStringPool: Prevenet boot loop from se fix

6 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
Android Build Merger (Role) [Wed, 6 Jun 2018 17:13:01 +0000 (17:13 +0000)]
[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a am: c7e3991628 am: c3aa2a4d3f

Change-Id: I2d0676d161e47b400d110c3239cdaaf002c72ec3

6 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:53 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a am: c7e3991628

Change-Id: Ia7adde45bd85d2b3a56ede7215732cc05d97d870

6 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:46 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69 am: 69b14d2a1a

Change-Id: I6e7ab766f6c88e61b8c2993a2f1420efc177319a

6 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:39 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606 am: 6f76fbfc69

Change-Id: I43c9c68ca69d26f6d4d2dee3cd2a66d5e4a73761

6 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:24 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9 am: 0938689606

Change-Id: Ib9e372290f9b2e1fa73470db3f7fd67bc9190711

6 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:18 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce am: aeb2fc64d9

Change-Id: I0556ef6fb1ceb02f4972c7434895cfeb5e13188d

6 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:11 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce

Change-Id: I17fcbac2b6a7860749ddaabf6324cd89e3b78570

6 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:04 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0

Change-Id: I17682a41fbacafd30a032bd78b176a883bc7bdd8

6 years agoFix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 30 May 2018 19:17:01 +0000 (12:17 -0700)]
Fix DynamicRefTable::load security bug

DynamicRefTables parsed from apks are missing bounds checks that prevent
buffer overflows. This changes verifies the bounds of the header before
attempting to preform operations on the chunk.

Bug: 79488511
Test: run cts -m CtsAppSecurityHostTestCases \
        -t android.appsecurity.cts.CorruptApkTests

Change-Id: I02c8ad957da244fce777ac68a482e4e8fa70f846
Merged-In: I02c8ad957da244fce777ac68a482e4e8fa70f846

6 years ago[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped...
Android Build Merger (Role) [Wed, 6 Jun 2018 16:28:04 +0000 (16:28 +0000)]
[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped: eb86ac42e6 am: a60d0b2e93 am: a16b03c540 am: acb5b014af am: c62d510887 am: ea648c6a2b

Change-Id: I0f2860081d8a65d239d0beba1499bb69c3527c2c

6 years ago[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped...
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:57 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped: eb86ac42e6 am: a60d0b2e93 am: a16b03c540 am: acb5b014af am: c62d510887

Change-Id: I0e91789c55c400c15315c51e0f99f3a44ed2d913

6 years ago[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped...
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:50 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped: eb86ac42e6 am: a60d0b2e93 am: a16b03c540 am: acb5b014af

Change-Id: If7742e7a94602f120b1ec1db9ff763998adae344

6 years ago[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped...
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:43 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped: eb86ac42e6 am: a60d0b2e93 am: a16b03c540

Change-Id: I3b08cf27f6407fdf5789f8a49c3b3aa49f1c1ecd

6 years ago[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped...
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:30 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped: eb86ac42e6 am: a60d0b2e93

Change-Id: I23ca86e3bf3df6684d88f1be575f2be1599ac9eb

6 years ago[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped...
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:24 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped: eb86ac42e6

Change-Id: Ida4ae11d778115fb1f0d373523f71845fff88331

6 years agoMerge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into nyc-mr2-dev
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into nyc-mr2-dev

* changes:
  [automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932 am: a72cb45f89 am: f5d69aa775
  [automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932 am: a72cb45f89
  [automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932
  [automerger] Optimise the hit test algorithm am: 71ecf5bd5c
  Optimise the hit test algorithm

6 years agoMerge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into cw-f-dev
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into cw-f-dev

* changes:
  [automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932 am: a72cb45f89
  [automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932
  [automerger] Optimise the hit test algorithm am: 71ecf5bd5c
  Optimise the hit test algorithm

6 years agoMerge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into nyc-mr1-dev
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into nyc-mr1-dev

* changes:
  [automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932
  [automerger] Optimise the hit test algorithm am: 71ecf5bd5c
  Optimise the hit test algorithm

6 years agoMerge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into nyc-dr1-dev
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00b" into nyc-dr1-dev

* changes:
  [automerger] Optimise the hit test algorithm am: 71ecf5bd5c
  Optimise the hit test algorithm

6 years agoMerge "Optimise the hit test algorithm" into nyc-dev
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge "Optimise the hit test algorithm" into nyc-dev

6 years ago[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e...
Android Build Merger (Role) [Wed, 6 Jun 2018 15:06:06 +0000 (15:06 +0000)]
[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983 am: ad43c89030 am: a659d7c233

Change-Id: I9d69a905d320039a24b3c5e1878b7458251ab93a

6 years ago[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e...
Android Build Merger (Role) [Wed, 6 Jun 2018 15:06:00 +0000 (15:06 +0000)]
[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983 am: ad43c89030

Change-Id: I74d2d54d69e0b7bfbdca1152a8dd9b0fe51727f5

6 years ago[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e...
Android Build Merger (Role) [Wed, 6 Jun 2018 15:05:53 +0000 (15:05 +0000)]
[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983

Change-Id: I34f05a182873509dd1e19a5692af5001d58cf8ec

6 years ago[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e...
Android Build Merger (Role) [Wed, 6 Jun 2018 15:05:41 +0000 (15:05 +0000)]
[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404

Change-Id: I8774e7b9ca61abd7fbfc43f0d4793cea41ae2e7c

6 years ago[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e...
Android Build Merger (Role) [Wed, 6 Jun 2018 15:05:24 +0000 (15:05 +0000)]
[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6

Change-Id: I5c8048d78c4e499419cee8b60e1a591c47b5456b

6 years ago[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e...
Android Build Merger (Role) [Wed, 6 Jun 2018 15:05:12 +0000 (15:05 +0000)]
[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59

Change-Id: I0de34641572b18ba701f41df542124b6331537c0

6 years ago[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436
Android Build Merger (Role) [Wed, 6 Jun 2018 15:04:54 +0000 (15:04 +0000)]
[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436

Change-Id: I50e23f33371f7f1e47b65d421628ab771238b278

6 years ago[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008
Android Build Merger (Role) [Wed, 6 Jun 2018 15:04:30 +0000 (15:04 +0000)]
[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008

Change-Id: Ie8651904560e43e89374df132bf30cd615718192

6 years agoResStringPool: Prevenet boot loop from se fix
Ryan Mitchell [Mon, 21 May 2018 20:59:23 +0000 (13:59 -0700)]
ResStringPool: Prevenet boot loop from se fix

Changes the logs adding in a previous security fix to warnings so
devices with malformed APKs currently on them will not undergo DOS when
they are upgraded to P.

Bug: 79724567
Test: run cts -m CtsAppSecurityHostTestCases \
          -t android.appsecurity.cts.CorruptApkTests

Change-Id: Ied54e4bb14abdaf79da562022c7ea6075187c1f8
(cherry picked from commit f05f47b2c1838529e682ad8f931d3da72244b1a1)

6 years ago[automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932 am: a72cb4...
Android Build Merger (Role) [Thu, 31 May 2018 16:46:41 +0000 (16:46 +0000)]
[automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932 am: a72cb45f89 am: f5d69aa775

Change-Id: Ic2d4d3ead4926ff0f8021725e28aee4ebfc369f3
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0

6 years ago[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41
Android Build Merger (Role) [Mon, 4 Jun 2018 15:28:37 +0000 (15:28 +0000)]
[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41

Change-Id: I4c318ee8e717792cbe25caa830e6567572bd03f7

6 years ago[automerger] Optimise the hit test algorithm am: 3b6f84b77c
Android Build Merger (Role) [Mon, 4 Jun 2018 15:28:29 +0000 (15:28 +0000)]
[automerger] Optimise the hit test algorithm am: 3b6f84b77c

Change-Id: I881f5f6db05ad200a6d8507956664c8f25172dc9

6 years agoOptimise the hit test algorithm
Mihai Popa [Wed, 9 May 2018 16:31:48 +0000 (17:31 +0100)]
Optimise the hit test algorithm

Layout#getOffsetForHorizontal was running in O(n^2) time, where n is the
length of the current line. The method is used when a touch event
happens on a text line, to compute the cursor offset (and the character)
where it happened. Although this is not an issue in common usecases,
where the number of characters on a line is relatively small, this can
be very inefficient as a consequence of Unicode containing 0-width
(invisible) characters. Specifically, there are characters defining the
text direction (LTR or RTL), which cause our algorithm to touch the
worst case quadratic runtime. For example, a person is able to send a
message containing a few visible characters, and also a lot of these
direction changing invisible ones. When the receiver touches the message
(causing the Layout#getOffsetForHorizontal method to be called), the
receiver's application would become not responsive.

This CL optimizes the method to run in O(n) worst case. This is achieved
by computing the measurements of all line prefixes at first, which can
be done in a single pass. Then, all the prefix measurement queries will
be answered in O(1), rather than O(n) as it was happening before.

Bug: 79215201
Test: manual testing
Change-Id: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0

6 years ago[automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932 am: a72cb45f89
Android Build Merger (Role) [Thu, 31 May 2018 16:46:34 +0000 (16:46 +0000)]
[automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932 am: a72cb45f89

Change-Id: I9fa897b6bd6b5291d2956a38a3740b4f6d783ab2

6 years ago[automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932
Android Build Merger (Role) [Thu, 31 May 2018 16:46:27 +0000 (16:46 +0000)]
[automerger] Optimise the hit test algorithm am: 71ecf5bd5c am: 42eaa8f932

Change-Id: I2ac44759ff615b32724f5235d3e5e8dc8c9b4ced

6 years ago[automerger] Optimise the hit test algorithm am: 71ecf5bd5c
Android Build Merger (Role) [Thu, 31 May 2018 16:46:17 +0000 (16:46 +0000)]
[automerger] Optimise the hit test algorithm am: 71ecf5bd5c

Change-Id: If1c91f3bc1e785434f153c5bc0d14befbc75e6cb

6 years agoOptimise the hit test algorithm
Mihai Popa [Wed, 9 May 2018 16:31:48 +0000 (17:31 +0100)]
Optimise the hit test algorithm

Layout#getOffsetForHorizontal was running in O(n^2) time, where n is the
length of the current line. The method is used when a touch event
happens on a text line, to compute the cursor offset (and the character)
where it happened. Although this is not an issue in common usecases,
where the number of characters on a line is relatively small, this can
be very inefficient as a consequence of Unicode containing 0-width
(invisible) characters. Specifically, there are characters defining the
text direction (LTR or RTL), which cause our algorithm to touch the
worst case quadratic runtime. For example, a person is able to send a
message containing a few visible characters, and also a lot of these
direction changing invisible ones. When the receiver touches the message
(causing the Layout#getOffsetForHorizontal method to be called), the
receiver's application would become not responsive.

This CL optimizes the method to run in O(n) worst case. This is achieved
by computing the measurements of all line prefixes at first, which can
be done in a single pass. Then, all the prefix measurement queries will
be answered in O(1), rather than O(n) as it was happening before.

Bug: 79215201
Test: manual testing
Change-Id: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0

6 years ago[automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a...
Android Build Merger (Role) [Tue, 22 May 2018 21:59:39 +0000 (21:59 +0000)]
[automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313

Change-Id: I49cbda7a4d9643808cc9c164970a6ee630b2233c

6 years ago[automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a
Android Build Merger (Role) [Tue, 22 May 2018 21:59:34 +0000 (21:59 +0000)]
[automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a

Change-Id: I0f74a4a39349e7c45f1468776618e360be87090c

6 years ago[automerger] Make safe label more safe am: 2263da9539 am: 05086b1008
Android Build Merger (Role) [Tue, 22 May 2018 21:59:30 +0000 (21:59 +0000)]
[automerger] Make safe label more safe am: 2263da9539 am: 05086b1008

Change-Id: Ibf0d6da3ef712a2cc45587d59880ddce03a34447

6 years ago[automerger] Make safe label more safe am: 2263da9539
Android Build Merger (Role) [Tue, 22 May 2018 21:59:24 +0000 (21:59 +0000)]
[automerger] Make safe label more safe am: 2263da9539

Change-Id: If833354e5ae2b056de124fe23f0414c7654f6c33

6 years agoMake safe label more safe
Todd Kennedy [Thu, 3 May 2018 09:05:04 +0000 (10:05 +0100)]
Make safe label more safe

* limit the absolute maximum size of the label to 50000 characters
[which is probably far more than necessary, but, can be dialed down]

* use a string buffer while processing the string [instead of creating
multiple string objects]

Bug: 62537081
Test: Manual. Install APK in bug and see that it can be uninstalled
Change-Id: Ibf63c2691ad7438a123e92110d95b1f50050f8b1
Merged-In: Ibf63c2691ad7438a123e92110d95b1f50050f8b1

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into nyc-mr2-dev
TreeHugger Robot [Mon, 21 May 2018 17:03:49 +0000 (17:03 +0000)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into nyc-mr2-dev

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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 21 May 2018 17:03:49 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into nyc-mr2-dev
TreeHugger Robot [Thu, 17 May 2018 23:23:10 +0000 (23:23 +0000)]
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into nyc-mr2-dev

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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:23:10 +0000 (23:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into nyc-mr2-dev
TreeHugger Robot [Thu, 17 May 2018 23:22:37 +0000 (23:22 +0000)]
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into nyc-mr2-dev

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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:22:37 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into nyc-mr2-dev
TreeHugger Robot [Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)]
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into nyc-mr2-dev

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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into nyc-mr2-dev
TreeHugger Robot [Thu, 17 May 2018 23:20:31 +0000 (23:20 +0000)]
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into nyc-mr2-dev

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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:20:31 +0000 (23:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into nyc-mr2-dev
TreeHugger Robot [Thu, 17 May 2018 23:17:54 +0000 (23:17 +0000)]
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into nyc-mr2-dev

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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:17:54 +0000 (23:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into nyc-mr2-dev
TreeHugger Robot [Thu, 17 May 2018 23:17:28 +0000 (23:17 +0000)]
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into nyc-mr2-dev

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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:17:28 +0000 (23:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into nyc-mr2-dev
TreeHugger Robot [Thu, 17 May 2018 23:16:59 +0000 (23:16 +0000)]
Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into nyc-mr2-dev

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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:16:59 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into nyc-mr2-dev
TreeHugger Robot [Thu, 17 May 2018 23:11:49 +0000 (23:11 +0000)]
Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into nyc-mr2-dev

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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:11:49 +0000 (23:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into nyc-mr2-dev
TreeHugger Robot [Thu, 17 May 2018 23:08:40 +0000 (23:08 +0000)]
Merge changes from topic "am-93ef86f6-d908-4917-b503-5ba7fcefcad8" into nyc-mr2-dev

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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:08:40 +0000 (23:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0
Android Build Merger (Role) [Thu, 17 May 2018 20:23:15 +0000 (20:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0

Change-Id: Ica203d86f848c960f78cbfc52f2a79235775b5ad

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

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e
Android Build Merger (Role) [Thu, 17 May 2018 20:16:44 +0000 (20:16 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e

Change-Id: I1f62a7df5e9abe4a14bb1f8dd746518935ad3799

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

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc
Android Build Merger (Role) [Thu, 17 May 2018 19:24:14 +0000 (19:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc

Change-Id: I2175abb2fc2242262851b262cbfab21be2aea9f6

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 19:23:50 +0000 (12:23 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862
Android Build Merger (Role) [Thu, 17 May 2018 19:15:52 +0000 (19:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862

Change-Id: Id48d35e7d3e303142ce734b6fe8d120bc7a63900

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 19:15:29 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d
Android Build Merger (Role) [Thu, 17 May 2018 19:03:51 +0000 (19:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d

Change-Id: I0bc12ca3b01898ae0bd149dedd037105af6ba09f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 19:03:25 +0000 (12:03 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96
Android Build Merger (Role) [Thu, 17 May 2018 18:52:30 +0000 (18:52 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96

Change-Id: I8fd53dd1550fedb867e6be3d0f425effcb35088b

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 18:52:07 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2
Android Build Merger (Role) [Thu, 17 May 2018 18:44:38 +0000 (18:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2

Change-Id: I3e8c7aca201fda9fcaaba88e196b49af85a50c9a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 18:44:11 +0000 (11:44 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927
Android Build Merger (Role) [Thu, 17 May 2018 18:31:02 +0000 (18:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927

Change-Id: Ib33139944063e2c0767efc8eaa97d12c2c12efa0

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 18:30:30 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2
Android Build Merger (Role) [Thu, 17 May 2018 18:10:50 +0000 (18:10 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2

Change-Id: Ic51dccbd5c072e301a29a8c343d1d46d96f2dcfc

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 18:10:27 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb
Android Build Merger (Role) [Thu, 17 May 2018 18:04:15 +0000 (18:04 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb

Change-Id: I9d5c9958fe7c4bc4a8ef28f471e7a9bb4ce30ffd

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 18:03:51 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc
Android Build Merger (Role) [Thu, 17 May 2018 17:57:40 +0000 (17:57 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: a52a0f49cc

Change-Id: I7b718beb5044ad046eed73fc54950f724ee70a78

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 17 May 2018 17:57:03 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:41:03 +0000 (17:41 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3 am: 2cb239cf3c am: 8914d11b15

Change-Id: I72861a0685af1981b9a50ebbb8eb315d150f5f63

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:57 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3 am: 2cb239cf3c

Change-Id: I8f405684aae1cdb6aac377861d3387622a20f661

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:52 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3

Change-Id: I756b595747e3d97ddb14dc45ed1b6001ec6ebed8

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:46 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8

Change-Id: I315da9ccb85d9e69edf18dd85b7bdf183bd6f738

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:32 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3

Change-Id: If82fd8b2c76bedf089bec4501169417427854b1d

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:27 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360

Change-Id: I0e5ba8adaed2d6247137319262278fac98f467e1

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e...
Android Build Merger (Role) [Thu, 10 May 2018 17:40:22 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510

Change-Id: I689d44b6617f0ed949e3f72367980158ea06ad0d

6 years ago[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373
Android Build Merger (Role) [Thu, 10 May 2018 17:40:16 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373

Change-Id: I2166c2f9ca0a6654e1a88b1d183062eb1564c24d

6 years agoclearCallingIdentity before calling into getPackageUidAsUser
Tony Mak [Thu, 14 Dec 2017 12:40:07 +0000 (12:40 +0000)]
clearCallingIdentity before calling into getPackageUidAsUser

Fix: 70585244
Bug: 69981755

Test: Enable any accessibility service -> inflate work profile
      -> Tap on any work app -> no longer crash

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.CrossProfileAppsHostSideTest.testPrimaryUserToManagedProfile
Change-Id: I80d18f4e2ab76a228cb0aa2c8312c323a9b5c84d

6 years ago[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f5...
Android Build Merger (Role) [Wed, 9 May 2018 17:19:53 +0000 (17:19 +0000)]
[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 am: 76a04ff670

Change-Id: Id013258bbcfb2664c03df15a082bc04ea053663e