Commit Graph

83154 Commits

Author SHA1 Message Date
Felipe Leme
7c3716792a Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-mr1-dev
am: 613d0cd8fb

Change-Id: Iee0adf135a684e5338250628f35b754a3e69b3d0
2017-12-08 18:18:49 +00:00
TreeHugger Robot
613d0cd8fb Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-mr1-dev 2017-12-08 18:05:59 +00:00
Eric Erfanian
4f6d728e62 Merge "Add assisted dialing properties to the framework." into oc-mr1-dev
am: 5d04d92265

Change-Id: Ib505b78a810099534907696b546213ad557343fb
2017-12-08 05:20:16 +00:00
TreeHugger Robot
5d04d92265 Merge "Add assisted dialing properties to the framework." into oc-mr1-dev 2017-12-08 05:02:31 +00:00
Jack He
aa9829a85a Merge "BT: Remove dead code in BluetoothHeadset" am: ea7363402c
am: 38ae4d2fce

Change-Id: I93ba53e4cf31e6dfc6e98d70cd73a93ec930ccb1
2017-12-08 01:48:22 +00:00
Treehugger Robot
ea7363402c Merge "BT: Remove dead code in BluetoothHeadset" 2017-12-08 01:14:59 +00:00
Felipe Leme
0d4faf1483 Merge "DO NOT MERGE - Backported some Autofill Javadoc improvements from master." into oc-mr1-dev
am: 11238d4f36

Change-Id: I38a6305bae7769aacaa3894744fc73dc82c25a62
2017-12-07 23:24:52 +00:00
Hansong Zhang
3c84b37f80 Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()" am: 0d3990b235
am: c2205a8d3d

Change-Id: I0ad13d152f7dbe4e9f776f831287981f6facd84f
2017-12-07 22:11:27 +00:00
Treehugger Robot
0d3990b235 Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()" 2017-12-07 21:37:45 +00:00
Jack He
887e2a1e14 BT: Remove dead code in BluetoothHeadset
The following hidden API methods are not implemented by the stack and
should be removed:
 - getBatteryUsageHint()
 - acceptIncomingConnect()
 - rejectIncomingConnect()

The following hidden API methods are no longer needed due to lack of
usage and should be removed:
 - enableWBS()
 - disableWBS()
 - bindResponse()

Bug: 70336991
Test: make
Change-Id: I75bd6735573e4cbc61b5bef8722b8badac2e9170
2017-12-07 12:06:21 -08:00
Felipe Leme
1d7bc44f65 DO NOT MERGE - Backported some Autofill Javadoc improvements from master.
Test: in Tree Hugger we trust!

Bug: 70215975

Change-Id: If679e735f1fe1916457c16d33d09cb47573ee7dd
Merged-In: I8ab3d76983259830fd90867bd2d7f1e3360b3c4e
2017-12-07 11:04:54 -08:00
Eric Erfanian
9765e89e1e Add assisted dialing properties to the framework.
These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.

Test: no existing unit tests found. could use some pointers
Bug: 35963245
Merged-In: I84343fb0cda16514c01997fd71d1e819b5b7eebb
Change-Id: I086e761ada9a57dca61c3a412561ee54255d6260
2017-12-07 18:34:35 +00:00
Jeff Sharkey
ff8201b34b Merge changes from topic "predicates_aosp" am: 76c275e7d3
am: 28f32f26b7

Change-Id: Ic3847aeda3c4d9d62432bf5918c83174e409b871
2017-12-07 18:31:52 +00:00
Felipe Leme
23e61a9086 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-07 10:04:56 -08:00
Jeff Sharkey
76c275e7d3 Merge changes from topic "predicates_aosp"
* changes:
  Deeper sanity checking of emitted types.
  Emit all APIs using Predicates.
  Massage APIs for upcoming doclava change.
2017-12-07 16:39:39 +00:00
Neil Fuller
ac8f2c94fd Merge "Fix doc typo. Improve class javadoc..." am: e08f918a6e
am: 26d28ef826

Change-Id: I7db3a33c933142806cbae90423044ccbac061868
2017-12-07 14:28:32 +00:00
Neil Fuller
e08f918a6e Merge "Fix doc typo. Improve class javadoc..." 2017-12-07 11:02:52 +00:00
Bowgo Tsai
3a315ab982 Merge "Disable AVB check in runtime vintf" am: 86c9951383
am: a241b4d488

