drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
318,125 Commits 1 Branch 0 Tags
Commit Graph

318125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
0bfcd7eef7 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours 
am: a683975c54  -s ours

Change-Id: I54b9b28c9ad38ad19c1e7f228e2e095dfd5cabe3
 2017-12-21 17:37:26 +00:00
Bill Yi
05e41d0531 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours 
am: 7244723549  -s ours

Change-Id: Id717ceb76ced6f3fb2b10689efd916e7e7cc5cfe
 2017-12-20 19:26:37 +00:00
Bill Yi
a683975c54 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 970261b46c  -s ours

Change-Id: I1f37c148c9d2086d198443c596880fbc57cbad4b
 2017-12-20 19:22:02 +00:00
Bill Yi
e135a35edf Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours 
am: 2d00ab621a  -s ours

Change-Id: Ib3d980494cfeb7ddc621e1185429635cc5b3ab8d
 2017-12-20 19:19:15 +00:00
Bill Yi
7244723549 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 9593ca1955  -s ours

Change-Id: Ie8c5ea32885dc3c6ee7b688beaf13f179dc95475
 2017-12-20 19:17:58 +00:00
Bill Yi
13062c93e5 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours 
am: c81e5ae281  -s ours

Change-Id: I90e825b5d0b540318f8a75f10bac95323e110cfa
 2017-12-20 19:16:46 +00:00
Bill Yi
2d00ab621a Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 0c1f4c2931  -s ours

Change-Id: Ib2fcf638c1433c444796d90fa8578c035c60b3df
 2017-12-20 19:12:46 +00:00
Bill Yi
c81e5ae281 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 496af8623f  -s ours

Change-Id: I3acd580690e2bca34b21d600225f53ac7b467185
 2017-12-20 19:10:42 +00:00
Bill Yi
daa1d87e50 Import translations. DO NOT MERGE am: 406659b709 -s ours 
am: 1fccf167ff  -s ours

Change-Id: I295d71779c2361915f61c3b1f76ca90103b716ea
 2017-12-20 19:07:26 +00:00
TreeHugger Robot
970261b46c Merge "Import translations. DO NOT MERGE" into cw-f-dev 2017-12-20 19:05:04 +00:00
TreeHugger Robot
9593ca1955 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2017-12-20 19:04:41 +00:00
Bill Yi
1fccf167ff Import translations. DO NOT MERGE 
am: 406659b709  -s ours

Change-Id: Ida0956b8a3ba81a7a5f78753236c0cac001c2b1a
 2017-12-20 19:03:39 +00:00
TreeHugger Robot
0c1f4c2931 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2017-12-20 18:59:40 +00:00
TreeHugger Robot
496af8623f Merge "Import translations. DO NOT MERGE" into cw-f-dev 2017-12-20 18:59:10 +00:00
Bill Yi
48f7a995a6 Import translations. DO NOT MERGE 
Change-Id: Ia614e1fe986931cbc5bb2dee16c9fb5c69e6c4b7
Auto-generated-cl: translation import
 2017-12-20 04:29:19 -08:00
Bill Yi
c06ca46a05 Import translations. DO NOT MERGE 
Change-Id: Ifd1b4a854360927ae4479ca8d1bf0637c98aa5e5
Auto-generated-cl: translation import
 2017-12-20 04:10:52 -08:00
Bill Yi
f2b9a606cd Import translations. DO NOT MERGE 
Change-Id: I4246a775e430d1db88a7c64144a4dca6824be297
Auto-generated-cl: translation import
 2017-12-20 03:56:50 -08:00
Bill Yi
7bb5638405 Import translations. DO NOT MERGE 
Change-Id: I7c5bfc2833a1fa01d3f1cabd451fa88ce8535094
Auto-generated-cl: translation import
 2017-12-20 03:43:02 -08:00
Bill Yi
406659b709 Import translations. DO NOT MERGE 
Change-Id: I200b939582ec1b2a016f83f62ebb586da842bfae
Auto-generated-cl: translation import
 2017-12-20 03:38:01 -08:00
Felipe Leme
2f58b03ea1 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
 2017-12-12 19:35:40 +00:00
TreeHugger Robot
bd355dbf58 Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev 2017-12-08 18:16:24 +00:00
Felipe Leme
9ad2900630 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
 2017-12-06 16:54:32 -08:00
