OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "Disable testEnableRollbackTimeoutFailsRollback test." into qt-dev
TreeHugger Robot [Thu, 11 Jul 2019 17:03:07 +0000 (17:03 +0000)]
Merge "Disable testEnableRollbackTimeoutFailsRollback test." into qt-dev

5 years agoMerge "Redact ISOBMFF boxes with 'free'" into qt-dev
Andrew Lewis [Thu, 11 Jul 2019 13:10:59 +0000 (13:10 +0000)]
Merge "Redact ISOBMFF boxes with 'free'" into qt-dev

5 years agoDisable testEnableRollbackTimeoutFailsRollback test.
Richard Uhler [Thu, 11 Jul 2019 08:32:43 +0000 (09:32 +0100)]
Disable testEnableRollbackTimeoutFailsRollback test.

The test is flaky because it is testing a race condition.

The flakiness is fixed with the help of some new @TestApi in
I01f3e769711ffa51fa714ff4bc81e70887f427ad. Disable the test on those
branches without the fix merged.

Bug: 134373106
Bug: 136605788
Test: atest RollbackTest

Change-Id: I05edfc142c14631b259ae7aaf2dd31af00363a35
Merged-In: I01f3e769711ffa51fa714ff4bc81e70887f427ad

5 years agoMerge "Use a Region when calculating TouchableRegion for cutouts" into qt-dev
TreeHugger Robot [Thu, 11 Jul 2019 06:33:20 +0000 (06:33 +0000)]
Merge "Use a Region when calculating TouchableRegion for cutouts" into qt-dev

5 years agoMerge "Q card." into qt-dev
Daniel Sandler [Thu, 11 Jul 2019 03:45:56 +0000 (03:45 +0000)]
Merge "Q card." into qt-dev

5 years agoMerge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev am...
Bryan Ferris [Thu, 11 Jul 2019 00:52:54 +0000 (17:52 -0700)]
Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev am: 4244190788 am: 61ea78238e am: 61581686b6
am: 8c5f02eddd

Change-Id: Ic2236ac466bd86e019b7c004e9498493e16b96b7

5 years agoMerge "Fix NullPointerException." into qt-dev
anwarg [Thu, 11 Jul 2019 00:49:02 +0000 (00:49 +0000)]
Merge "Fix NullPointerException." into qt-dev

5 years agoMerge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev am...
Bryan Ferris [Thu, 11 Jul 2019 00:41:49 +0000 (17:41 -0700)]
Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev am: 4244190788 am: 61ea78238e
am: 61581686b6

Change-Id: I528351af6ed11b2cd486f9fee42ad09b69cd8d56