Change-Id: Icf111bfeedde4a134ac77af935afff096961a852
2017-12-07 10:19:47 +00:00
Treehugger Robot
86c9951383 Merge "Disable AVB check in runtime vintf" 2017-12-07 08:15:35 +00:00
Jeff Sharkey
2337aec921 Deeper sanity checking of emitted types.
When emitting a method or field, verify that we're able to reference
all mentioned types.  This ensures that we don't accidentally
reference undefined classes/interfaces.

Test: manual inspection of API files
Bug: 69791141
Change-Id: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
Merged-In: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
2017-12-07 00:22:25 -07:00
Hansong Zhang
53f5412beb Bluetooth HID Device: format code, fix docstring, hide unplug()
* Reformat code with google-java-format
* Add the note that When an application is registered, the HID Host service
will be disabled until it is unregistered
* Fix the links in docstring
* Add @hide to unplug(); this is not a public API

Bug: 63384609
Test: make
Change-Id: I5dfcaab58b02c19e5745461c16602064a0ad8b83
2017-12-06 16:34:15 -08:00
Xin Li
5364be50cd DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I727a014df2fb05a4b13cb67b1fcb760a8b387523
2017-12-06 14:24:49 -08:00
Hansong Zhang
739c7bb9cb Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)" am: 8ab47567b2
am: bee508cb6d

Change-Id: Ie9aad08a93924655fee5b7f3c7abd77781985ad7
2017-12-06 20:50:07 +00:00
Hansong Zhang
bee508cb6d Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
am: 8ab47567b2

Change-Id: I9ea9a2d7bd5a81816fb652b643f345459bc2fdc5
2017-12-06 20:33:29 +00:00
Myles Watson
158eae223d Merge "Auto-format BluetoothAdapter.java" am: 5416559d1c
am: 03e1dfa444

Change-Id: I03f20ed4511ffd2d5bfa55e57d8895635e9ab165
2017-12-06 20:22:01 +00:00
Myles Watson
03e1dfa444 Merge "Auto-format BluetoothAdapter.java"
am: 5416559d1c

Change-Id: Ib5aa26901a97702fb4714dd89f24a112af59895b
2017-12-06 20:04:07 +00:00
Treehugger Robot
8ab47567b2 Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)" 2017-12-06 19:34:22 +00:00
Myles Watson
125b5456f1 Auto-format BluetoothAdapter.java
Test: build
Change-Id: I7bfc729373a24cceee05e443195640ff7f6d43b9
2017-12-06 16:42:23 +00:00
Hugo Benichi
5d2bd6bf0c Merge "Fix bug in MacAddress.fromString()" am: cdb84d2fc7
am: 9d077ecd9d

Change-Id: If67d0b8fcc2270d4b152d4e07c79725b457574c6
2017-12-05 10:01:19 +00:00
Hugo Benichi
9d077ecd9d Merge "Fix bug in MacAddress.fromString()"
am: cdb84d2fc7

Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df
2017-12-05 09:47:50 +00:00
Hugo Benichi
d2c5b1925b Fix bug in MacAddress.fromString()
Test: runtest frameworks-net
Bug: 69390696
Change-Id: I83f01e4915092e08ed201d9b6738bb02498d3bba
2017-12-05 13:14:08 +09:00
Andreas Gampe
d52c7c9206 Merge "Frameworks: Silently ignore InterruptedException" am: 7e717e09cd
am: a6c6c4f5d3

Change-Id: I737474738fa688d5bc651390409cbd792ffa7282
2017-12-05 02:43:53 +00:00
nharold
7a8f0dc0c0 Merge "Validate IpSecAlgorithm Length" am: 68b81299d2
am: 5e3d66e78b

Change-Id: I1ffaa4de392777c5199a411aef9cd10f4e7c3666
2017-12-05 02:37:14 +00:00
Andreas Gampe
a6c6c4f5d3 Merge "Frameworks: Silently ignore InterruptedException"
am: 7e717e09cd

Change-Id: I75da071918e7fc2e547df4e4d75121806c730ca2
2017-12-05 02:34:41 +00:00
nharold
5e3d66e78b Merge "Validate IpSecAlgorithm Length"
am: 68b81299d2

