OSDN Git Service
TreeHugger Robot [Thu, 11 Jul 2019 16:03:26 +0000 (16:03 +0000)]
Merge "Do not report AOD as showing when fading away" into qt-r1-dev
Lucas Dupin [Thu, 11 Jul 2019 02:47:13 +0000 (11:47 +0900)]
Do not report AOD as showing when fading away
AOD will still be showing when we authenticate from AOD2, but WM
cannot show the activity untill we leave the AOD state, this causes
transition jank.
I'm now consolidating the dozing state with wakeAndUnlock
to account for AOD2 wake-ups.
Test: wake-up from LS to app
Test: wake-up from LS to home
Test: wake-up from AOD2 to app
Test: wake-up from AOD2 to home
Test: open app, wait for screen timeout
Test: look at logs on #updateActivityLockScreenState
Bug:
134952761
Fixes:
136737610
Change-Id: I08d087eb78788ca89d8f4a4ae67bbc597bcb650b
Andrew Lewis [Thu, 11 Jul 2019 13:26:42 +0000 (06:26 -0700)]
Merge "Redact ISOBMFF boxes with 'free'" into qt-dev
am:
f68a201ebc
Change-Id: I4755c6f884958dce01e06aa5a889f06e035f1f1c
Andrew Lewis [Thu, 11 Jul 2019 13:10:59 +0000 (13:10 +0000)]
Merge "Redact ISOBMFF boxes with 'free'" into qt-dev
Evan Laird [Thu, 11 Jul 2019 07:03:34 +0000 (00:03 -0700)]
Merge "Use a Region when calculating TouchableRegion for cutouts" into qt-dev
am:
6c22dff644
Change-Id: If667a3e6d1b0904664e16c59c5760a17ff06361e
TreeHugger Robot [Thu, 11 Jul 2019 06:52:34 +0000 (06:52 +0000)]
Merge "Set StatusBar window to FOCUSABLE when input transfer focus needs happening Bug:
136507412 Test: manual" into qt-r1-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
TreeHugger Robot [Thu, 11 Jul 2019 06:14:21 +0000 (06:14 +0000)]
Merge "Fixed talkback issue with biometric prompt." into qt-r1-dev
Daniel Sandler [Thu, 11 Jul 2019 04:21:30 +0000 (21:21 -0700)]
Merge "Q card." into qt-dev
am:
13de667fa6
Change-Id: Ia30df6e52c78381860782b282125d9deef9511b5
Daniel Sandler [Thu, 11 Jul 2019 03:45:56 +0000 (03:45 +0000)]
Merge "Q card." into qt-dev
Bryan Ferris [Thu, 11 Jul 2019 01:09:37 +0000 (18:09 -0700)]
Merge changes from topic "am-
491d8213-3eca-4563-937d-
c6f23dd5f887" into oc-dev am:
4244190788 am:
61ea78238e am:
61581686b6 am:
8c5f02eddd
am:
da0d82c216
Change-Id: Iabe7e6ec7f79886e421df2158417f96ef7a627a6
joshmccloskey [Thu, 11 Jul 2019 00:15:15 +0000 (17:15 -0700)]
Fixed talkback issue with biometric prompt.
Test: Manual.
Fixes:
137164433
Change-Id: Ie5d241762769b275fc7616e2f5bb8378a064ed98
anwarg [Thu, 11 Jul 2019 01:05:47 +0000 (18:05 -0700)]
Merge "Fix NullPointerException." into qt-dev
am:
19bc3c67ab
Change-Id: Iec08afae474994508c1d666938b844a8b2544ee6
Bryan Ferris [Thu, 11 Jul 2019 00:54:13 +0000 (17:54 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev am:
8abe600b81 am:
4fea890c18 am:
f97b567234 am:
3b0124864c
am:
ff4ad59458
Change-Id: Id394ac3139fe6a42ac0ac1431e5efe4b88a57e91
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
anwarg [Thu, 11 Jul 2019 00:49:02 +0000 (00:49 +0000)]
Merge "Fix NullPointerException." into qt-dev
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
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
TreeHugger Robot [Thu, 11 Jul 2019 00:29:27 +0000 (00:29 +0000)]
Merge "Check mSetupComplete on initialization to avoid service being disabled." into qt-r1-dev
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
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
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
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
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
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
Bryan Ferris [Wed, 10 Jul 2019 23:11:15 +0000 (23:11 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev
Sooraj Sasindran [Wed, 10 Jul 2019 23:05:33 +0000 (23:05 +0000)]
Merge "Send error if ONS is not available" into qt-r1-dev
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
Bryan Ferris [Wed, 10 Jul 2019 22:55:43 +0000 (15:55 -0700)]
Merge changes from topic "am-
8d44d2e5-2b24-4867-a4fc-
1c5b430ac3a0" into oc-dev am:
ecc48fbc96 am:
f56e704fb5 am:
cbac93ac65 am:
137d01def7
am:
9958fb0ba6
Change-Id: I4067e900b10c063109876701c4cb688876a93f80
Mihai Popa [Wed, 10 Jul 2019 22:51:11 +0000 (15:51 -0700)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am:
2778b1e49d am:
77b7393e7d am:
126189263d am:
29534f6c57 am:
09bfff78dd am:
36e9a7af7f am:
ff4203a42f
am:
d6f5dff4ef
Change-Id: Ica4e68210c4dd52e0c5f2d0f0b0fce953aa6dcca
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
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
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
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
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
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
Bryan Ferris [Wed, 10 Jul 2019 22:02:24 +0000 (15:02 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev am:
56ff278c98 am:
4321d1288e
am:
d07f3c8128
Change-Id: I37ad3461ea7973bc2621a7513d86308d51547f31
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
Bryan Ferris [Wed, 10 Jul 2019 21:58:30 +0000 (14:58 -0700)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into pi-dev am:
a94d8aed24
am:
2c8f7e6ae8
Change-Id: I2375c1b4bc262803ce2846bc1884a85524664189
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
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
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
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
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
Bryan Ferris [Wed, 10 Jul 2019 21:10:22 +0000 (21:10 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev
Bryan Ferris [Wed, 10 Jul 2019 21:10:18 +0000 (21:10 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into pi-dev
Adam He [Tue, 9 Jul 2019 21:19:47 +0000 (14:19 -0700)]
Check mSetupComplete on initialization to avoid service being disabled.
Fixes:
135297073
Test: manual verification && atest CtsContentCaptureServiceTestCases
Change-Id: Ida283990c7800ac6946f7e5905e67ca1b21d8bbc
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
Lei Yu [Wed, 10 Jul 2019 18:07:38 +0000 (11:07 -0700)]
Merge "Use old API to build NetworkTemplate" into qt-dev
am:
e5fdc968a0
Change-Id: I35702ae50d5274defd6974245bf1209ad3a0115f
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
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
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
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
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:40 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am:
7d6c02de04
Change-Id: I7fcc292a58dc297d2725ae3df99d637bbd1a8479
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
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)
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
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:29 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am:
2778b1e49d
Change-Id: I0c15ebaddd8d8edb9ff630ffbe4d855219b06907
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)
Android Build Merger (Role) [Wed, 10 Jul 2019 18:02:21 +0000 (18:02 +0000)]
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am:
d3e81cd63f
Change-Id: I6373d3daeb8358316c0ae2757ed745202219e5c2
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)
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)
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)
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)
Lei Yu [Wed, 10 Jul 2019 17:27:58 +0000 (17:27 +0000)]
Merge "Use old API to build NetworkTemplate" into qt-dev
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
Matt Pape [Wed, 10 Jul 2019 16:09:24 +0000 (09:09 -0700)]
Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev
am:
54c7c6927c
Change-Id: I24b040f5e4a02abebe929f805fbf4e667b29e92b
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
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
Ahan Wu [Wed, 10 Jul 2019 13:05:10 +0000 (06:05 -0700)]
Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev
am:
71682ae9c7
Change-Id: Ieb2b576e5178a2885c5c1df0eba41c2c4f6d50ae
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
Chienyuan [Wed, 10 Jul 2019 05:33:28 +0000 (22:33 -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
am:
5f70ebf52c
Change-Id: Id4c1a257b04515a03828a33229e5630c75c56ac2
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
Minchan Kim [Wed, 10 Jul 2019 05:20:45 +0000 (05:20 +0000)]
Merge "skip reading vmallocinfo if not needed" into qt-r1-dev
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
Bill Yi [Wed, 10 Jul 2019 05:05:53 +0000 (22:05 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
2f5007db0a -s ours
am skip reason: subject contains skip directive
Change-Id: I0ee7268a62a9ba07a758dbe07f16fb019012265e
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
TreeHugger Robot [Wed, 10 Jul 2019 04:38:34 +0000 (04:38 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
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
wilsonshih [Wed, 10 Jul 2019 02:15:00 +0000 (19:15 -0700)]
Merge "Clear the calling identity in isUsableDisplay." into qt-dev
am:
6102c2f7fd
Change-Id: I08fbfbf82fe071548a83ede56af3cee84a4ebd9a
TreeHugger Robot [Wed, 10 Jul 2019 01:51:24 +0000 (01:51 +0000)]
Merge "Clear the calling identity in isUsableDisplay." into qt-dev
Minchan Kim [Tue, 9 Jul 2019 02:57:41 +0000 (11:57 +0900)]
skip reading vmallocinfo if not needed
If kernel supports vmalloc memory accouting from /proc/meminfo
(https://patchwork.kernel.org/patch/
10944111/)
it's pointless to parse /proc/vmallocinfo since it's too heavy
Bug:
136688885
Test: manual checking right vmalloc pages from meminfo
Test: manual checking check that never invokes ReadVmallocInfo if
kernel supports vmalloc pages
Change-Id: I725ea1f8a0c4ab07e78893fdb39661a65eac39e6
Signed-off-by: Minchan Kim <minchan@google.com>
Sooraj Sasindran [Tue, 9 Jul 2019 22:12:28 +0000 (15:12 -0700)]
Send error if ONS is not available
Send error for data switch api if ONS is not available
Bug:
136294842
Test: regression test
Change-Id: If844939c0936729e4487b6e4f75cd58d28195718
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
Svet Ganov [Wed, 10 Jul 2019 00:13:42 +0000 (17:13 -0700)]
Merge "Document restricted permissions" into qt-dev
am:
b2017ccba4
Change-Id: I99cc9de09ffce2aa7c32746d34973633b67af9ca
TreeHugger Robot [Tue, 9 Jul 2019 23:38:18 +0000 (23:38 +0000)]
Merge "Document restricted permissions" into qt-dev
Winson Chung [Tue, 9 Jul 2019 23:12:24 +0000 (23:12 +0000)]
Merge "Fix ordering of check minimized state callback" into qt-r1-dev
Bill Yi [Tue, 9 Jul 2019 22:04:10 +0000 (15:04 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
a5121a4fa9 -s ours
am skip reason: subject contains skip directive
Change-Id: Id7bd1bad477b9d751235519e042da6541ab2a156
TreeHugger Robot [Tue, 9 Jul 2019 21:40:30 +0000 (21:40 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Tue, 9 Jul 2019 21:31:59 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
TreeHugger Robot [Tue, 9 Jul 2019 21:09:28 +0000 (21:09 +0000)]
Merge "Wait for current task to complete before revoking challenge" into qt-r1-dev
Svet Ganov [Tue, 9 Jul 2019 20:23:28 +0000 (13:23 -0700)]
Document restricted permissions
Test: N/A
Bug:
132174864
Change-Id: If56475fc6ac72e17bed8b0960cc63a8ecc87e4de
Miranda Kephart [Tue, 9 Jul 2019 19:35:29 +0000 (19:35 +0000)]
Merge "Allow path specification for rounded corners" into qt-r1-dev
Ilya Matyukhin [Tue, 9 Jul 2019 18:03:07 +0000 (11:03 -0700)]
Wait for current task to complete before revoking challenge
Test: enrolled from Settings and quickly pressed the power button twice
Test: before hitting "done". The phone did not deadlock.
Bug:
136444006
Change-Id: I7e87c0722b84cde0cb96103f6b94535ca3a96798
TreeHugger Robot [Tue, 9 Jul 2019 18:16:26 +0000 (18:16 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Svet Ganov [Tue, 9 Jul 2019 17:55:59 +0000 (10:55 -0700)]
Merge "Update docs for UID_STATE" into qt-dev
am:
261a2d62e2
Change-Id: Ibdca805d9105e60955b8258409752f13305b57ed
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
Bill Yi [Tue, 9 Jul 2019 17:45:10 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I472198fa69c05ce0dc31445d0d2aaa87083acea8
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
TreeHugger Robot [Tue, 9 Jul 2019 17:25:49 +0000 (17:25 +0000)]
Merge "Update docs for UID_STATE" into qt-dev
OSDN Git Service
