OSDN Git Service
Jonathan Scott [Mon, 9 Sep 2019 19:20:54 +0000 (12:20 -0700)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb am:
743846742d
am:
0b1d526f50
Change-Id: Ie3f10bbed4bdb2bb7e141d7bb8d34e0b818c3f30
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:54 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb am:
743846742d
Change-Id: Ia84a02b1b3ff3e9f4849554c6b2f0e904daadd05
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:50 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb
Change-Id: I8914a6337a6e6c905b42cc498f34db5142db7a1a
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:45 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36
Change-Id: I6ef1648f805c48ef37c8921ddfa1d147a8e5e032
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:42 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e
Change-Id: I641d14a61338365b5da7f6c55ead2baff29e811c
Android Build Merger (Role) [Mon, 9 Sep 2019 16:55:35 +0000 (16:55 +0000)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613
Change-Id: I6b5ad877382a352cb5b4bcdd05a2d19da502945a
Jonathan Scott [Tue, 25 Jun 2019 09:58:06 +0000 (10:58 +0100)]
Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc).
Test: Just adding a constant
Bug:
132261064
Change-Id: I1527be03a10fa1a2fde09e3e41d6b7e83a986fc0
Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
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:39:53 +0000 (23:39 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into nyc-mr2-dev
Bryan Ferris [Wed, 10 Jul 2019 23:11:15 +0000 (23:11 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" 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
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:11:06 +0000 (21:11 +0000)]
Merge changes from topic "am-
8d44d2e5-2b24-4867-a4fc-
1c5b430ac3a0" into cw-f-dev
* changes:
[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:11:06 +0000 (21:11 +0000)]
Merge changes from topic "am-
8d44d2e5-2b24-4867-a4fc-
1c5b430ac3a0" into nyc-mr1-dev
* changes:
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am:
7d6c02de04 am:
5ad1deb51c
[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am:
7d6c02de04
Fix Layout.primaryIsTrailingPreviousAllLineOffsets
Bryan Ferris [Wed, 10 Jul 2019 21:11:06 +0000 (21:11 +0000)]
Merge changes from topic "am-
8d44d2e5-2b24-4867-a4fc-
1c5b430ac3a0" into nyc-mr2-dev
* changes:
[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: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:48 +0000 (21:10 +0000)]
Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into nyc-mr1-dev
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)
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
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
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
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
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
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
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
Bryan Ferris [Wed, 26 Jun 2019 01:47:02 +0000 (18:47 -0700)]
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-second" into oc-dev
am:
1bc24d1877 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1
216f65bf60 is in history
Change-Id: Ibfa0e299bcd796915886c17c4de2031881651801
Bryan Ferris [Wed, 26 Jun 2019 01:40:56 +0000 (18:40 -0700)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c skipped:
d33940512a skipped:
4278315b95 skipped:
a284320118 skipped:
14b074ddfe
am:
b16bfc06a0 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1
216f65bf60 is in history
Change-Id: I5715e9f87cca3e468764468542204b254150630f
Bryan Ferris [Wed, 26 Jun 2019 01:39:21 +0000 (18:39 -0700)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()
am:
13a804ee27 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1
216f65bf60 is in history
Change-Id: I7a716f77e85190143043e1a054e66226d3365601
Bryan Ferris [Wed, 26 Jun 2019 00:49:56 +0000 (00:49 +0000)]
Merge changes from topic "bp-real-calling-(p|u)id-merge-second" into oc-dev
* changes:
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c skipped:
d33940512a skipped:
4278315b95 skipped:
a284320118 skipped:
14b074ddfe
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c skipped:
d33940512a skipped:
4278315b95 skipped:
a284320118
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c skipped:
d33940512a skipped:
4278315b95
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c skipped:
d33940512a
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Android Build Merger (Role) [Wed, 26 Jun 2019 00:48:49 +0000 (00:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c skipped:
d33940512a skipped:
4278315b95 skipped:
a284320118 skipped:
14b074ddfe
Change-Id: I8f80b0babe463c6be9b3dc337921edc2fea55431
Android Build Merger (Role) [Wed, 26 Jun 2019 00:48:47 +0000 (00:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c skipped:
d33940512a skipped:
4278315b95 skipped:
a284320118
Change-Id: I8b67d639193d3546a63fc3b526353de5cafb4fb3
Android Build Merger (Role) [Wed, 26 Jun 2019 00:48:44 +0000 (00:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c skipped:
d33940512a skipped:
4278315b95
Change-Id: If688033850b010958ba8795c2a85f4f060fccbb8
Android Build Merger (Role) [Wed, 26 Jun 2019 00:48:41 +0000 (00:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c skipped:
d33940512a
Change-Id: I8cd17220b0f8f8a8fa88c97d82272f3c2b06fd85
Android Build Merger (Role) [Wed, 26 Jun 2019 00:48:38 +0000 (00:48 +0000)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped:
bab818fd4c
Change-Id: I0a070b8406a51759c3dbf2dbe291be2ec0913660
Bryan Ferris [Tue, 21 May 2019 19:38:19 +0000 (12:38 -0700)]
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Previously startActivity would assume that the system was the calling user when
startActivityInPackage was called. Now the uid of the calling application is
forwarded by the system.
Test: manual; we added logging statements to check the value of realCallingUid
when launching the calendar app from the calendar widget and verified that it
was the calendar uid rather than the system uid.
Bug:
123013720
Change-Id: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e
Merged-In: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e
Bryan Ferris [Tue, 21 May 2019 19:38:19 +0000 (12:38 -0700)]
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()
Previously we'd ignore realCallingPid and realCallingUid that
PendingIntentRecord#sendInner() provided to startActivityInPackage().
Now we correctly pass it on, preserving past behaviour if none
provided.
Test: manual; we added logging statements to check the value of realCallingUid
in startActivitiesMayWait when launching the calendar app from the calendar widget
and verified that it was the calendar uid rather than the system uid.
Bug:
123013720
Change-Id: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e
Merged-In: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e
Bryan Ferris [Tue, 25 Jun 2019 19:33:43 +0000 (12:33 -0700)]
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev
am:
46c0bc9407
Change-Id: I9640adc59d47dbbb36183073a1c6bc2d0624d893
Bryan Ferris [Tue, 25 Jun 2019 19:33:37 +0000 (12:33 -0700)]
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3 am:
36fdca0a65 skipped:
37ce2010d9
am:
51bb716332
Change-Id: I163568da871059effe896507717480b61478797b
Bryan Ferris [Tue, 25 Jun 2019 18:36:14 +0000 (18:36 +0000)]
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3 am:
36fdca0a65 skipped:
37ce2010d9
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3 am:
36fdca0a65
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Bryan Ferris [Tue, 25 Jun 2019 18:36:14 +0000 (18:36 +0000)]
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into nyc-mr2-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3 am:
36fdca0a65
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Bryan Ferris [Tue, 25 Jun 2019 18:36:14 +0000 (18:36 +0000)]
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into cw-f-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Bryan Ferris [Tue, 25 Jun 2019 18:36:14 +0000 (18:36 +0000)]
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into nyc-mr1-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Bryan Ferris [Tue, 25 Jun 2019 18:36:14 +0000 (18:36 +0000)]
Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage" into nyc-dr1-dev
Bryan Ferris [Thu, 6 Jun 2019 00:34:26 +0000 (17:34 -0700)]
Merge changes from topic "am-
641f3aa3-ebd9-46aa-8f39-
1f4ec4f86eb3" into oc-dev
am:
7af053390a
Change-Id: Ie90797e6c620819b92b2bd32ad8a07363fbee947
Michael Wachenschwanz [Thu, 6 Jun 2019 00:07:58 +0000 (17:07 -0700)]
[automerger] Clear the Parcel before writing an exception during a transaction am:
f8ef5bcf21 am:
86c9bdd251 am:
6d72c0681f am:
d944d907df am:
31737b4618
am:
2ca66d4d10
Change-Id: I452bc18a9cebc417e7c4499c2bebf8fd3cc0f1ce
Bryan Ferris [Thu, 6 Jun 2019 00:01:53 +0000 (00:01 +0000)]
Merge "Protect VPN dialogs against overlay." into nyc-dev
Bryan Ferris [Thu, 6 Jun 2019 00:01:53 +0000 (00:01 +0000)]
Merge changes from topic "am-
641f3aa3-ebd9-46aa-8f39-
1f4ec4f86eb3" into oc-dev
* changes:
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8 am:
8c3a23e6b1 am:
22a1644e1f
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8 am:
8c3a23e6b1
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab
Protect VPN dialogs against overlay.
Bryan Ferris [Thu, 6 Jun 2019 00:01:53 +0000 (00:01 +0000)]
Merge changes from topic "am-
641f3aa3-ebd9-46aa-8f39-
1f4ec4f86eb3" into nyc-mr2-dev
* changes:
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8 am:
8c3a23e6b1
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab
Protect VPN dialogs against overlay.
Bryan Ferris [Thu, 6 Jun 2019 00:01:53 +0000 (00:01 +0000)]
Merge changes from topic "am-
641f3aa3-ebd9-46aa-8f39-
1f4ec4f86eb3" into cw-f-dev
* changes:
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab
Protect VPN dialogs against overlay.
Bryan Ferris [Thu, 6 Jun 2019 00:01:53 +0000 (00:01 +0000)]
Merge changes from topic "am-
641f3aa3-ebd9-46aa-8f39-
1f4ec4f86eb3" into nyc-mr1-dev
* changes:
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab
Protect VPN dialogs against overlay.
Bryan Ferris [Thu, 6 Jun 2019 00:01:53 +0000 (00:01 +0000)]
Merge changes from topic "am-
641f3aa3-ebd9-46aa-8f39-
1f4ec4f86eb3" into nyc-dr1-dev
* changes:
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab
Protect VPN dialogs against overlay.
Android Build Merger (Role) [Wed, 5 Jun 2019 17:32:04 +0000 (17:32 +0000)]
[automerger] Clear the Parcel before writing an exception during a transaction am:
f8ef5bcf21 am:
86c9bdd251 am:
6d72c0681f am:
d944d907df am:
31737b4618
Change-Id: I780fc62bcad56b4f1518a9a84ff7a77914f5c722
Android Build Merger (Role) [Wed, 5 Jun 2019 17:32:01 +0000 (17:32 +0000)]
[automerger] Clear the Parcel before writing an exception during a transaction am:
f8ef5bcf21 am:
86c9bdd251 am:
6d72c0681f am:
d944d907df
Change-Id: Ia92e1831963623df7931de17b029a92bab7f9374
Android Build Merger (Role) [Wed, 5 Jun 2019 17:31:57 +0000 (17:31 +0000)]
[automerger] Clear the Parcel before writing an exception during a transaction am:
f8ef5bcf21 am:
86c9bdd251 am:
6d72c0681f
Change-Id: I38fbeaf20d21dd174e2b022196446631c20b2367
Android Build Merger (Role) [Wed, 5 Jun 2019 17:31:54 +0000 (17:31 +0000)]
[automerger] Clear the Parcel before writing an exception during a transaction am:
f8ef5bcf21 am:
86c9bdd251
Change-Id: I16e96c2b33f18459189bfff359ae85483667a202
Android Build Merger (Role) [Wed, 5 Jun 2019 17:31:48 +0000 (17:31 +0000)]
[automerger] Clear the Parcel before writing an exception during a transaction am:
f8ef5bcf21
Change-Id: I416ed302e6c680fd006bd9b38565ebfc8b132084
Michael Wachenschwanz [Thu, 16 May 2019 05:58:15 +0000 (22:58 -0700)]
Clear the Parcel before writing an exception during a transaction
This prevents any object data from being accidentally overwritten by the
exception, which could cause unexpected malformed objects to be sent
across the transaction.
Test: atest CtsOsTestCases:ParcelTest#testExceptionOverwritesObject
Bug:
34175893
Change-Id: Iaf80a0ad711762992b8ae60f76d861c97a403013
Merged-In: Iaf80a0ad711762992b8ae60f76d861c97a403013
Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:18 +0000 (00:30 +0000)]
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3 am:
36fdca0a65 skipped:
37ce2010d9
Change-Id: I978aa4f0d090b7cf2d0a1bb606b9f1e6732155b7
Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:13 +0000 (00:30 +0000)]
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3 am:
36fdca0a65
Change-Id: I201858b931655939fd26bc3ba7052bbfebe6703e
Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:10 +0000 (00:30 +0000)]
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3
Change-Id: I91d36de4c10c81554827995e1adce8f3d8c1d612
Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:05 +0000 (00:30 +0000)]
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60
Change-Id: I4679e1c6f44119e4f6504141d2614e4266ed7b36
Bryan Ferris [Tue, 21 May 2019 19:38:19 +0000 (12:38 -0700)]
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Previously startActivity would assume that the system was the calling user when
startActivityInPackage was called. Now the uid of the calling application is
forwarded by the system.
Test: manual; we added logging statements to check the value of realCallingUid
in startActivitiesMayWait when launching the calendar app from the calendar widget
and verified that it was the calendar uid rather than the system uid.
Bug:
123013720
Change-Id: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e
Merged-In: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e
Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:37 +0000 (18:09 +0000)]
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8 am:
8c3a23e6b1 am:
22a1644e1f
Change-Id: Ibf6f6756222042d8faf7342e365d37a4fa28cdc1
Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:33 +0000 (18:09 +0000)]
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8 am:
8c3a23e6b1
Change-Id: Ifcd6f27ff206d4c81a2b2a1ee07d5e95b1a2a8e4
Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:30 +0000 (18:09 +0000)]
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8
Change-Id: I7f8a6762ceb6382f8c7f760a3d77a48b61f968a3
Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:27 +0000 (18:09 +0000)]
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2
Change-Id: If900759c5c2c097a1f731859c49d3ed3b6608296
Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:24 +0000 (18:09 +0000)]
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab
Change-Id: I09148d777617ccb4852931250f1b70314c41da48
Chalard Jean [Mon, 20 May 2019 04:11:37 +0000 (13:11 +0900)]
Protect VPN dialogs against overlay.
Bug:
130568701
Test: manual. After this, can't display on top of it
Change-Id: Ib032f800edb0416cc15f01a34954340d0d0ffa78
Merged-In: Ib032f800edb0416cc15f01a34954340d0d0ffa78
(cherry picked from commit
4e80dc2861614d25a1f957f50040a8cf04812d11)
Jonathan Scott [Tue, 21 May 2019 20:57:03 +0000 (13:57 -0700)]
Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev
am:
4c9fa739ff
Change-Id: I300dda26365dab7052b74383a302676f3e99be55
Jonathan Scott [Tue, 21 May 2019 20:55:50 +0000 (13:55 -0700)]
[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc).
am:
3be29d429b
Change-Id: Ia12a64ca1bd24f4070c6413abe1369009aa6c349
TreeHugger Robot [Tue, 21 May 2019 18:32:27 +0000 (18:32 +0000)]
Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev
Jonathan Scott [Tue, 7 May 2019 15:54:32 +0000 (16:54 +0100)]
[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc).
Bug:
127605586
Test: Manual
Change-Id: Ifb049d147f9ef30976cdb93d7bf63a761efc1b86
Merged-In: I40c9a29935d9e5a27cdcdf90187efe61035448fd
Jonathan Scott [Thu, 9 May 2019 00:38:02 +0000 (17:38 -0700)]
Merge changes from topic "am-
f8d9284a-cfc8-4e4b-8915-
eaac6542f6b5" into oc-dev
am:
42fb96810e
Change-Id: Iae376975d87e030148b258cfeec3ab583b9f68fc
Jonathan Scott [Thu, 9 May 2019 00:34:19 +0000 (17:34 -0700)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc skipped:
ad38008f58
am:
970863ea62
Change-Id: I7cb30baeff59cbdfc688c9f44bfdb1c25f20f33a
TreeHugger Robot [Wed, 8 May 2019 23:21:42 +0000 (23:21 +0000)]
Merge changes from topic "am-
f8d9284a-cfc8-4e4b-8915-
eaac6542f6b5" into oc-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc skipped:
ad38008f58
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c
[RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings.
Steven Moreland [Wed, 8 May 2019 21:20:20 +0000 (14:20 -0700)]
Merge "HwBlob: s/malloc/calloc/" into oc-dev
am:
123ffb6202
Change-Id: I8ecd922f540f9b93edd44056bf375e464c63eb54
TreeHugger Robot [Wed, 8 May 2019 20:49:53 +0000 (20:49 +0000)]
Merge "HwBlob: s/malloc/calloc/" into oc-dev
Christopher Dombroski [Wed, 8 May 2019 02:13:32 +0000 (19:13 -0700)]
OP_REQUEST_INSTALL_PACKAGES denied by default
am:
43e682abef
Change-Id: I13fd6fc7ba432a2cde1e8dbbc7b206e8203374f8
Android Build Merger (Role) [Tue, 7 May 2019 19:42:03 +0000 (19:42 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc skipped:
ad38008f58
Change-Id: Ifdd51a2d215992ffde99f5b5adbac27808d27cbf
Android Build Merger (Role) [Tue, 7 May 2019 19:41:27 +0000 (19:41 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc
Change-Id: I56ea274e6a04f25a4556a675fc5896cb27271499
Android Build Merger (Role) [Tue, 7 May 2019 19:40:52 +0000 (19:40 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c
Change-Id: I2f2c6d9634df88a1f7a8eae1b3a76dea8b6a1479
Android Build Merger (Role) [Tue, 7 May 2019 19:40:17 +0000 (19:40 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518
Change-Id: I6a2f5b46c70720cedf377f107b77d590b297aea4
Android Build Merger (Role) [Tue, 7 May 2019 19:39:38 +0000 (19:39 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c
Change-Id: I29e8b905ef0450d9bd7a7fcd82411cffa84394d4
Jonathan Scott [Tue, 7 May 2019 15:27:17 +0000 (16:27 +0100)]
[RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings.
Bug:
127605586
Test: Manual
Change-Id: I5b5b0f9184220a4ed3080ca27792f66d1f5d41aa
Steven Moreland [Thu, 18 Apr 2019 23:32:42 +0000 (16:32 -0700)]
HwBlob: s/malloc/calloc/
Since this blob is passed between processes.
We could potentially only memset portions of the blob as it is
written to. However, the JHwBlob API itself doesn't have to have
writes in order (even though known usages of it do write in order).
Because of this, keeping track of which bytes to pad would be too
expensive.
Bug:
131356202
Test: boot, hidl_test_java
Change-Id: I48f4d7cb20c4bfe747dd323ae3744d323ad097c9
Merged-In: I48f4d7cb20c4bfe747dd323ae3744d323ad097c9
Christopher Dombroski [Tue, 16 Apr 2019 20:21:39 +0000 (13:21 -0700)]
OP_REQUEST_INSTALL_PACKAGES denied by default
Some system apps may download unknown content and the user should
be explicitly asked whether they trust these files. System apps should
explicitly use the extra NOT_UNKNOWN_SOURCE to bypass this check.
Test: Builds, boots, existing tests pass:
atest CtsPackageInstallTestCases
Locally verified they pass if CtsPackageInstallTestCases.apk was signed by
the platform cert.
Bug:
123700348
Change-Id: I3028bf8ff3f79a41521deeee43fba3c32bb1b2ca
Merged-In: I2578251906f6656b83464d1c4fc4db99165841c9