Change-Id: I23f7612c119e67f9a1647568aeefde38a365f8da
2017-12-05 02:28:10 +00:00
Treehugger Robot
7e717e09cd Merge "Frameworks: Silently ignore InterruptedException" 2017-12-05 02:25:14 +00:00
nharold
68b81299d2 Merge "Validate IpSecAlgorithm Length" 2017-12-05 02:13:55 +00:00
Colin Cross
3dbbd3d3a9 Merge "Remove unused AIDL files" am: d0abc863f4
am: 43f665c95e

Change-Id: I3d966c647103c45f8a078adcb4260c08174cf61c
2017-12-05 00:34:32 +00:00
Colin Cross
43f665c95e Merge "Remove unused AIDL files"
am: d0abc863f4

Change-Id: Ia6d798f6acf3930945cac488db81ccec3792648d
2017-12-05 00:06:29 +00:00
Hugo Benichi
13b2fa0f85 Merge "MacAddress: light refactors and improve documentation" am: d871cab32d
am: 2f7cb5752b

Change-Id: I1e9948225e7c5ad64fad2e596d03deb3524c411c
2017-12-04 23:51:41 +00:00
Hugo Benichi
2f7cb5752b Merge "MacAddress: light refactors and improve documentation"
am: d871cab32d

Change-Id: I51bb8786ecd7f53e3342625c7a2625007eedfc0f
2017-12-04 23:38:27 +00:00
Treehugger Robot
d0abc863f4 Merge "Remove unused AIDL files" 2017-12-04 23:35:35 +00:00
Nathan Harold
3349b26630 Validate IpSecAlgorithm Length
Improve the Validation of IpSecAlgorithm by
explicitly checking the length in addition to
the truncation length (previously an oversight).
In addition, we now check the lengths during
un-parceling, which will catch someone maliciously
manually building a parcel and passing it, bypassing
the checks in the constructor.

Bug: 68780091
Test: runtest -x IpSecAlgorithmTest.java
Change-Id: I8172762617264d34f47d5144336464510f07a701
2017-12-04 15:12:14 -08:00
Treehugger Robot
d871cab32d Merge "MacAddress: light refactors and improve documentation" 2017-12-04 23:01:11 +00:00
Andreas Gampe
c8d5fc8572 Frameworks: Silently ignore InterruptedException
Apps seem to rely on this undocumented behavior so that the
threaded sync adapter doesn't crash an app. That's really
bad on the app side, but we will have to live with it.

Bug: 67986472
Bug: 70122540
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I1ee4dfba4ad29c4f66fa60d3c8f8a99900b3447a
2017-12-04 15:00:24 -08:00
Ying Xu
a9494954d9 Merge "Convert ICarrierService to oneway." 2017-12-04 22:11:36 +00:00
Colin Cross
4e1b9c199d Remove unused AIDL files
These files show up in a glob for all AIDL files, but are not listed
in AIDL files to be built, and have no references in codesearch
except for one unused import.

Bug: 70046217
Test: m checkbuild
Change-Id: I7d6a3bb19d2e16b5f09473f3058afcf5b4edd9b6
2017-12-04 11:14:25 -08:00
Jonathan Basseri
e05afb03c8 Convert ICarrierService to oneway.
Change the carrier config AIDL used by CarrierService to a oneway call.
This is the IPC used to fetch carrier config bundles from carrier apps.
Converting to oneway allows CarrierConfigLoader to be non-blocking while
it fetches config.

Bug: 63176442
Test: runtest carrierconfig-unit & manual
(cherry picked from commit 49b54d64ca)
Merged-in: Iceaf0446321f719011f67897398da7d5998c5fc7
Change-Id: I436f6c920f68f8bbc0fd66a5ff10676ed1529383
2017-12-04 17:56:33 +00:00
Hansong Zhang
4cbf548dcc Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)
Bug: 69981563
Test: HID Device SL4A Test
Change-Id: Ifb7002bb4f3f6f29b01a3d337ab68b674d6947c9
2017-12-04 09:49:45 -08:00
Neil Fuller
3ee89770bf Fix doc typo. Improve class javadoc...
Fix doc typo (value -> valid). Improve class javadoc,
fix lint error in import ordering.

Test: Build
Change-Id: I8899b1f568e052a3d152e6c36fca4d6bbf9584f2
2017-12-04 15:19:28 +00:00