Etan Cohen
756216fdf9
Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43
...
am: b50d958c4a
2017-03-01 17:49:32 +00:00
Etan Cohen
b50d958c4a
Merge "[AWARE] Add data-path security configuration (PMK)"
...
am: eff6f4fc43
2017-03-01 17:45:42 +00:00
Etan Cohen
eff6f4fc43
Merge "[AWARE] Add data-path security configuration (PMK)"
2017-03-01 17:39:15 +00:00
Tyler Gunn
63700b7a8f
resolve merge conflicts of 81a28efd1b to stage-aosp-master
...
am: b455f0deed
2017-03-01 16:51:27 +00:00
Tyler Gunn
b455f0deed
resolve merge conflicts of 81a28efd1b to stage-aosp-master
...
Change-Id: Ic4c1ca055db8e70db49d9fc91dfc705da6136a5d
2017-03-01 08:44:32 -08:00
Tyler Gunn
81a28efd1b
Merge "Support confirmation of international calls while on WFC only."
2017-03-01 16:08:40 +00:00
Etan Cohen
954111a252
[AWARE] Add data-path security configuration (PMK)
...
Add API to optionally provide a pairwise master key (PMK)
to configure security on a data-path.
Clarify the default API to mean open (unencrypted) data-path.
Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: I43fe704547f2921b3207f215e42d253837aa04e9
2017-03-01 07:35:35 -08:00
Nathan Harold
3ddaf3e6b0
Merge "Add API Surface for creating IpSec Transforms" am: 7645fa2816
...
am: 0a6305d5dd
2017-03-01 14:17:46 +00:00
Nathan Harold
0a6305d5dd
Merge "Add API Surface for creating IpSec Transforms"
...
am: 7645fa2816
2017-03-01 14:12:55 +00:00
Treehugger Robot
7645fa2816
Merge "Add API Surface for creating IpSec Transforms"
2017-03-01 14:05:48 +00:00
Erik Kline
83385ed04a
Merge "Fix dead lock in Tethering state machine" am: 355dbae680
...
am: 0703f03953
2017-03-01 11:50:41 +00:00
Erik Kline
0703f03953
Merge "Fix dead lock in Tethering state machine"
...
am: 355dbae680
2017-03-01 11:46:10 +00:00
Erik Kline
355dbae680
Merge "Fix dead lock in Tethering state machine"
2017-03-01 11:40:03 +00:00
Erik Kline
02310829cf
Merge "Also test for additional NetworkCallback calls" am: dff6c5c30d
...
am: 47d8385184
2017-03-01 11:08:06 +00:00
Erik Kline
47d8385184
Merge "Also test for additional NetworkCallback calls"
...
am: dff6c5c30d
2017-03-01 11:03:08 +00:00
Treehugger Robot
dff6c5c30d
Merge "Also test for additional NetworkCallback calls"
2017-03-01 10:55:35 +00:00
Erik Kline
1d3db32708
Also test for additional NetworkCallback calls
...
Specifcally:
- onCapabilitiesChanged
- onLinkPropertiesChanged
- onNetworkSuspended
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug: 32163131
Change-Id: Ie0f7c8ac21313b11980bb335c89ecde6fd8e311c
2017-03-01 18:24:36 +09:00
Nathan Harold
330e1089da
Add API Surface for creating IpSec Transforms
...
This CL adds an API to set up an IPSec Security Association
and Security Policy to perform Transport-Mode and Tunnel-Mode encapuslation
of IP Packets.
Bug: 30984788
Bug: 34811752
Test: 34812052, 34811227
Change-Id: Ic9f63c7bb366302a24baa3e1b79020210910ac0a
2017-02-28 22:01:20 -08:00
George Burgess IV
0d0ccb0c19
Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad
...
am: 43fd84a03c
2017-03-01 01:58:36 +00:00
George Burgess IV
43fd84a03c
Merge "Fix memory-leak warnings from the static analyzer"
...
am: 2006bfc9ad
2017-03-01 01:53:27 +00:00
Treehugger Robot
2006bfc9ad
Merge "Fix memory-leak warnings from the static analyzer"
2017-03-01 01:45:52 +00:00
Hall Liu
f000639f82
Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377
...
am: c284379659
2017-03-01 01:05:58 +00:00
Hall Liu
c284379659
Merge "Add @hide to RttAudioMode IntDef"
...
am: 22af0f3377
2017-03-01 01:01:29 +00:00
Hall Liu
22af0f3377
Merge "Add @hide to RttAudioMode IntDef"
2017-03-01 00:51:38 +00:00
George Burgess IV
18f307aed3
Fix memory-leak warnings from the static analyzer
...
Warnings:
frameworks/base/core/jni/android_view_InputChannel.cpp:145:5: warning:
Potential memory leak
jobject serverChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~
frameworks/base/core/jni/android_view_InputChannel.cpp:151:5: warning:
Potential memory leak
jobject clientChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~
The warnings were complaining about that we might leak
nativeInputChannel, in android_view_InputChannel_createInputChannel,
since we're allocating it as an arg and not always putting it somewhere.
Bug: None
Test: Builds without warnings
Change-Id: I62163adee5d420ad78c8d4c74aafefc8a58f765b
2017-03-01 00:08:04 +00:00
Hall Liu
07094df24a
Add @hide to RttAudioMode IntDef
...
IntDefs apparently require an @hide annotation to avoid breaking CTS
tests. Adding it here.
Change-Id: Ifd748b55e68091132571df7e74fdb797bd6a83fc
Test: CTS
Fix: 35808951
2017-02-28 15:18:31 -08:00
Brad Ebinger
81f7d06a5e
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am: b987777f20
...
am: 59282ad8df
2017-02-28 22:55:55 +00:00
Brad Ebinger
59282ad8df
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
...
am: b987777f20
2017-02-28 22:50:38 +00:00
Brad Ebinger
b987777f20
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
2017-02-28 22:44:56 +00:00
Tyler Gunn
ef5a401b7e
Support confirmation of international calls while on WFC only.
...
Add new carrier config which enables a confirmation message when the user
dials an international number while on WFC only.
Add new @hide PhoneNumberUtils method which is used to determine if a
number dialed is an international number.
Test: Manual, unit.
Bug: 33272455
Merged-In: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
Change-Id: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
2017-02-28 13:08:22 -08:00
Andre Eisenbach
5c44929f79
Merge "Bluetooth: fix enable log: display 24h time" am: 17cb857301
...
am: add7c533c6
2017-02-28 19:29:07 +00:00
Andre Eisenbach
add7c533c6
Merge "Bluetooth: fix enable log: display 24h time"
...
am: 17cb857301
2017-02-28 19:14:58 +00:00
Andre Eisenbach
17cb857301
Merge "Bluetooth: fix enable log: display 24h time"
2017-02-28 19:04:13 +00:00
Marie Janssen
6837ead33d
Bluetooth: fix enable log: display 24h time
...
Test: adb bugreport at 1pm, observe 13:xx:yy instead of 01:xx:yy
Change-Id: I172dcc63f0f43563ec692349a9434f63c55eac25
2017-02-28 19:02:21 +00:00
Brad Ebinger
e0a7345c6a
Send the IMS_SERVICE_UP intent when it is STATE_READY
...
The ImsService must send the IMS_SERVICE_UP intent when it
signals that it is in the STATE_READY state and
IMS_SERVICE_DOWN when it is STATE_INITIALIZING or
STATE_NOT_AVAILABLE.
Also, add READ_PRIVILEGED_PHONE_STATE check
Bug: 35736451
Test: Unit tests added in frameworks/opt/telephony
Change-Id: I03d4398cf7008cf8c51b78d99eb029aa99c63f62
2017-02-28 10:56:14 -08:00
Amin Shaikh
a9bace4f2c
Merge "Setting for RecommendedNetworkEvaluator cache TTL" am: 924878a752
...
am: 8bd0af0210
2017-02-28 17:16:35 +00:00
Amin Shaikh
8bd0af0210
Merge "Setting for RecommendedNetworkEvaluator cache TTL"
...
am: 924878a752
2017-02-28 17:11:35 +00:00
Treehugger Robot
924878a752
Merge "Setting for RecommendedNetworkEvaluator cache TTL"
2017-02-28 17:05:45 +00:00
Paul Lawrence
310c26ee6d
Merge "Move seccomp policy logic to bionic" am: ef64558393
...
am: da6d5f702d
2017-02-28 15:47:48 +00:00
Paul Lawrence
da6d5f702d
Merge "Move seccomp policy logic to bionic"
...
am: ef64558393
2017-02-28 15:41:57 +00:00
Treehugger Robot
ef64558393
Merge "Move seccomp policy logic to bionic"
2017-02-28 15:36:08 +00:00
Amin Shaikh
21496f6ee1
Setting for RecommendedNetworkEvaluator cache TTL
...
Bug: 19948759
Bug: 33694078
Test: runtest frameworks-core
Change-Id: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
Merged-In: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
2017-02-27 21:49:05 -08:00
Brad Ebinger
055adc457a
Merge "Adds read/modify permission checks to ImsService" am: 3e64003641
...
am: 175213e1ee
2017-02-27 21:30:19 +00:00
Brad Ebinger
175213e1ee
Merge "Adds read/modify permission checks to ImsService"
...
am: 3e64003641
2017-02-27 21:26:50 +00:00
Brad Ebinger
3e64003641
Merge "Adds read/modify permission checks to ImsService"
2017-02-27 21:19:18 +00:00
Julius D'souza
5792d09b3d
DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on. am: 106f1443c1 -s ours
...
am: 8beca4cc6f
2017-02-27 19:18:11 +00:00
Julius D'souza
8beca4cc6f
DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on.
...
am: 106f1443c1
2017-02-27 19:14:07 +00:00
Etan Cohen
07864e35c8
Merge "[AWARE] Remove (hide) sendMessage with retryCount API" am: f81911bcd2
...
am: 97bf0f5e9b
2017-02-27 18:46:11 +00:00
Etan Cohen
97bf0f5e9b
Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
...
am: f81911bcd2
2017-02-27 18:42:05 +00:00
Etan Cohen
f81911bcd2
Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
2017-02-27 18:33:35 +00:00
