Charles He
2ae412019b
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf am: 0fa9328b80
...
am: 51ca967453
2017-08-15 21:32:01 +00:00
Charles He
51ca967453
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
...
am: 0fa9328b80
2017-08-15 21:15:55 +00:00
Android Build Merger (Role)
0fa9328b80
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
...
Change-Id: If5cad5c0f361acda25df4d90de06821d16e689c0
2017-08-15 20:47:03 +00:00
Charles He
24587d57cf
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4
...
am: 159cd14334
2017-08-15 20:42:11 +00:00
Charles He
159cd14334
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4
...
Change-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00
2017-08-15 17:54:35 +00:00
Charles He
40317127f4
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4
...
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
2017-08-15 17:54:05 +00:00
Charles He
4acf4fabf4
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49
...
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
2017-08-15 17:53:35 +00:00
Charles He
a3c1de7e49
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d
...
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
2017-08-15 17:52:57 +00:00
Charles He
6dfc8d8d4d
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f
...
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
2017-08-15 17:52:27 +00:00
Charles He
1cd9e8096f
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0
...
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
2017-08-15 17:51:58 +00:00
Charles He
b1141b6ff0
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c
...
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
2017-08-15 17:51:28 +00:00
Lorenzo Colitti
20fa45e3a9
Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf
...
am: 0cf31d4d6d
2017-08-15 02:25:36 +00:00
Lorenzo Colitti
0cf31d4d6d
Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05
...
am: 51c3d6a8bf
2017-08-15 02:16:18 +00:00
Lorenzo Colitti
51c3d6a8bf
Merge changes I82d3bee0,I9c9413d7
...
am: deb4eb5d05
2017-08-15 02:07:36 +00:00
Lorenzo Colitti
deb4eb5d05
Merge changes I82d3bee0,I9c9413d7
...
* changes:
Pass data usage limits to tethering offload code.
Don't time out when fetching tether offload stats.
2017-08-15 01:57:28 +00:00
Lorenzo Colitti
50b60fc34d
Pass data usage limits to tethering offload code.
...
Bug: 29337859
Bug: 32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I82d3bee030bafa8fe85855885b5fc3893e699181
2017-08-15 00:09:23 +09:00
Cindy Kuang
43adc3d4e3
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65
...
am: 1e6401b07e
2017-08-11 21:01:11 +00:00
Cindy Kuang
1e6401b07e
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
...
am: 0580ac8a65
2017-08-11 20:45:24 +00:00
Cindy Kuang
0580ac8a65
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
2017-08-11 20:33:34 +00:00
Phil Weaver
2436cb76b9
Merge "Stop focusing views before layout." into oc-dr1-dev
...
am: a5dab05b61
2017-08-10 22:44:47 +00:00
Phil Weaver
a5dab05b61
Merge "Stop focusing views before layout." into oc-dr1-dev
2017-08-10 22:34:03 +00:00
Phil Weaver
edbcf2c4bf
Stop focusing views before layout.
...
Rolls back one line of ag/2257919.
Bug: 63811145
Test: TalkBack no longer reads the page backwards in:
Settings > System > Reset > Factory data reset
Settings > Connected devices > Android Beam
Change-Id: I6b04e64cd650ebda193da4a54bf0721bd256820c
2017-08-10 12:31:34 -07:00
Cindy Kuang
12d3747c0b
docs: replaced "i.e." to fix formatting error
...
Test: make ds-docs
Bug: 6440865
Change-Id: I428476ddfe55f14df531ea6a1c3e3a09f7a29e7d
2017-08-10 09:59:58 -07:00
Phil Weaver
68cf0f4df8
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
...
am: a4b5e0893f
2017-08-10 00:19:07 +00:00
Phil Weaver
a4b5e0893f
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
2017-08-10 00:13:04 +00:00
Vinay Kalia
1199972de1
Merge "Fix BLE scan leaks" into oc-dev
...
am: 6e749c392b
2017-08-09 21:10:53 +00:00
Christine Franks
e5bad6eb25
Merge "Allow SMS and calling for demo users" into oc-dr1-dev
...
am: 4387d3a523
2017-08-09 20:15:28 +00:00
Christine Franks
4387d3a523
Merge "Allow SMS and calling for demo users" into oc-dr1-dev
2017-08-09 20:06:35 +00:00
Jakub Pawlowski
c0e6b65f28
Merge "Bluetooth: AdvertiseData parceling simplification" am: c7da241b3e am: 3ee6eed62f
...
am: 272a45e493
2017-08-09 19:42:07 +00:00
Jakub Pawlowski
272a45e493
Merge "Bluetooth: AdvertiseData parceling simplification" am: c7da241b3e
...
am: 3ee6eed62f
2017-08-09 19:31:54 +00:00
Tyler Gunn
c1e365f1c3
Merge "Enforce call log length limit on a per PhoneAccount basis." am: 647b520a00
...
am: 8adf430f30
2017-08-09 19:20:29 +00:00
Jakub Pawlowski
3ee6eed62f
Merge "Bluetooth: AdvertiseData parceling simplification"
...
am: c7da241b3e
2017-08-09 19:15:08 +00:00
Tyler Gunn
8adf430f30
Merge "Enforce call log length limit on a per PhoneAccount basis."
...
am: 647b520a00
2017-08-09 19:03:32 +00:00
Jakub Pawlowski
c7da241b3e
Merge "Bluetooth: AdvertiseData parceling simplification"
2017-08-09 18:56:57 +00:00
Treehugger Robot
647b520a00
Merge "Enforce call log length limit on a per PhoneAccount basis."
2017-08-09 18:44:08 +00:00
Phil Weaver
0a8caa1ccc
Fix source for PiP hover accessibility events
...
The events were ending up not important for a11y and
with invalid window ids, which prevented TalkBack from
seeing them properly.
Bug: 64428961
Test: Ran YouTube in PiP, now able to select it.
Change-Id: I38ccbf5f2f35ffda255b84f229e98ca23e6b11aa
2017-08-09 11:28:41 -07:00
Jakub Pawlowski
e8c3b91dc3
Bluetooth: AdvertiseData parceling simplification
...
Use writeTypedArray instead of writeList - this will not serialize
string with type name, which is unnecessary
Use createByteArray instead of readByteArra - it takes care of null and
empty array handling
Test: sl4a FilteringTest, BleAdvertiseApiTest
Change-Id: I6a22674a0bf9933e39691de7f2b2b52a060ae368
2017-08-09 17:26:14 +00:00
Christine Franks
97a5480a1d
Allow SMS and calling for demo users
...
Bug: 62712426
Test: manual - restrictions are unset in demo mode
Change-Id: I151fbfb8222e768403a7e5ba1fcf868ba35a1f22
2017-08-09 10:24:38 -07:00
Tyler Gunn
c971bf1760
Enforce call log length limit on a per PhoneAccount basis.
...
Performing the auto delete based on the PhoneAccount of the new entry.
This ensures no one CS can cause the removal of entries by another.
Test: Manual
Bug: 38196259
Merged-In: I382cb62a1b2b7e482c49ece05f90fc982b797add
Change-Id: I382cb62a1b2b7e482c49ece05f90fc982b797add
2017-08-09 09:53:00 -07:00
Jakub Pawlowski
fa983ab254
resolve merge conflicts of 15658662fd to stage-aosp-master am: 3b38eaa3c2
...
am: 208a84ecb9
2017-08-09 16:19:32 +00:00
Jakub Pawlowski
208a84ecb9
resolve merge conflicts of 15658662fd to stage-aosp-master
...
am: 3b38eaa3c2
2017-08-09 16:06:47 +00:00
Vinay Kalia
c2fd144218
Fix BLE scan leaks
...
If an app starts multiple scans with same callback then
there is a collision in mLeScanClients hash map which
results in leaking first scan. This change fixes it by
not allowing the second scan with same callback.
BUG: 62389939
BUG: 38198694
Test: Tested applications which started multiple scans with
same callback.
Change-Id: I569069a40b6f8b4b8bb070731225e732c6b23ec8
(cherry picked from commit 9722971cb4
2017-08-09 09:03:52 -07:00
Jakub Pawlowski
3b38eaa3c2
resolve merge conflicts of 15658662fd to stage-aosp-master
...
Test: this fixes merge conflict that I skipped
Change-Id: I2e993d1f021b1bb671b07440cdc611853d6c3f08
2017-08-09 13:03:35 +00:00
Jakub Pawlowski
6732625aa0
Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)
...
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.
Test: compilation test
Change-Id: I9a6db8832c9ec3215c648e325d67278832ef22cc
Merged-In: I9a6db8832c9ec3215c648e325d67278832ef22cc
(cherry picked from commit 06ae9c665b
2017-08-08 12:38:37 -07:00
Felipe Leme
0388a7531f
Clarifies autofill lifecycle. am: 744976e298
...
am: 04a8660851
2017-08-08 17:42:42 +00:00
Felipe Leme
04a8660851
Clarifies autofill lifecycle.
...
am: 744976e298
2017-08-08 17:37:13 +00:00
Felipe Leme
af40bb0dc4
Clarifies autofill lifecycle.
...
am: 744976e298
2017-08-08 17:34:14 +00:00
Calin Juravle
1dcfb7e085
Merge "Update DexLoadReporter to comply with the new reporting API" am: 89d087886d am: 8a9e43f1bf
...
am: 4740e015b9
2017-08-08 17:27:43 +00:00
Calin Juravle
4740e015b9
Merge "Update DexLoadReporter to comply with the new reporting API" am: 89d087886d
...
am: 8a9e43f1bf
2017-08-08 17:21:10 +00:00
Calin Juravle
8a9e43f1bf
Merge "Update DexLoadReporter to comply with the new reporting API"
...
am: 89d087886d
2017-08-08 17:13:06 +00:00