5 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev am: 8abe600b81...
Bryan Ferris [Thu, 11 Jul 2019 00:40:59 +0000 (17:40 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev am: 8abe600b81 am: 4fea890c18 am: f97b567234
am: 3b0124864c

Change-Id: Ic6125cb837134ad7027ac763240a0f59534605b4

5 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev am: 8abe600b81...
Bryan Ferris [Thu, 11 Jul 2019 00:28:45 +0000 (17:28 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev am: 8abe600b81 am: 4fea890c18
am: f97b567234

Change-Id: I3e7a09fa3e1568696b129d28298bbf2836d1d718

5 years agoMerge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev am...
Bryan Ferris [Thu, 11 Jul 2019 00:28:34 +0000 (17:28 -0700)]
Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev am: 4244190788
am: 61ea78238e

Change-Id: I0b4af47df7862451ba65246b232459d37441c837

5 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev am: 8abe600b81
Bryan Ferris [Thu, 11 Jul 2019 00:19:27 +0000 (17:19 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev am: 8abe600b81
am: 4fea890c18

Change-Id: Ie296e5c7186739812d8ea2a1bc4806da5e92563a

5 years agoMerge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev
Bryan Ferris [Thu, 11 Jul 2019 00:13:54 +0000 (17:13 -0700)]
Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev
am: 4244190788

Change-Id: Id4563c2be11b532bdbd1b504b4a83734eed58708

5 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev
Bryan Ferris [Wed, 10 Jul 2019 23:52:52 +0000 (16:52 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev
am: 8abe600b81

Change-Id: I6a8ddfc1c5fb771194f9b7d6c5eb335b0ddc70c0

5 years agoMerge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev
Bryan Ferris [Wed, 10 Jul 2019 23:39:53 +0000 (23:39 +0000)]
Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev

* changes:
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: d3e81cd63f
  Fix Layout.primaryIsTrailingPreviousAllLineOffsets

5 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev
Bryan Ferris [Wed, 10 Jul 2019 23:11:15 +0000 (23:11 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev

5 years agoUse a Region when calculating TouchableRegion for cutouts
Evan Laird [Wed, 10 Jul 2019 19:55:45 +0000 (15:55 -0400)]
Use a Region when calculating TouchableRegion for cutouts

HeadsUpManagerPhone handles adding extra touchable region for the
display cutout. When this changed to use Rects, the extra touch region
was applied to the entire phone width because Rect#union() will cause
the resulting Rect to grow in every dimension. The fix is to use a
Region instead so we can properly union only the space under the notch

Fixes: 135487528
Test: manual
Change-Id: I1d39785087cc3378fc42363df170b81b84420a8e

5 years agoMerge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev am...
Bryan Ferris [Wed, 10 Jul 2019 22:43:46 +0000 (15:43 -0700)]
Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev am: ecc48fbc96 am: f56e704fb5 am: cbac93ac65
am: 137d01def7

Change-Id: I758e4303bf34a82d3e57f800458d34978be5a494

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am...
Mihai Popa [Wed, 10 Jul 2019 22:39:55 +0000 (15:39 -0700)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d am: 126189263d am: 29534f6c57 am: 09bfff78dd am: 36e9a7af7f
am: ff4203a42f

Change-Id: I17193c918ac1e11defda8c275ed9d0b69253d763

5 years agoMerge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev am...
Bryan Ferris [Wed, 10 Jul 2019 22:33:21 +0000 (15:33 -0700)]
Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev am: ecc48fbc96 am: f56e704fb5
am: cbac93ac65

Change-Id: I2067316d6788061b74bd411c83ed5a60f70c3128

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am...
Mihai Popa [Wed, 10 Jul 2019 22:29:42 +0000 (15:29 -0700)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d am: 126189263d am: 29534f6c57 am: 09bfff78dd
am: 36e9a7af7f

Change-Id: Iead8dd8c3e4a0e675a86767bae54c2ddd599e65a

5 years agoMerge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev am...
Bryan Ferris [Wed, 10 Jul 2019 22:15:15 +0000 (15:15 -0700)]
Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev am: ecc48fbc96
am: f56e704fb5

Change-Id: I1f7f271c666fa52be7eef894cf2fc225780113fc

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am...
Mihai Popa [Wed, 10 Jul 2019 22:10:48 +0000 (15:10 -0700)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d am: 126189263d am: 29534f6c57
am: 09bfff78dd

Change-Id: I8012a2d94f72d0d57fa3086293d81c0e3c8e6316

5 years agoMerge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev
Bryan Ferris [Wed, 10 Jul 2019 22:01:49 +0000 (15:01 -0700)]
Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev
am: ecc48fbc96

Change-Id: Ie784856bd6bdb05921d7a3c6423ab7d103e5133c

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am...
Mihai Popa [Wed, 10 Jul 2019 21:56:38 +0000 (14:56 -0700)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d am: 126189263d
am: 29534f6c57

Change-Id: Id615c055975d251f45ec995c389e4acbe1274cd8

5 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev am: 56ff278c98
Bryan Ferris [Wed, 10 Jul 2019 21:50:58 +0000 (14:50 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev am: 56ff278c98
am: 4321d1288e

Change-Id: I17542d6120f01e0ba0ae273e73ad37e0de6a2f51

5 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into pi-dev
Bryan Ferris [Wed, 10 Jul 2019 21:46:49 +0000 (14:46 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into pi-dev
am: a94d8aed24

Change-Id: I3ab6bbf65d6b78f5cb5a6a544952afd43b4b2c7b

5 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev
Bryan Ferris [Wed, 10 Jul 2019 21:37:54 +0000 (14:37 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev
am: 56ff278c98

Change-Id: I5d0aa8799d45d5a75d46691aec2d3487bb27a0a7

5 years agoMerge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev
Bryan Ferris [Wed, 10 Jul 2019 21:11:06 +0000 (21:11 +0000)]
Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev

* changes:
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7 am: 2f9dd0cc12
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04
  Fix Layout.primaryIsTrailingPreviousAllLineOffsets

5 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev
Bryan Ferris [Wed, 10 Jul 2019 21:10:22 +0000 (21:10 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev

5 years agoMerge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into pi-dev
Bryan Ferris [Wed, 10 Jul 2019 21:10:18 +0000 (21:10 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into pi-dev

5 years agoRedact ISOBMFF boxes with 'free'
Andrew Lewis [Wed, 10 Jul 2019 12:14:24 +0000 (13:14 +0100)]
Redact ISOBMFF boxes with 'free'

Test: atest MediaStore_Video_MediaTest android.os.RedactingFileDescriptorTest
Bug: 135499138
Change-Id: Idaa8ad30300d5427f91bb2543be3152881018cf6

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:55 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7 am: 2f9dd0cc12

Change-Id: I287035dba62fde67b298ef638e2316b36837ee6b

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:52 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7

Change-Id: If8c3c336f3794cab0806a97a7f13d4aec38535c3

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:47 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605

Change-Id: I192651416d07a9adb1897efb7ed4882d94b8a43e

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:43 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c

Change-Id: I7490ff21f3c5183423bcb70f3d08c2879b80e28b

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:40 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04

Change-Id: I7fcc292a58dc297d2725ae3df99d637bbd1a8479

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:37 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d am: 126189263d

Change-Id: If52ab20b7cd84d02518bdfcd46987e329b654e2d

5 years agoFix Layout.primaryIsTrailingPreviousAllLineOffsets
Mihai Popa [Tue, 25 Jun 2019 10:15:18 +0000 (11:15 +0100)]
Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am...
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:32 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d am: 77b7393e7d

Change-Id: I2a5373fa2ea348adde8e5592a5a9fa489c7fe12b

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:29 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 2778b1e49d

Change-Id: I0c15ebaddd8d8edb9ff630ffbe4d855219b06907

5 years agoFix Layout.primaryIsTrailingPreviousAllLineOffsets
Mihai Popa [Tue, 25 Jun 2019 10:15:18 +0000 (11:15 +0100)]
Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)

5 years ago[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: d3e81cd63f
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:21 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: d3e81cd63f

Change-Id: I6373d3daeb8358316c0ae2757ed745202219e5c2

5 years agoFix Layout.primaryIsTrailingPreviousAllLineOffsets
Mihai Popa [Tue, 25 Jun 2019 10:15:18 +0000 (11:15 +0100)]
Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)

5 years agoFix Layout.primaryIsTrailingPreviousAllLineOffsets
Mihai Popa [Tue, 25 Jun 2019 10:15:18 +0000 (11:15 +0100)]
Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)

5 years agoFix Layout.primaryIsTrailingPreviousAllLineOffsets
Mihai Popa [Tue, 25 Jun 2019 10:15:18 +0000 (11:15 +0100)]
Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)

5 years agoFix Layout.primaryIsTrailingPreviousAllLineOffsets
Mihai Popa [Tue, 25 Jun 2019 10:15:18 +0000 (11:15 +0100)]
Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)

5 years agoMerge "Use old API to build NetworkTemplate" into qt-dev
Lei Yu [Wed, 10 Jul 2019 17:27:58 +0000 (17:27 +0000)]
Merge "Use old API to build NetworkTemplate" into qt-dev

5 years agoQ card.
Dan Sandler [Wed, 26 Jun 2019 05:01:26 +0000 (01:01 -0400)]
Q card.

(Goodbye, hypno-P and your '90s tech magazine color palette.)

Bug: 123903304
Test: adb shell am start -n android/com.android.internal.app.PlatLogoActivity
Test: adb shell am start -c com.android.internal.category.PLATLOGO -a android.intent.action.MAIN
Test: adb shell am start -n com.android.egg/.paint.PaintActivity # still works
Change-Id: I4865024a14b6a78e7a043c56d2330b5f9dd214c6
Merged-In: I4865024a14b6a78e7a043c56d2330b5f9dd214c6

5 years agoMerge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev
Matt Pape [Wed, 10 Jul 2019 15:50:56 +0000 (15:50 +0000)]
Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev

5 years agoFix NullPointerException.
Richard Uhler [Wed, 10 Jul 2019 14:00:09 +0000 (15:00 +0100)]
Fix NullPointerException.

Fix a NullPointerException that can occur if a package with a recently
created rollback is no longer installed on device when the device boots.

Bug: 137135842
Test: atest CtsRollbackManagerHostTestCases
Change-Id: Ic007e44264647793c6271c3923c13c9e1736a9de

5 years agoMerge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev
TreeHugger Robot [Wed, 10 Jul 2019 12:57:14 +0000 (12:57 +0000)]
Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev

5 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Chienyuan [Wed, 10 Jul 2019 05:23:46 +0000 (22:23 -0700)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855 am: 3aaf2811fc am: df484ced0b am: 2a547afdfa am: b36f88020e
am: 60aad1a06f

Change-Id: I59696232bedf6bc978f66efd8f5df2ec2fb3336a

5 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Chienyuan [Wed, 10 Jul 2019 05:06:03 +0000 (22:06 -0700)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855 am: 3aaf2811fc am: df484ced0b am: 2a547afdfa
am: b36f88020e

Change-Id: I34205b247a3261c940c9704f8b3f03bd10ec3238

5 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Chienyuan [Wed, 10 Jul 2019 04:47:21 +0000 (21:47 -0700)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855 am: 3aaf2811fc am: df484ced0b
am: 2a547afdfa

Change-Id: I0ec4664b3654fb0b8397a89b8948183413d7d522

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Wed, 10 Jul 2019 04:38:34 +0000 (04:38 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Chienyuan [Wed, 10 Jul 2019 04:33:15 +0000 (21:33 -0700)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855 am: 3aaf2811fc
am: df484ced0b

Change-Id: I174f1594f8f7ae21979398ba29b961e95bd47c75

5 years agoMerge "Clear the calling identity in isUsableDisplay." into qt-dev
TreeHugger Robot [Wed, 10 Jul 2019 01:51:24 +0000 (01:51 +0000)]
Merge "Clear the calling identity in isUsableDisplay." into qt-dev

5 years agoUse old API to build NetworkTemplate
Lei Yu [Tue, 9 Jul 2019 22:17:49 +0000 (15:17 -0700)]
Use old API to build NetworkTemplate

Use old API to be consistent with NetworkPolicyManagerService

Bug: 135105735
Test: RunSettingsLibRoboTests & Manual test
Change-Id: I5d04cfd962c3d09cac7d33a97f847771074ab258

5 years agoMerge "Document restricted permissions" into qt-dev
TreeHugger Robot [Tue, 9 Jul 2019 23:38:18 +0000 (23:38 +0000)]
Merge "Document restricted permissions" into qt-dev

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Tue, 9 Jul 2019 21:40:30 +0000 (21:40 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoDocument restricted permissions
Svet Ganov [Tue, 9 Jul 2019 20:23:28 +0000 (13:23 -0700)]
Document restricted permissions

Test: N/A

Bug: 132174864

Change-Id: If56475fc6ac72e17bed8b0960cc63a8ecc87e4de

5 years agoUpdate Mainline rollback lifetime from 2 days to 14 days.
Matt Pape [Tue, 9 Jul 2019 17:41:20 +0000 (10:41 -0700)]
Update Mainline rollback lifetime from 2 days to 14 days.

Test: atest RollbackTest
      atest RollbackE2EHostTestCases
Bug: 137094406

Change-Id: I587d9fca25ead8b7edb76550703837642db545e4

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 9 Jul 2019 17:40:53 +0000 (10:40 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I75c667821566cceb965581d51a0a2e59418faf1f

5 years agoMerge "Update docs for UID_STATE" into qt-dev
TreeHugger Robot [Tue, 9 Jul 2019 17:25:49 +0000 (17:25 +0000)]
Merge "Update docs for UID_STATE" into qt-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 9 Jul 2019 17:22:25 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0d7961d23435734a3202e8d7f285152f3aba3beb

5 years agoFix wallpaper flicker issue while transiting from home to aod.
Ahan Wu [Thu, 4 Jul 2019 12:50:00 +0000 (20:50 +0800)]
Fix wallpaper flicker issue while transiting from home to aod.

There is a race condition between window visibility and wallpaper
transition, so wallpaper window might become visible before background
thread has done its rendering work and a flicker happens.

This solution just lets main thread wait for background thread to
synchronize window visibility and wallpaper transition.

Bug: 136643341
Test: atest SystemUITests
Test: Screen off  Launcher/APP -> AOD : No extra transition by design,
      The duration between press Power Key and AOD show should be same.
Test: Screen on AOD -> Launcher : Face unlock work without flickr
Test: Screen off Keyguard -> AOD : Either Panel or background transition without flickr
Test: Screen on AOD -> Keyguard : Either Panel or background transition without flickr
Test: Reach in AOD -> Keyguard : Either Panel or background transition without flickr
Test: Reach out Keyguard -> AOD : Either Panel or background transition without flickr
Test: Manually operate and observe log.
Change-Id: Iebfdac18972569864c047bc2c4a33d7791940896

5 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Android Build Merger (Role) [Tue, 9 Jul 2019 07:11:53 +0000 (07:11 +0000)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855 am: 3aaf2811fc

Change-Id: Id1233680c478ff3367d69375056dd5d0bc1867ff

5 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Android Build Merger (Role) [Tue, 9 Jul 2019 07:11:47 +0000 (07:11 +0000)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929 am: e6bf153855

Change-Id: Ieb2eab9943a3fde047fbfe947ccad105a5f7160d

5 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Android Build Merger (Role) [Tue, 9 Jul 2019 07:11:41 +0000 (07:11 +0000)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3 am: 181fb5b929

Change-Id: Iba55914648e687faaf01bc961c34efbdb72d6569

5 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am...
Android Build Merger (Role) [Tue, 9 Jul 2019 07:11:36 +0000 (07:11 +0000)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277 am: 9ac58f09c3

Change-Id: I231941e32409574af8c15fe9e763169fe09b279f

5 years ago[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277
Android Build Merger (Role) [Tue, 9 Jul 2019 07:11:28 +0000 (07:11 +0000)]
[automerger] HidProfile: sync isPreferred() with HidHostService am: 830217f277

Change-Id: If9cb4de9ab510f1ddfff44a404a0a248cf9103dc

5 years agoHidProfile: sync isPreferred() with HidHostService
Chienyuan [Tue, 9 Jul 2019 07:09:56 +0000 (15:09 +0800)]
HidProfile: sync isPreferred() with HidHostService

HidHostService allow to connect when priority is PRIORITY_UNDEFINED.
HidProfile should return ture when priority is PRIORITY_UNDEFINED.
Otherwise, the "Input device" toggle in off state when HID device
connected.

Bug: 132456322
Test: manual
Change-Id: Id7bae694c57aec17e019d591c0a677e3cb64f845

5 years agoSpecify the duration time base
Svet Ganov [Mon, 8 Jul 2019 23:40:42 +0000 (16:40 -0700)]
Specify the duration time base

Test: N/A

Bug: 128316830

Change-Id: Idd8f1aaf1a8e0013c01fdf4d668f9d5e81101559

5 years agoUpdate docs for UID_STATE
Svet Ganov [Mon, 8 Jul 2019 23:30:45 +0000 (16:30 -0700)]
Update docs for UID_STATE

Test: N/A

Bug: 128919932

Change-Id: Ibac690db3b58293082f762800bbbff0f832a16b2

5 years agoMerge "Do not trigger revoke-perm callbacks if no change" into qt-dev
Philip P. Moltmann [Mon, 8 Jul 2019 19:11:58 +0000 (19:11 +0000)]
Merge "Do not trigger revoke-perm callbacks if no change" into qt-dev

5 years agoMerge "GestureExclusion: Fix restriction priority" into qt-dev
TreeHugger Robot [Mon, 8 Jul 2019 08:02:33 +0000 (08:02 +0000)]
Merge "GestureExclusion: Fix restriction priority" into qt-dev

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Sat, 6 Jul 2019 01:26:47 +0000 (01:26 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 5 Jul 2019 09:03:54 +0000 (02:03 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I634b80fa18b8f14a90e5494933bf9b49a4c3f68f

5 years agoGestureExclusion: Fix restriction priority
Adrian Roos [Wed, 3 Jul 2019 13:35:07 +0000 (15:35 +0200)]
GestureExclusion: Fix restriction priority

Bottom restrictions should be applied first.

Bug: 135522625
Test: adb shell setprop debug.pointerlocation.showexclusion true; adb shell stop; adb shell start; open app excluding entire edge, verify bottom part is applied.
Change-Id: Ifc2bc64b1ce3132f198e23ae8e271380acf0c5a1

5 years agoGestureNav: Fix broken exclusion rect calculation for modal windows
Adrian Roos [Fri, 28 Jun 2019 10:10:51 +0000 (12:10 +0200)]
GestureNav: Fix broken exclusion rect calculation for modal windows

Fixes an issue with non-fullscreen modal windows (such as dialogs), where the touch exclusion of
the window behind was still being applied, even though the window behind did not actually
receive the touches in the exclusion, because they would go to the modal window in front.

Bug: 135522625
Test: atest testCalculateSystemGestureExclusion_modal
Change-Id: Ia99f4f601e780715abaf966f6f297fd9d555fd0b

5 years agoMerge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev
TreeHugger Robot [Thu, 4 Jul 2019 14:35:42 +0000 (14:35 +0000)]
Merge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev

5 years agoWM: implicitly exclude all edges for pre-Q immersive sticky apps
Adrian Roos [Tue, 2 Jul 2019 14:47:44 +0000 (16:47 +0200)]
WM: implicitly exclude all edges for pre-Q immersive sticky apps

Bug: 135522625
Test: atest DisplayContentTests
Change-Id: Ibe6c2c6d269b15c2e79ac0241b93e42c44a167c9
Exempt-From-Owner-Approval: TBR

5 years agoClear the calling identity in isUsableDisplay.
wilsonshih [Thu, 4 Jul 2019 03:23:54 +0000 (11:23 +0800)]
Clear the calling identity in isUsableDisplay.

The INTERNAL_SYSTEM_WINDOW permission is checked when
WindowManagerService#shouldShowSystemDecors is called, we should leave
this permission check because it is public method.
Clear the calling identity in WallpaperManagerService#isUsableDisplay
as this method should be used only internally.

Fix: 136447676
Test: atest VrDisplayTests MultiDisplaySystemDecorationTests
Change-Id: I97a93cdd0253933527010f97049694b59d5a4e2a

5 years ago[automerger skipped] Revert "Do not load xml metadata for unchanged packages in Regis...
Dmitry Dementyev [Thu, 4 Jul 2019 04:15:01 +0000 (21:15 -0700)]
[automerger skipped] Revert "Do not load xml metadata for unchanged packages in RegisteredServicesCache"
am: c0e4ee7332 -s ours
am skip reason: change_id I2f78f0dbbace212309b87f779efad020cf255196 with SHA1 40431ae1bc is in history

Change-Id: I2f6d0b75851879f84167c689802a98645d96d3c1

5 years agoMerge "Change NVHM protection from crash to Log.wtf" into qt-dev
TreeHugger Robot [Thu, 4 Jul 2019 01:28:08 +0000 (01:28 +0000)]
Merge "Change NVHM protection from crash to Log.wtf" into qt-dev

5 years agoDo not trigger revoke-perm callbacks if no change
Philip P. Moltmann [Wed, 3 Jul 2019 22:44:00 +0000 (15:44 -0700)]
Do not trigger revoke-perm callbacks if no change

Revoking a permission might e.g. kill the the app. If a permission gets
revoked that was never granted there was no change, hence no need to call
the callbacks and also no need to kill the app.

Test: "pm clear" two times in a row. The second one did trigger a kill
before, not anymore.
Bug: 133830856
Change-Id: I357f2d939520ac78ef82ecf4feb7936455950fc4

5 years agoMerge "Media2: Make Javadoc consistent for recommending use of AndroidX" into qt-dev
TreeHugger Robot [Wed, 3 Jul 2019 21:59:30 +0000 (21:59 +0000)]
Merge "Media2: Make Javadoc consistent for recommending use of AndroidX" into qt-dev

5 years agoMerge "Resolver - 'Always' button broken for non VIEW cases" into qt-dev
Matt Pietal [Wed, 3 Jul 2019 20:11:59 +0000 (20:11 +0000)]
Merge "Resolver - 'Always' button broken for non VIEW cases" into qt-dev

5 years agoMerge "Revert "Preload sfplugin_ccodec for performance"" into qt-dev
TreeHugger Robot [Wed, 3 Jul 2019 19:08:42 +0000 (19:08 +0000)]
Merge "Revert "Preload sfplugin_ccodec for performance"" into qt-dev

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Wed, 3 Jul 2019 18:51:56 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoRevert "Preload sfplugin_ccodec for performance"
Ray Essick [Wed, 3 Jul 2019 16:42:40 +0000 (16:42 +0000)]
Revert "Preload sfplugin_ccodec for performance"

This reverts commit 30da74bda4106515c18147edf004bbe021d0d27e.

Reason for revert: occasional audio race, losing volume control for device

Bug: 133186424
Bug: 135763139
Change-Id: I3aca2780dfcf80cfe0095af2a40496f3af0733cd

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Wed, 3 Jul 2019 17:45:39 +0000 (17:45 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoResolver - 'Always' button broken for non VIEW cases
Matt Pietal [Wed, 3 Jul 2019 13:12:56 +0000 (09:12 -0400)]
Resolver - 'Always' button broken for non VIEW cases

Users are incorrectly being directed to the settings app when
selecting 'Always', making them unable to actually open an app through
the resolver.

Bug: 132071949
Test: Steps are reported in b/136451610
Change-Id: I11775d7b0b780195f08273ad2b90b8ecd2ee1db4

5 years agoMerge "Avoid making post state to RESUMED for a PAUSING activity" into qt-dev
TreeHugger Robot [Wed, 3 Jul 2019 06:20:07 +0000 (06:20 +0000)]
Merge "Avoid making post state to RESUMED for a PAUSING activity" into qt-dev

5 years agoMedia2: Make Javadoc consistent for recommending use of AndroidX
Jaewan Kim [Wed, 3 Jul 2019 05:55:55 +0000 (14:55 +0900)]
Media2: Make Javadoc consistent for recommending use of AndroidX

Bug: 136602530
Test: Build docs offline and checked manually.
Change-Id: I70df7b05a6749b9ba492ac03cd3b9179a7416b9c

5 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 3 Jul 2019 05:17:00 +0000 (22:17 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id195d54ad8e39a06ee00a25ce3330ba42f8b0412

5 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 3 Jul 2019 05:00:11 +0000 (22:00 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6733160ff966884bc25bbe16caa37515eb163921

5 years agoMerge "Fix sms app changed broadcast" into qt-dev
Eugene Susla [Wed, 3 Jul 2019 04:02:19 +0000 (04:02 +0000)]
Merge "Fix sms app changed broadcast" into qt-dev

5 years agoAvoid making post state to RESUMED for a PAUSING activity
Louis Chang [Mon, 1 Jul 2019 04:39:31 +0000 (12:39 +0800)]
Avoid making post state to RESUMED for a PAUSING activity

Make sure the client post execution lifecycle state to RESUMED
only if the activity was RESUMED while delivering new intent.

Bug: 135715788
Test: making skype calls
Test: atest ActivityThreadTest

Change-Id: I1e3054e1d1611aecf6ddf6d482abf2cb3ebdf9a4