OSDN Git Service
Jeff Sharkey [Thu, 12 Sep 2019 19:59:29 +0000 (19:59 +0000)]
Merge changes from topic "bp-
135269143-p" into pi-dev
* changes:
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
Jeff Sharkey [Tue, 16 Jul 2019 22:50:42 +0000 (16:50 -0600)]
RESTRICT AUTOMERGE
Strict SQLiteQueryBuilder needs to be stricter.
Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.
This change offers setStrictGrammar() to prevent this by outright
blocking subqueries in WHERE and HAVING clauses, and by requiring
that GROUP BY and ORDER BY clauses be composed only of valid columns.
This change also offers setStrictColumns() to require that all
untrusted column names are valid, such as those in ContentValues.
Relaxes to always allow aggregation operators on returned columns,
since untrusted callers can always calculate these manually.
Bug:
135270103
Bug:
135269143
Test: atest android.database.sqlite.cts.SQLiteQueryBuilderTest
Test: atest FrameworksCoreTests:android.database.sqlite.SQLiteTokenizerTest
Exempt-From-Owner-Approval: already approved in downstream branch
Change-Id: I6290afd19c966a8bdca71c377c88210d921a9f25
Jeff Sharkey [Thu, 12 Sep 2019 17:31:54 +0000 (10:31 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am:
f8a2d069b4 am:
f6aa7b8d8f
am:
8acb456949 -s ours
am skip reason: subject contains skip directive
Change-Id: Id9934307cef63a331bb1fad3ba4fddee11393d98
Jeff Sharkey [Thu, 12 Sep 2019 17:31:49 +0000 (10:31 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am:
f683c688d5 am:
fc095efde0
am:
e89348b54b -s ours
am skip reason: subject contains skip directive
Change-Id: I80528a71e90049489b85b5c95baf93cbd3a17808
Jeff Sharkey [Thu, 12 Sep 2019 17:27:55 +0000 (10:27 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am:
7633a081ab am:
b0054f0518
am:
c97dfb57a8 -s ours
am skip reason: subject contains skip directive
Change-Id: I6467326680d2164bb4e2a9e54dc22cc490e2492d
Jeff Sharkey [Thu, 12 Sep 2019 17:27:37 +0000 (10:27 -0700)]
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
92e5e5e45c am:
37e2229257
am:
bba6744ff4 -s ours
am skip reason: subject contains skip directive
Change-Id: I8711dac1ad4d2512d64dc489d87ffd4a18c0ebd6
Jeff Sharkey [Thu, 12 Sep 2019 17:18:26 +0000 (10:18 -0700)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am:
f8a2d069b4
am:
f6aa7b8d8f
Change-Id: I466630af8385d6da164196f2420d040b2aa6e2ac
Jeff Sharkey [Thu, 12 Sep 2019 17:18:22 +0000 (10:18 -0700)]
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am:
f683c688d5
am:
fc095efde0
Change-Id: I9bbeb106c1abe977439420d8005f33f5a7c1eaa1
Jeff Sharkey [Thu, 12 Sep 2019 17:14:15 +0000 (10:14 -0700)]
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am:
7633a081ab
am:
b0054f0518
Change-Id: I491c415de567d0375296f293fcbb35ee21413ce6
Jeff Sharkey [Thu, 12 Sep 2019 17:14:00 +0000 (10:14 -0700)]
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am:
92e5e5e45c
am:
37e2229257
Change-Id: I3d7696be9733e40f31c160a77505c4e96ca05b5e
Jeff Sharkey [Thu, 12 Sep 2019 17:06:14 +0000 (10:06 -0700)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev
am:
f8a2d069b4
Change-Id: If9534450fac2cd9b328f105be73f53c92ab14dbd
Jeff Sharkey [Thu, 12 Sep 2019 17:06:09 +0000 (10:06 -0700)]
RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
am:
f683c688d5
Change-Id: I64ae89ecc92127de21503fbcfdd34c60a6f620bc
Jeff Sharkey [Thu, 12 Sep 2019 17:02:13 +0000 (10:02 -0700)]
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
am:
7633a081ab
Change-Id: Ia3853da8933c8c21fe06acad79059a3589eeb835
Jeff Sharkey [Thu, 12 Sep 2019 17:02:05 +0000 (10:02 -0700)]
RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am:
92e5e5e45c
Change-Id: I2e0a5c5cd35f9abcf362d3db4514e1bbd6bd7035
Jeff Sharkey [Thu, 12 Sep 2019 16:33:21 +0000 (16:33 +0000)]
Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev
Jeff Sharkey [Thu, 12 Sep 2019 16:33:13 +0000 (16:33 +0000)]
Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
Jeff Sharkey [Thu, 18 Jul 2019 00:51:28 +0000 (18:51 -0600)]
RESTRICT AUTOMERGE
Enable stricter SQLiteQueryBuilder options.
Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.
This change starts using setStrictColumns() and setStrictGrammar()
on SQLiteQueryBuilder to block this class of attacks. This means we
now need to define the projection mapping of valid columns, which
consists of both the columns defined in the public API and columns
read internally by DownloadInfo.Reader.
We're okay growing sAppReadableColumnsSet like this, since we're
relying on our trusted WHERE clause to filter away any rows that
don't belong to the calling UID.
Remove the legacy Lexer code, since we're now internally relying on
the robust and well-tested SQLiteTokenizer logic.
Bug:
135270103,
135269143
Test: cts-tradefed run cts -m CtsAppTestCases -t android.app.cts.DownloadManagerTest
Change-Id: Iec1e8ce18dc4a9564318e0473d9d3863c8c2988a
Zongheng Wang [Wed, 11 Sep 2019 01:41:23 +0000 (18:41 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
1f9309bd11 am:
a376239229 -s ours
am:
aee078eae7 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: Ifb20decfdf6a48b599931f87a733e97013538888
Zongheng Wang [Wed, 11 Sep 2019 01:30:55 +0000 (18:30 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am:
1f9309bd11
am:
a376239229 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
02046b4f2c is in history
Change-Id: I3cc4d873250f924af768b37e97338024ee236e6e
Zongheng Wang [Wed, 11 Sep 2019 01:20:49 +0000 (18:20 -0700)]
[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one
am:
02046b4f2c -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1
9b3cb0f06b is in history
Change-Id: I6003b908b417a8bb1d687b5eafe2f2646f63e814
Zongheng Wang [Wed, 11 Sep 2019 01:16:49 +0000 (18:16 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose one
am:
1f9309bd11
Change-Id: I142d2737f6444b5148963c1ca7af84e8cf0eded3
TreeHugger Robot [Wed, 11 Sep 2019 00:46:54 +0000 (00:46 +0000)]
Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into pi-dev
Jeff Sharkey [Tue, 16 Jul 2019 22:50:42 +0000 (16:50 -0600)]
RESTRICT AUTOMERGE
Strict SQLiteQueryBuilder needs to be stricter.
Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.
This change offers setStrictGrammar() to prevent this by outright
blocking subqueries in WHERE and HAVING clauses, and by requiring
that GROUP BY and ORDER BY clauses be composed only of valid columns.
This change also offers setStrictColumns() to require that all
untrusted column names are valid, such as those in ContentValues.
Relaxes to always allow aggregation operators on returned columns,
since untrusted callers can always calculate these manually.
Bug:
135270103,
135269143
Test: cts-tradefed run cts -m CtsDatabaseTestCases -t android.database.sqlite.cts.SQLiteQueryBuilderTest
Change-Id: I6290afd19c966a8bdca71c377c88210d921a9f25
Zongheng Wang [Thu, 5 Sep 2019 20:44:28 +0000 (13:44 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose
one
When there's no users' choice to tell us whether to share their
phonebook information to the Bluetooth device, set the phonebook access
permission to ACCESS_REJECTED.
Bug:
138529441
Test: Manual test
Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Zongheng Wang [Thu, 5 Sep 2019 20:44:28 +0000 (13:44 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose
one
When there's no users' choice to tell us whether to share their
phonebook information to the Bluetooth device, set the phonebook access
permission to ACCESS_REJECTED.
Bug:
138529441
Test: Manual test
Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Zongheng Wang [Thu, 5 Sep 2019 20:44:28 +0000 (13:44 -0700)]
Set default phonebook access to ACCESS_REJECTED when user didn't choose
one
When there's no users' choice to tell us whether to share their
phonebook information to the Bluetooth device, set the phonebook access
permission to ACCESS_REJECTED.
Bug:
138529441
Test: Manual test
Change-Id: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Merged-In: Iefabeb731b941f09fe1272ac7b7cd2feba75c8df
Jonathan Scott [Mon, 9 Sep 2019 19:50:26 +0000 (12:50 -0700)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb am:
743846742d am:
0b1d526f50 am:
e4ddc22035
am:
5f619835ed
Change-Id: Ie2c9fb05e3245f3045f3c9a4919760e70285fa37
Jonathan Scott [Mon, 9 Sep 2019 19:35:53 +0000 (12:35 -0700)]
[automerger] Add MANAGED_PROVISIONING_DPC_DOWNLOADED (nyc). am:
20e5d92613 am:
c1ec4d6e8e am:
80e1c4fd36 am:
7b6a04fceb am:
743846742d am:
0b1d526f50
am:
e4ddc22035
Change-Id: I4084d344b3c92b5a4459852837e323f44d2b0b72
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
Jeff Sharkey [Thu, 18 Jul 2019 00:51:28 +0000 (18:51 -0600)]
RESTRICT AUTOMERGE
Enable stricter SQLiteQueryBuilder options.
Malicious callers can leak side-channel information by using
subqueries in any untrusted inputs where SQLite allows "expr" values.
This change starts using setStrictColumns() and setStrictGrammar()
on SQLiteQueryBuilder to block this class of attacks. This means we
now need to define the projection mapping of valid columns, which
consists of both the columns defined in the public API and columns
read internally by DownloadInfo.Reader.
We're okay growing sAppReadableColumnsSet like this, since we're
relying on our trusted WHERE clause to filter away any rows that
don't belong to the calling UID.
Remove the legacy Lexer code, since we're now internally relying on
the robust and well-tested SQLiteTokenizer logic.
Bug:
135270103
Bug:
135269143
Test: atest DownloadProviderTests
Test: atest CtsAppTestCases:android.app.cts.DownloadManagerTest
Change-Id: Iec1e8ce18dc4a9564318e0473d9d3863c8c2988a
Pinyao Ting [Thu, 8 Aug 2019 22:35:20 +0000 (15:35 -0700)]
fixes a security vulnerability in slice provider
Bug:
138441555
Test: Manual
Change-Id: Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965
Merged-In: Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965
(cherry picked from commit
2b415a4c4465a6294e51ad1a8fcf2e6c1497853b)
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: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: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: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: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: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: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 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
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
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)
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
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
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
Dmitry Dementyev [Mon, 1 Jul 2019 16:41:19 +0000 (16:41 +0000)]
Revert "Do not load xml metadata for unchanged packages in RegisteredServicesCache"
This reverts commit
8094880025d0680ec4cf586929d85b9050d4e9d6.
Reason for revert: changed services order
Test: manual
Bug:
136261465
Change-Id: I2f78f0dbbace212309b87f779efad020cf255196
Merged-In: I2f78f0dbbace212309b87f779efad020cf255196
Bryan Ferris [Fri, 28 Jun 2019 23:59:16 +0000 (23:59 +0000)]
Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev
Bryan Ferris [Thu, 27 Jun 2019 21:39:46 +0000 (14:39 -0700)]
[RESTRICT AUTOMERGE] Correct argument order in permission check
The function 'checkAccess' recieves the uid and pid in that order and
forwards them to checkSlicePermission in the same order. However,
checkSlicePermission expects them in the opposite order.
Bug:
135551349
Test: atest FrameworksUiServicesTests
Change-Id: I6e49efeab08f0e2a29d9830e6f81905598ae410c
Bryan Ferris [Wed, 26 Jun 2019 02:25:16 +0000 (19:25 -0700)]
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-second" into oc-dev am:
1bc24d1877 -s ours am:
9dd00420c7 -s ours
am:
b3326d2ceb -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1
216f65bf60 is in history
Change-Id: I4288936cbccda11f8ee3012001da20b65775fb8b
Bryan Ferris [Wed, 26 Jun 2019 02:19:53 +0000 (19:19 -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:
a73dccba1f -s ours
am:
c640823563 -s ours
am skip reason: subject contains skip directive
Change-Id: If1f805aea00b0a7dfe8f937af9f5274d7adfb8aa
Bryan Ferris [Wed, 26 Jun 2019 02:19:22 +0000 (19:19 -0700)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner() am:
13a804ee27 -s ours am:
73683643a8 -s ours
am:
a7d55adc89 -s ours
am skip reason: subject contains skip directive
Change-Id: I8fc565a08e9c3ed5709550bd347cca122c0d91e8
Bryan Ferris [Wed, 26 Jun 2019 02:09:36 +0000 (19:09 -0700)]
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-second" into oc-dev am:
1bc24d1877 -s ours
am:
9dd00420c7 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1
216f65bf60 is in history
Change-Id: I2b6bde0571db3a32733baff389c6a3cfcc5b2a34
Bryan Ferris [Wed, 26 Jun 2019 02:03:44 +0000 (19:03 -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:
a73dccba1f -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1
216f65bf60 is in history
Change-Id: Iec15b46b0a2ac8c5af6e199021fdd4efb2c843c4
Bryan Ferris [Wed, 26 Jun 2019 02:03:23 +0000 (19:03 -0700)]
[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner() am:
13a804ee27 -s ours
am:
73683643a8 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1
216f65bf60 is in history
Change-Id: I84997bae1ac598cc018fd9cfe39c8b06f6800e61
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