Nathan Harold
949d1353e9
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am: d118826971 am: 6d3c10495e
...
am: 81d48a99e0
2017-03-30 03:48:20 +00:00
Nathan Harold
81d48a99e0
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am: d118826971
...
am: 6d3c10495e
2017-03-30 03:44:12 +00:00
Nathan Harold
6d3c10495e
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
...
am: d118826971
2017-03-30 03:39:46 +00:00
Jakub Pawlowski
f96f05b108
Merge "Hide periodic scanning" am: ca7544ea15 am: c06722e788
...
am: c809a5b12b
2017-03-30 03:35:53 +00:00
Treehugger Robot
d118826971
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
2017-03-30 03:33:13 +00:00
Jakub Pawlowski
c809a5b12b
Merge "Hide periodic scanning" am: ca7544ea15
...
am: c06722e788
2017-03-30 03:30:42 +00:00
Jakub Pawlowski
c06722e788
Merge "Hide periodic scanning"
...
am: ca7544ea15
2017-03-30 03:26:18 +00:00
Ta-wei Yen
904e1856a7
Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev
...
am: dfbc8517ee
2017-03-30 01:58:40 +00:00
TreeHugger Robot
dfbc8517ee
Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev
2017-03-30 01:51:56 +00:00
George Mount
b81f36bb72
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
...
am: ce3cf36652
2017-03-30 01:37:30 +00:00
TreeHugger Robot
ce3cf36652
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
2017-03-30 01:26:13 +00:00
TreeHugger Robot
4e7bc119ae
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
2017-03-30 01:17:23 +00:00
Evan Rosky
f99eb172ae
Merge "Expose initial focus feature flag for testing" into oc-dev
...
am: 7ac3fb2282
2017-03-30 01:10:25 +00:00
Evan Rosky
7ac3fb2282
Merge "Expose initial focus feature flag for testing" into oc-dev
2017-03-30 01:02:28 +00:00
Nathan Harold
c4f879925b
Change reserveSecurityParameterIndex() to take a remoteAddress
...
To make the SPI reservation more semantically consistent with the
transform creation API, and to ensure that we always create SPI
reservations relative to a well-known remote, we should take the
SPI request relative to a remote (rather than to a destination).
This necessitates that we now consider direction separately, which
is used for keying the SA-Id.
Bug: 36073210
Test: compilation
Change-Id: I81e955c20128c1f8e04fd68eb26669561f827a78
2017-03-29 17:46:47 -07:00
Evan Rosky
85aa3e82c7
Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev
...
am: 37af93ad1c
2017-03-30 00:29:48 +00:00
Evan Rosky
37af93ad1c
Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev
2017-03-30 00:22:40 +00:00
Jakub Pawlowski
63fad69a19
Hide periodic scanning
...
Bug: 30622771
Test: manual
Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c
2017-03-29 17:11:59 -07:00
Nathan Harold
560c9ec724
Merge commit 'e45e328821ba' into oc-dev-plus-aosp
...
Change-Id: I30ad9038be8faee57e5d6b1391d9e70a966a9a77
2017-03-29 17:05:10 -07:00
Nathan Harold
e45e328821
Merge commit 'ce073d70bedc' into stage-aosp-master
...
am: 4fdc7d5ddd
2017-03-29 23:56:06 +00:00
Chad Brubaker
ba18f8674e
Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev
...
am: 84eecd2532
2017-03-29 23:33:48 +00:00
Makoto Onuki
d76076a103
Merge "Mention <intent> can't have string resources." into oc-dev
...
am: 6c3e92bbe9
2017-03-29 23:32:54 +00:00
TreeHugger Robot
84eecd2532
Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev
2017-03-29 23:25:57 +00:00
TreeHugger Robot
6c3e92bbe9
Merge "Mention <intent> can't have string resources." into oc-dev
2017-03-29 23:24:42 +00:00
Nathan Harold
4fdc7d5ddd
Merge commit 'ce073d70bedc' into stage-aosp-master
...
Change-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b
2017-03-29 16:04:31 -07:00
Pavlin Radoslavov
011597b5a9
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
...
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).
Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug: 35873828
Change-Id: Ia82036ac33590a3a402b1f5a36102264d47a9029
(cherry picked from commit 61075105ca
2017-03-29 15:58:25 -07:00
Pavlin Radoslavov
3713929862
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: 3c7fce3579 am: 25105f6561
...
am: dfc1264eff
2017-03-29 22:57:22 +00:00
Pavlin Radoslavov
dfc1264eff
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: 3c7fce3579
...
am: 25105f6561
2017-03-29 22:51:41 +00:00
Treehugger Robot
ce073d70be
Merge "Add a Skeleton IpSecService"
2017-03-29 22:50:50 +00:00
Pavlin Radoslavov
25105f6561
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
...
am: 3c7fce3579
2017-03-29 22:47:28 +00:00
Treehugger Robot
3c7fce3579
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
2017-03-29 22:41:15 +00:00
TreeHugger Robot
ee40a2652c
Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev
2017-03-29 22:20:33 +00:00
Evan Rosky
18b886e8b2
Allow cluster navigation to jump into touchscreenBlocksFocus
...
Adds an exception to touchscreenBlocksFocus ViewGroups which
are also keyboardNavigationClusters. The behavior we want is
that cluster navigation can jump into touchscreenBlocksFocus
clusters but normal keyboard navigation can't. Once focus is
in a touchscreenBlocksFocus cluster; however, we allow focus
navigation to move freely within that cluster. It remains in
that cluster until a subsequent cluster navigation brings it
back out.
Adds back the touchscreenBlocksFocus attributes to Toolbar
and actionbar so that they behave like they did before.
Bug: 34363323
Test: Added CTS test. Verified desired behavior in a test app
Change-Id: I555bf5570b16a57f0d4c8a020ae509a1e1b33910
(cherry picked from commit aee802f3bc
2017-03-29 22:18:56 +00:00
Evan Rosky
01f46a29ce
Expose initial focus feature flag for testing
...
Bug: 34520588
Test: View_FocusHandlingTest
Change-Id: I7a20a6e9c57fc61bd2562307f4e7f8dee1979a40
(cherry picked from commit 9a0ea38671
2017-03-29 22:11:34 +00:00
George Mount
c7146beabe
Make public getFragments() and onGetLayoutInflater() methods
...
Bug 34703669
Test: I846ef668e3dd7d664cfb56d2b9400467ba9b79f4
Change-Id: Ie202960ada86b25e964f98a639b5f5740c8fdb79
2017-03-29 14:58:42 -07:00
Makoto Onuki
03169cddf6
Mention <intent> can't have string resources.
...
Test: build
Bug 34046756
Change-Id: I761b246d6aba5df4a836af3d0b3bef8f977be5ec
2017-03-29 21:07:15 +00:00
Yifan Hong
d658f1c02b
Add HidlSupport.java for utility methods for HIDL.
...
The old .equals code uses Objects.deepEquals,
which does not handle for, e.g. ArrayList<byte[]>.
Create our own recursive HidlSupport.deepEquals
and deepHashCode method to handle these edge cases.
Bug: 36454147
Test: hidl_test_java
Change-Id: I56dc48985486b561263c260cf43aa90f30d581d0
2017-03-29 13:07:15 -07:00
Abodunrinwa Toki
17710aeafa
Merge "TextClassifier: Switch model based on locale" into oc-dev
...
am: dd83c2006b
2017-03-29 19:23:26 +00:00
TreeHugger Robot
dd83c2006b
Merge "TextClassifier: Switch model based on locale" into oc-dev
2017-03-29 19:17:36 +00:00
Seigo Nonaka
e94849497c
Merge "Do not use many FDs in FontManagerService." into oc-dev
...
am: 5301d9e6d3
2017-03-29 19:16:02 +00:00
TreeHugger Robot
5301d9e6d3
Merge "Do not use many FDs in FontManagerService." into oc-dev
2017-03-29 19:11:41 +00:00
Tima Vaisburd
976164b533
Merge "TextClassifier: add API to WebView" into oc-dev
...
am: e4776416d4
2017-03-29 18:55:54 +00:00
Tima Vaisburd
e4776416d4
Merge "TextClassifier: add API to WebView" into oc-dev
2017-03-29 18:50:07 +00:00
Android Build Merger (Role)
b676a1b8fa
Merge "Merge "Bluetooth: fix comment wording" am: 6ba7c54a51 am: eeedda1453 am: ba2222aabb" into oc-dev-plus-aosp
2017-03-29 18:40:38 +00:00
Jakub Pawlowski
a6478d3a59
Merge "Bluetooth: fix comment wording" am: 6ba7c54a51 am: eeedda1453
...
am: ba2222aabb
2017-03-29 18:39:44 +00:00
Philip P. Moltmann
a81040a335
Merge "Fix bad Java docs in View.java" into oc-dev
...
am: 94696c5ac5
2017-03-29 18:39:32 +00:00
Jakub Pawlowski
ba2222aabb
Merge "Bluetooth: fix comment wording" am: 6ba7c54a51
...
am: eeedda1453
2017-03-29 18:34:40 +00:00
Tianjie Xu
d580a85b20
Merge "Report the temperature during an OTA update" am: 47c7e7f41a am: 022682a721
...
am: 998c554463
2017-03-29 18:34:14 +00:00
TreeHugger Robot
94696c5ac5
Merge "Fix bad Java docs in View.java" into oc-dev
2017-03-29 18:33:11 +00:00
Nathan Harold
1afbef40c6
Add a Skeleton IpSecService
...
-Add IpSecService with the necessary glue to connect to netd
-Add code to retrieve IpSecService from System Server
Bug: 34811227
Test: Service boots (and dumpsys works), more via b/34811227
Merged-In: I4cdcb643421141202f77a0e2f87a37012de0cd92
Change-Id: I4cdcb643421141202f77a0e2f87a37012de0cd92
2017-03-29 11:31:27 -07:00
