OSDN Git Service
Hyunyoung Song [Fri, 12 Jan 2018 05:31:38 +0000 (05:31 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
am:
48df033607
Change-Id: Id2510b388bf4ed9cdd8853bc5594349df358f465
TreeHugger Robot [Fri, 12 Jan 2018 05:23:45 +0000 (05:23 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
Kevin Hufnagle [Tue, 9 Jan 2018 23:44:04 +0000 (23:44 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services.
am:
d195a9972b
Change-Id: I7a59a3b8c18492961aea7f480276a401ab8bb6ae
Kevin Hufnagle [Thu, 29 Jun 2017 22:58:48 +0000 (15:58 -0700)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
docs: Revised descriptions of binding and connecting to services.
Clarified that Context.bindService() returning true only indicates
that the system has found a service to bind to the client and that
ServiceConnection.onServiceConnected() might not be called if the
service encounters an error, such as crashing during startup.
Test: make ds-docs
Bug:
63118511
Change-Id: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
TreeHugger Robot [Fri, 22 Dec 2017 17:57:02 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 21 Dec 2017 18:18:04 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours am:
0a1948e515 -s ours
am:
7cb6513f6d -s ours
Change-Id: I9cf46be95cd8d62bd8380b63740e4d97b68fa958
Bill Yi [Thu, 21 Dec 2017 18:15:02 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours
am:
0a1948e515 -s ours
Change-Id: If6c330da79edb94911ec1fb076a29e8c485ca725
Bill Yi [Thu, 21 Dec 2017 18:11:27 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
45d962274f -s ours
Change-Id: I43d3d8e14417f7aed30a470191386753c9957701
TreeHugger Robot [Thu, 21 Dec 2017 18:04:34 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 21 Dec 2017 18:01:15 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours am:
ea2e302eff -s ours
am:
b6dab6b3ee -s ours
Change-Id: Ic796115ab4b86083a0823a4ace631c8a3a15ba66
Bill Yi [Thu, 21 Dec 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours
am:
ea2e302eff -s ours
Change-Id: I9d23c6267a38545927029782293ef8a15961cca7
Bill Yi [Thu, 21 Dec 2017 17:57:33 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours
am:
f1c75d66ec -s ours
Change-Id: Iaae57c91c09a4b1780c0c8e474700c56133b264e
Bill Yi [Thu, 21 Dec 2017 17:55:45 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours
am:
bd14c44fd8 -s ours
Change-Id: I0560d15c8c2df65b61818ccbb12f5057d1a0c5c8
Bill Yi [Thu, 21 Dec 2017 17:52:15 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours
am:
c344f9b1c7 -s ours
Change-Id: I0f33f5e6ba5168e27ed60cb36b762708b641d34a
Bill Yi [Thu, 21 Dec 2017 17:51:21 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours
am:
d21211470c -s ours
Change-Id: Ife7d7f70c599c556abebf10eee525072a127b34d
Bill Yi [Thu, 21 Dec 2017 17:50:54 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours
am:
2c97ca3b62 -s ours
Change-Id: Ia71bb418e6bf22e2347436d883e1bcd1c9937d61
Bill Yi [Thu, 21 Dec 2017 17:50:03 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours
am:
d5a7faea83 -s ours
Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab
Bill Yi [Thu, 21 Dec 2017 17:48:29 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours
am:
51fc07ad61 -s ours
Change-Id: I336996e228fd3c69f192d3614207f24cec0b4ed8
Bill Yi [Thu, 21 Dec 2017 17:46:04 +0000 (17:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
81b98ffb09 -s ours
Change-Id: I6369ce728c37d066932736566e465f73e7843eb5
Bill Yi [Thu, 21 Dec 2017 17:44:40 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
599fb37c01 -s ours
Change-Id: Icc605bca96905c647601df651186850c874b5442
Bill Yi [Thu, 21 Dec 2017 17:44:38 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours
am:
0bfcd7eef7 -s ours
Change-Id: I30395fbf54d028c4f2e8bd21aa362e9d8e993195
Bill Yi [Thu, 21 Dec 2017 17:42:25 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e1ca34b5c7 -s ours
Change-Id: Ie97a72b89d17e982dbe499c26c956dafffe5effa
Bill Yi [Thu, 21 Dec 2017 17:42:12 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours
am:
5943ef281a -s ours
Change-Id: I9758d713fb9328b7f2218dae49e334f16a703476
Bill Yi [Thu, 21 Dec 2017 17:42:08 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours
am:
05e41d0531 -s ours
Change-Id: I730f5dcee5ea85c408f7cf21dafab011e869d66d
Bill Yi [Thu, 21 Dec 2017 17:41:01 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7ce772e941 -s ours
Change-Id: I0a8e327692fb18d67b9e724ce3254f3c342206b9
Bill Yi [Thu, 21 Dec 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours
am:
a683975c54 -s ours
Change-Id: I54b9b28c9ad38ad19c1e7f228e2e095dfd5cabe3
Bill Yi [Thu, 21 Dec 2017 17:35:51 +0000 (17:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours
am:
e135a35edf -s ours
Change-Id: Ib75ec7b79501a31cab373f919c06a791a7ad9a4a
Bill Yi [Thu, 21 Dec 2017 09:42:20 +0000 (01:42 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib6ac723de671ad98410e531aeeceb643f8eb0209
TreeHugger Robot [Wed, 20 Dec 2017 23:45:59 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:55 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:18 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:11 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 19:29:47 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
1f204cd1ea -s ours
Change-Id: I0f8053bf3d65cd451e704ad682cd54b29953e944
Bill Yi [Wed, 20 Dec 2017 19:26:37 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours
am:
7244723549 -s ours
Change-Id: Id717ceb76ced6f3fb2b10689efd916e7e7cc5cfe
Bill Yi [Wed, 20 Dec 2017 19:25:28 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours
am:
13062c93e5 -s ours
Change-Id: I524e2276bb358a4373036c7943b1b00f53ebaa17
Bill Yi [Wed, 20 Dec 2017 19:22:02 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
970261b46c -s ours
Change-Id: I1f37c148c9d2086d198443c596880fbc57cbad4b
Bill Yi [Wed, 20 Dec 2017 19:19:15 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours
am:
2d00ab621a -s ours
Change-Id: Ib3d980494cfeb7ddc621e1185429635cc5b3ab8d
Bill Yi [Wed, 20 Dec 2017 19:17:58 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
9593ca1955 -s ours
Change-Id: Ie8c5ea32885dc3c6ee7b688beaf13f179dc95475
Bill Yi [Wed, 20 Dec 2017 19:16:46 +0000 (19:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours
am:
c81e5ae281 -s ours
Change-Id: I90e825b5d0b540318f8a75f10bac95323e110cfa
Bill Yi [Wed, 20 Dec 2017 19:12:46 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0c1f4c2931 -s ours
Change-Id: Ib2fcf638c1433c444796d90fa8578c035c60b3df
Bill Yi [Wed, 20 Dec 2017 19:12:00 +0000 (19:12 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours
am:
daa1d87e50 -s ours
Change-Id: Ieeaf1281b3ef3256264850f8910c7075e07eabe6
Bill Yi [Wed, 20 Dec 2017 19:10:42 +0000 (19:10 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
496af8623f -s ours
Change-Id: I3acd580690e2bca34b21d600225f53ac7b467185
Bill Yi [Wed, 20 Dec 2017 19:07:26 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours
am:
1fccf167ff -s ours
Change-Id: I295d71779c2361915f61c3b1f76ca90103b716ea
TreeHugger Robot [Wed, 20 Dec 2017 19:07:04 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 19:05:04 +0000 (19:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 19:04:41 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 19:03:39 +0000 (19:03 +0000)]
Import translations. DO NOT MERGE
am:
406659b709 -s ours
Change-Id: Ida0956b8a3ba81a7a5f78753236c0cac001c2b1a
TreeHugger Robot [Wed, 20 Dec 2017 18:59:40 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 18:59:10 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 13:29:48 +0000 (05:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie04afa32da40ba59ba9e9c9964fee8b597f00d1e
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 13:24:54 +0000 (05:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: If89c7f1e2e96a2922b4cce9c446109b8d085b091
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 12:39:09 +0000 (04:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6891787af9011c1559364b4966808a907949b07e
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 12:34:13 +0000 (04:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia6fe335e23b77c14a731eb8e9e00bf1000c9600c
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 12:29:19 +0000 (04:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia614e1fe986931cbc5bb2dee16c9fb5c69e6c4b7
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 12:24:18 +0000 (04:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1a406cd61d89311ba4c903078452f46cb1e46870
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 12:10:52 +0000 (04:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifd1b4a854360927ae4479ca8d1bf0637c98aa5e5
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:56:50 +0000 (03:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4246a775e430d1db88a7c64144a4dca6824be297
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:43:02 +0000 (03:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7c5bfc2833a1fa01d3f1cabd451fa88ce8535094
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:38:01 +0000 (03:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I200b939582ec1b2a016f83f62ebb586da842bfae
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:32:57 +0000 (03:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I63d54555e4cb7071f114b81d17b1364475a4380f
Auto-generated-cl: translation import
Felipe Leme [Thu, 14 Dec 2017 01:49:36 +0000 (01:49 +0000)]
Proper autofill fix to let phone process autofill Settings activity.
am:
2f58b03ea1
Change-Id: Ia167badcdb5fee60a62c9cf0932150b54180ba0b
Felipe Leme [Mon, 11 Dec 2017 22:37:35 +0000 (14:37 -0800)]
Proper autofill fix to let phone process autofill Settings activity.
Test: adb shell am start com.android.settings/.RadioInfo
Bug:
69981710
Fixes:
70506888
Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Merged-In: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Felipe Leme [Fri, 8 Dec 2017 18:39:01 +0000 (18:39 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
am:
bd355dbf58
Change-Id: I922cbe5c9b1e71569e09241564faf537fb923604
TreeHugger Robot [Fri, 8 Dec 2017 18:16:24 +0000 (18:16 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
Felipe Leme [Fri, 1 Dec 2017 01:41:57 +0000 (17:41 -0800)]
Make sure apps cannot forge package name on AssistStructure used for Autofill.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.VirtualContainerActivityTest#testAppCannotFakePackageName
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
69981710
Change-Id: Id6036cddb51dd8dd0c9128b7212d573f630d693f
Merged-In: Id6036cddb51dd8dd0c9128b7212d573f630d693f
Rubin Xu [Mon, 4 Dec 2017 11:32:48 +0000 (11:32 +0000)]
resolve merge conflicts of
2ff6320d773c to oc-dr1-dev
Change-Id: I3711119a6cbba1b697ad379a8520b73023c27edb
TreeHugger Robot [Sat, 2 Dec 2017 00:01:31 +0000 (00:01 +0000)]
Merge "Swap the order of synthetic password wrapping" into oc-dev
Kevin Hufnagle [Fri, 1 Dec 2017 20:20:44 +0000 (20:20 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev
am:
a96e533840
Change-Id: Iefd97a3d8b1377dd72f3a3428c539cb029b4e0a9
Kevin Hufnagle [Fri, 1 Dec 2017 20:06:38 +0000 (20:06 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev
Jon Dormody [Fri, 1 Dec 2017 16:14:15 +0000 (16:14 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug:
1766768" into oc-dev
am:
ce7f1e6601
Change-Id: If7798db1aea1f1d6cdb42a7d25509c814a31f6ca
Jon Dormody [Fri, 1 Dec 2017 16:07:27 +0000 (16:07 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev
am:
fb839ce59a
Change-Id: Ic135f510c6e5ff8a9a00f2d2be1fcc0c284dd5cf
Jon Dormody [Fri, 1 Dec 2017 15:53:36 +0000 (15:53 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug:
1766768" into oc-dev
Jon Dormody [Fri, 1 Dec 2017 15:52:54 +0000 (15:52 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev
Jonathan Dormody [Thu, 30 Nov 2017 22:06:55 +0000 (15:06 -0700)]
Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor
Test: make ds-docs
Bug:
1766768
Change-Id: Idfea122569bb6f80889be3f224f9629cfebc0ca3
Jonathan Dormody [Thu, 16 Nov 2017 18:25:20 +0000 (11:25 -0700)]
Docs: Added mention that the getSharedPreferences method is thread
safe.
Test: make ds-docs
Bug:
5370116
Change-Id: I5aa851db5e1dbcb3563f1ce15f96cc10c80e90ba
Jon Dormody [Fri, 10 Nov 2017 17:14:04 +0000 (17:14 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev
am:
ec741b83a3
Change-Id: I9d170c0baf186d074c77d2a98bd60bee66bfd701
Jon Dormody [Fri, 10 Nov 2017 16:58:17 +0000 (16:58 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev
Jonathan Dormody [Thu, 9 Nov 2017 23:53:14 +0000 (16:53 -0700)]
Docs: Fixed a typo by changing "retu rn" to "return"
Test: make ds-docs
Bug:
32830129
Change-Id: I86b359c2cf65fbd3c9d50569bf81fd669111055e
Hyunyoung Song [Tue, 10 Oct 2017 17:35:59 +0000 (10:35 -0700)]
Wrap StackOverflowError in NotFoundException.
Bug:
67462465
Bug:
66498711
Test: builds and tested using faulty apk with recursive drawable.
Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e
(cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)
Jon Dormody [Thu, 9 Nov 2017 16:17:35 +0000 (16:17 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
am:
459735662f
Change-Id: I31f036fa2365084454ac7899d92580e985bd9f21
Jon Dormody [Thu, 9 Nov 2017 16:05:13 +0000 (16:05 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
Jonathan Dormody [Wed, 8 Nov 2017 23:58:16 +0000 (16:58 -0700)]
Docs: Added a link to Updating Your Security Provider to Protect Against
SSL Exploits
Test: make ds-docs
Bug:
19110275
Change-Id: I3b0a35715c16c4e30a47aab9cbaf991770426c57
Adam Vartanian [Wed, 8 Nov 2017 00:15:23 +0000 (00:15 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba am:
a2149abe3a
am:
560fb5d050
Change-Id: I088a828022a70b0d2ac1b88c4fab3801528eb4f8
Adam Vartanian [Tue, 7 Nov 2017 23:50:35 +0000 (23:50 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc am:
eb4598afba
am:
a2149abe3a
Change-Id: I48d611e91318a8f85f12fcff5fc00de8b1f834c9
Adam Vartanian [Tue, 7 Nov 2017 23:30:44 +0000 (23:30 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333 am:
49dfdd66cc
am:
eb4598afba
Change-Id: Ibf435bc90e013af2a7c72f1988ac0f78485f2c23
Adam Vartanian [Tue, 7 Nov 2017 23:04:25 +0000 (23:04 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21 am:
f61daaa333
am:
49dfdd66cc
Change-Id: I49d0744049b593ea47ede3ad9e128a5344196811
Adam Vartanian [Tue, 7 Nov 2017 22:41:48 +0000 (22:41 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c am:
3ac5dabc21
am:
f61daaa333
Change-Id: Iee679fb3a115f6c1a2683905e5b392ec665aee33
Adam Vartanian [Tue, 7 Nov 2017 22:12:09 +0000 (22:12 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c
am:
3ac5dabc21
Change-Id: I43fbad45f90ec2d1fb48fecbd2d73a05f39730a9
Adam Vartanian [Tue, 7 Nov 2017 21:56:10 +0000 (21:56 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362
am:
240b55de2c
Change-Id: Ie3d378e8d9aeaff6f45838ebe988a5799f6acf3b
Adam Vartanian [Tue, 7 Nov 2017 21:41:55 +0000 (21:41 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e
am:
49e5fca362
Change-Id: Id6f38542623d768bebcfae7e79e8e49450329037
Adam Vartanian [Tue, 7 Nov 2017 21:29:27 +0000 (21:29 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3
am:
eee677386e
Change-Id: Ifd94d94c5376a6b4f1174aa7c2c8bb6d40199d89
Adam Vartanian [Tue, 7 Nov 2017 21:02:07 +0000 (21:02 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814
am:
4158c9fbf3
Change-Id: I61bc0f5471d8f7a9a59136f320d465f2ee81b518
Adam Vartanian [Tue, 7 Nov 2017 20:51:02 +0000 (20:51 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37
am:
6a9c7c4814
Change-Id: I80bedf58833511d336839df9f17daf65cfebfacf
Adam Vartanian [Tue, 7 Nov 2017 20:41:28 +0000 (20:41 +0000)]
Adjust Uri host parsing to use last instead of first @.
am:
cd6228dd37
Change-Id: I5db66a5a2073acaffe0560999c914a78df362c51
Adam Vartanian [Tue, 7 Nov 2017 12:22:23 +0000 (12:22 +0000)]
Adjust Uri host parsing to use last instead of first @.
Malformed authority segments can currently cause the parser to produce
a hostname that doesn't match the hostname produced by the WHATWG URL
parsing algorithm* used by browsers, which means that a URL could be seen
as having a "safe" host when checked by an Android app but actually visit
a different host when passed to a browser. The WHATWG URL parsing
algorithm always produces a hostname based on the last @ in the authority
segment, so we do the same.
* https://url.spec.whatwg.org/#authority-state resets the "buffer", which
is being used to build up the host name, each time an @ is found, so it
has the effect of using the content between the final @ and the end
of the authority section as the hostname.
Bug:
68341964
Test: vogar android.net.UriTest (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Idca79f35a886de042c94d6ab66787c2e98ac8376
Rubin Xu [Tue, 31 Oct 2017 15:40:32 +0000 (15:40 +0000)]
Swap the order of synthetic password wrapping
Synthetic password is double encrypted by both a random auth-bound keymaster
key and a secret derived from user password. In order to avoid a password
verification oracle without rate limiting, synthetic password needs to be
encrypted by the derived secret first, and then the auth-bound key. This
change corrects the order of encryptions, as well as adds an upgrade path to
refresh existing credentials.
Test: Running an old build with existing password, flash to new build,
verify the device unlocks successfully.
Bug:
68694819
Change-Id: Ifdaa01f3f4ddd5bb3f3d808d38f440ced729034f
Merged-In: Ifdaa01f3f4ddd5bb3f3d808d38f440ced729034f
Leon Scroggins III [Tue, 31 Oct 2017 20:29:00 +0000 (20:29 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev
am:
c4049e247f
Change-Id: I7636d9eaf3983fc7ed0c1dc59ec2671ff762206e
TreeHugger Robot [Tue, 31 Oct 2017 20:16:27 +0000 (20:16 +0000)]
Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev
Siyamed Sinir [Tue, 31 Oct 2017 18:21:55 +0000 (18:21 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991 am:
cc2fcef375
am:
6ad6e7f2f4
Change-Id: Ieafefbc852220055c45d1a019def6f2ec9a6df4c
Siyamed Sinir [Tue, 31 Oct 2017 18:10:52 +0000 (18:10 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856 am:
eeb90235bf am:
eb863a6b2e am:
b353fbcb7a am:
9422f6e991
am:
cc2fcef375
Change-Id: I6c7a98c8e38a38dcd9ea2aa423ee93dbd0f12ed4