Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
208,266 Commits 3 Branches 0 Tags
04e84bb0ec00ad380613492ecd436e6a76d0ff08
Commit Graph

208266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
04e84bb0ec [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb 
Change-Id: I4e69906486cfec4c4db7cbb119df1d55aec55675
 2018-02-07 23:23:01 +00:00
Etan Cohen
523fed0deb Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev 
am: 0153ac9dad

Change-Id: I2a07841e7cd27f2ba7c30f9b2df5ddf1afcc6ef5
 2018-02-07 23:22:41 +00:00
Etan Cohen
1c198dfc71 Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev 
* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix
 2018-02-07 22:41:26 +00:00
Etan Cohen
6cc0b76e85 Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev 
* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix
 2018-02-07 22:41:26 +00:00
Etan Cohen
0153ac9dad Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev 
* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix
 2018-02-07 22:41:26 +00:00
Android Build Merger (Role)
4405b0ced2 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f 
Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72
 2018-02-07 08:18:15 +00:00
Android Build Merger (Role)
83cb35453f [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d 
Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55
 2018-02-07 08:18:09 +00:00
Android Build Merger (Role)
0231bc4d6d [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 
Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62
 2018-02-07 08:18:02 +00:00
Rubin Xu
54813e9888 Fix VerifyCredentialResponse parcelling code 
There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.

Test: none
Bug: 71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353
 2018-02-07 08:17:06 +00:00
Android Build Merger (Role)
af9f48b7e8 [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 
Change-Id: I2be402278897c6d97207672f8bfc5af8cbc6dc6d
 2018-02-02 18:16:07 +00:00
Android Build Merger (Role)
8d2d052b61 [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 
Change-Id: I371f3a2967a5a7a826bca94637a78b7dae7c2cd8
 2018-02-02 18:16:00 +00:00
Android Build Merger (Role)
5f4d9350f4 [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c 
Change-Id: I46bbee504ea7a64d39b98a2a8336b3bcf593869a
 2018-02-02 18:15:53 +00:00
Etan Cohen
e1e5a2409c [RTT] ParcelableRttResults parcel code fix 
ParcelableRttResults was unparceled incorrectly.

Bug: 70398564
Test: exploit provided in bug no longer works
Change-Id: Ifd6de547e9861bbebc399b43d0cc2899a8160813
 2018-02-02 10:11:47 -08:00
Android Build Merger (Role)
3ec9cb8d3a [automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249 am: 2c70774e72 
Change-Id: I982742b65d3ae6941b274c147d09ce6f50533c1e
 2018-02-01 14:14:22 +00:00
Android Build Merger (Role)
2c70774e72 [automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249 
Change-Id: I1ea542611301d0c4359021303b05a5e59ee1185b
 2018-02-01 14:14:17 +00:00
Android Build Merger (Role)
c1cb058249 [automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e 
Change-Id: If53ecf0654e883fa43e2f543561f0f7994763698
 2018-02-01 14:14:11 +00:00
Adam Vartanian
8a0c7fd99e Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev 
am: 5ed5d15e66

Change-Id: I7eb106b0db3ab568a7d8845ddd2025d80eeced3c
 2018-02-01 14:13:34 +00:00
Android Build Merger (Role)
3534bc9786 [automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev am: fea4158eea am: 8fbe4e673f 
Change-Id: Ifd6fc978fb4544f7f4c9fe99599d472c10b071ac
 2018-02-01 14:06:15 +00:00
Adam Vartanian
8fbe4e673f Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev 
am: fea4158eea

Change-Id: Iea20c91a29115634c2241f535c4a0c489605798f
 2018-02-01 14:05:44 +00:00
Adam Vartanian
fea4158eea Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev 
* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.
 2018-02-01 10:02:43 +00:00
Adam Vartanian
f0913af938 Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dev 
* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.
 2018-02-01 10:02:43 +00:00
Adam Vartanian
d2d66b5f48 Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr1.5-dev 
* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.
 2018-02-01 10:02:43 +00:00
Adam Vartanian
5ed5d15e66 Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev 2018-02-01 10:02:42 +00:00
Adam Vartanian
93103c0032 Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into cw-e-dev 
* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.
 2018-02-01 10:02:42 +00:00
Android Build Merger (Role)
373cfa75c0 [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 
Change-Id: If07298bb4ecf8a55391a014568a3ea264358b0e9
 2018-01-31 11:20:21 +00:00
Android Build Merger (Role)
d3c0db66b9 [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 
Change-Id: I3fd20a3ee5eaa6be1c1989f13d40aed34136557e
 2018-01-31 11:20:15 +00:00
Android Build Merger (Role)
fddbf1b6b2 [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 
Change-Id: Ic336b5fafebabdd4a5ad4d775a96d76739189a09
 2018-01-31 11:20:08 +00:00
Android Build Merger (Role)
97668ae137 [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 
Change-Id: I20336a5786e753e6941b9a784068480475415110
 2018-01-31 11:19:56 +00:00
Adam Vartanian
fa3afbd0e7 Adjust URI host parsing to stop on \ character. 
The WHATWG URL parsing algorithm [1] used by browsers says that for
"special" URL schemes (which is basically all commonly-used
hierarchical schemes, including http, https, ftp, and file), the host
portion ends if a \ character is seen, whereas this class previously
continued to consider characters part of the hostname.  This meant
that a malicious URL could be seen as having a "safe" host when viewed
by an app but navigate to a different host when passed to a browser.

[1] https://url.spec.whatwg.org/#host-state

Bug: 71360761
Test: vogar frameworks/base/core/tests/coretests/src/android/net/UriTest.java (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Id53f7054d1be8d59bbcc7e219159e59a2425106e
 2018-01-31 11:14:45 +00:00
Android Build Merger (Role)
a3f0976937 [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 am: 0ab4540c41 
Change-Id: I4861f114af1061df6280a8adfd10839c67ddbdf3
 2018-01-17 22:20:24 +00:00
Android Build Merger (Role)
0ab4540c41 [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 am: e2417e6682 
Change-Id: Ief72a1c4868ab7433e4d3d4d99cbdc30954d6695
 2018-01-17 22:20:19 +00:00
Android Build Merger (Role)
e2417e6682 [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 am: c3d7250b99 
Change-Id: I43a4eb54f67bd3dbcffd0432c3988b0377463fff
 2018-01-17 22:20:14 +00:00
Android Build Merger (Role)
c3d7250b99 [automerger] Check for null-terminator in ResStringPool::string8At am: 5ec65ae909 
Change-Id: I1ea52e1ccd7bf5467438e3dc2e670cf8f325c629
 2018-01-17 22:20:03 +00:00
Adam Lesinski
5ec65ae909 Check for null-terminator in ResStringPool::string8At 
All other stringAt methods check for null termination. Be consistent
so that upper levels don't end up with huge corrupt strings.

Bug: 62537081
Test: none
Change-Id: I17bdfb0c1e34507b66c6cad651bbdb12c5d4c417
(cherry picked from commit 3d35a0ea30)
(cherry picked from commit 97f8cb01149b35b1832c7f9efe85ff19edf1083e)
 2018-01-17 22:19:39 +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
Siyamed Sinir
bc56010856 Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 
am: 1f8536653b

Change-Id: Idbf65d9e9db40c7dfa2456f3e807890c88dcbb3d
 2017-10-31 16:42:29 +00:00
Siyamed Sinir
1f8536653b Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a 
am: c275b77b03

Change-Id: Ia2887869c4ac6cdcd1a66372b991b9f78edf7679
 2017-10-31 16:34:29 +00:00
Siyamed Sinir
c275b77b03 Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev 
am: a0c253d07a

Change-Id: I9040d5dcde6228ea3f10bc03077800d2b070cbb1
 2017-10-31 16:25:26 +00:00
Siyamed Sinir
a0c253d07a Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev 2017-10-31 16:17:06 +00:00
Jeff Sharkey
3bb6994a0b DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 
am: 2f8dbe9693

Change-Id: I5cd93d250ea8c6cd45616aaafabd0eda68da4538
 2017-10-19 23:17:05 +00:00
Jeff Sharkey
1455bd6492 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 am: 563ea682e7 
am: 901c587c6b

Change-Id: I3e721dc6183024b73b70d1f30363983a7afaf6d1
 2017-10-19 23:06:16 +00:00
Jeff Sharkey
2f8dbe9693 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb 
am: 9c441159f9

Change-Id: I3533fdd4683cb85f66e107c3b4038f1a7ec97dfc
 2017-10-19 22:58:37 +00:00
Siyamed Sinir
74b3298994 Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d 
am: 4c7113461f

Change-Id: If52cdfdbd9e3eee06a109a5b4f1bff82d9506b73
 2017-10-19 22:51:30 +00:00
Jeff Sharkey
901c587c6b DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 
am: 563ea682e7

Change-Id: I393058caae6a8cc446597509b20241723f22a238
 2017-10-19 22:44:02 +00:00
Siyamed Sinir
4c7113461f Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 
am: 63bb54738d

Change-Id: Ie5bd667854712446924704bc839e80bb66d06a63
 2017-10-19 22:34:08 +00:00