TreeHugger Robot
2ff6320d77 Merge "Swap the order of synthetic password wrapping" into oc-dev 2017-12-02 00:01:31 +00:00
Kevin Hufnagle
a96e533840 Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev 2017-12-01 20:06:38 +00:00
Jon Dormody
ce7f1e6601 Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev 2017-12-01 15:53:36 +00:00
Jon Dormody
fb839ce59a Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev 2017-12-01 15:52:54 +00:00
Jonathan Dormody
1c7c4b2f14 Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor 
Test: make ds-docs
Bug: 1766768

Change-Id: Idfea122569bb6f80889be3f224f9629cfebc0ca3
 2017-11-30 22:25:42 +00:00
Jonathan Dormody
1bca5db0cb Docs: Added mention that the getSharedPreferences method is thread 
safe.

Test: make ds-docs

Bug: 5370116
Change-Id: I5aa851db5e1dbcb3563f1ce15f96cc10c80e90ba
 2017-11-16 11:25:20 -07:00
Jon Dormody
ec741b83a3 Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev 2017-11-10 16:58:17 +00:00
Jonathan Dormody
35719399cb Docs: Fixed a typo by changing "retu rn" to "return" 
Test: make ds-docs

Bug: 32830129
Change-Id: I86b359c2cf65fbd3c9d50569bf81fd669111055e
 2017-11-09 16:57:42 -07:00
Jon Dormody
459735662f Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev 2017-11-09 16:05:13 +00:00
Jonathan Dormody
f72e8263c7 Docs: Added a link to Updating Your Security Provider to Protect Against 
SSL Exploits

Test: make ds-docs

Bug: 19110275
Change-Id: I3b0a35715c16c4e30a47aab9cbaf991770426c57
 2017-11-08 17:13:58 -07:00
Adam Vartanian
560fb5d050 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
 2017-11-07 23:50:35 +00:00
Adam Vartanian
a2149abe3a 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
 2017-11-07 23:30:44 +00:00
Adam Vartanian
eb4598afba 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
 2017-11-07 23:04:25 +00:00
Adam Vartanian
49dfdd66cc 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
 2017-11-07 22:41:48 +00:00
Adam Vartanian
f61daaa333 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
 2017-11-07 22:12:09 +00:00
Adam Vartanian
3ac5dabc21 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
 2017-11-07 21:56:10 +00:00
Adam Vartanian
240b55de2c Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e 
am: 49e5fca362

Change-Id: Id6f38542623d768bebcfae7e79e8e49450329037
 2017-11-07 21:41:55 +00:00
Adam Vartanian
49e5fca362 Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 
am: eee677386e

Change-Id: Ifd94d94c5376a6b4f1174aa7c2c8bb6d40199d89
 2017-11-07 21:29:27 +00:00
Adam Vartanian
eee677386e Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 
am: 4158c9fbf3

Change-Id: I61bc0f5471d8f7a9a59136f320d465f2ee81b518
 2017-11-07 21:02:07 +00:00
Adam Vartanian
4158c9fbf3 Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 
am: 6a9c7c4814

Change-Id: I80bedf58833511d336839df9f17daf65cfebfacf
 2017-11-07 20:51:02 +00:00
Adam Vartanian
6a9c7c4814 Adjust Uri host parsing to use last instead of first @. 
am: cd6228dd37

Change-Id: I5db66a5a2073acaffe0560999c914a78df362c51
 2017-11-07 20:41:28 +00:00
Adam Vartanian
cd6228dd37 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
 2017-11-07 15:51:53 +00:00
Rubin Xu
24bfd61d3c 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
 2017-11-04 00:18:10 +00:00
TreeHugger Robot
c4049e247f Merge "Throw OOME if Bitmap.nativeCreate fails" into oc-dev 2017-10-31 20:16:27 +00:00
Siyamed Sinir
6ad6e7f2f4 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
 2017-10-31 18:10:52 +00:00
Siyamed Sinir
cc2fcef375 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

Change-Id: I0097c1c1780c285adfd17c9faf277acbcaf9803d
 2017-10-31 17:59:25 +00:00
Siyamed Sinir
9422f6e991 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

Change-Id: Iba3d14106f47f98643a6a02b67bcc14437755217
 2017-10-31 17:41:58 +00:00
Siyamed Sinir
b353fbcb7a Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856 am: eeb90235bf 
am: eb863a6b2e

Change-Id: Iacb16edfcc470e3f030324ee75e6eb623ee2c91c
 2017-10-31 17:18:57 +00:00