283916 Commits

Author SHA1 Message Date
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
0a6305d5dd Merge "Add API Surface for creating IpSec Transforms"
am: 7645fa2816

Change-Id: Ibe70a60c5c5808a7877145cccefcc1f11bfacc51
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
Tobias Thierer
8bacd9bd02 Move value for the Build.CUR_DEVELOPMENT constant into libcore
This matches a corresponding libcore change. It is to allow
libcore to use this value as a default when no other value is
explicitly set, e.g. in the system server or during testing
with vogar.

Bug: 34072201
Test: Device boots with CLs from this CL's topic.
Change-Id: Id812339a343ecea84a08bfdf4b873f3b156a13d4
2017-03-01 12:44:01 +00:00
Erik Kline
0703f03953 Merge "Fix dead lock in Tethering state machine"
am: 355dbae680

Change-Id: Idd08726f3eeebba49a9ad909464377af67600d30
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
47d8385184 Merge "Also test for additional NetworkCallback calls"
am: dff6c5c30d

Change-Id: I00b3f7be06bde167872d0cdefe940cda5e138846
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
Yifan Hong
2cbce4ad87 getTransport checks interface and instance names.
Bug: 35219444
Test: hidl_test
Test: camera, soundtrigger works on marlin
Test: video playback works on marlin
Change-Id: I4d714d2576588cbd9a30d9687e992d34ee0db6d4
2017-02-28 20:35:50 -08:00
George Burgess IV
43fd84a03c Merge "Fix memory-leak warnings from the static analyzer"
am: 2006bfc9ad

Change-Id: I2efd6e42c72d3163505a23e8a95e45526a5ef642
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
c284379659 Merge "Add @hide to RttAudioMode IntDef"
am: 22af0f3377

Change-Id: Ifdfdf7ced2f88188314475c99dd58cdf886f014d
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
Elliott Hughes
e3ce3e8bab Basic javadoc for android.os.UpdateEngine.
Bug: N/A
Test: N/A
Change-Id: Icb870e7720e8b50082d353e7ea08007e1f4e2fdc
2017-02-28 15:19:32 -08: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
59282ad8df Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
am: b987777f20

Change-Id: I6c33449b917b6d0c2a3396eea40065c2b0bc6862
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
Tom Cherry
298a146754 Check for spurious wake ups
Condition::wait() can spuriously wake up, so we must guard it with
another check to ensure that a given wake was truly due to having
been signaled.

Bug: 34592766
Test: Boot bullhead
Change-Id: Iaa5a0ca6186aea50c51e2c402ef95d7ba861be92
2017-02-28 14:19:44 -08: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
add7c533c6 Merge "Bluetooth: fix enable log: display 24h time"
am: 17cb857301

Change-Id: Ic9ba7b27e9ad997a6f8ba0ae6e4794903ef7806a
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
8bd0af0210 Merge "Setting for RecommendedNetworkEvaluator cache TTL"
am: 924878a752

Change-Id: I945898d88baa26f210cd0d86cdf064844af6f92e
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
da6d5f702d Merge "Move seccomp policy logic to bionic"
am: ef64558393

Change-Id: I9c9e6c9cc1f8b1617a0c7e627b94d0d643f22a3e
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
Nathan Harold
6a7c9333b9 Provide a public API for TelephonyManager.getForbiddenPlmns()
Bug: 33296073
Test: none
Change-Id: I4f1bce663669c18098755c386456e6e9687a3cfb
2017-02-27 16:34:40 -08:00
Nathan Harold
f56cd70734 Add support for querying Forbidden PLMNs
Bug: 32277497
Test: Verified via public API for: missing SIM and working SIM
Change-Id: Ib7838a4be81853ef336e4f3d527c483b49cd2167
2017-02-27 16:01:57 -08:00
Brad Ebinger
175213e1ee Merge "Adds read/modify permission checks to ImsService"
am: 3e64003641

Change-Id: Ia4cb2c789a13658de86c0a36648a09e7abceb621
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
Etan Cohen
97bf0f5e9b Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
am: f81911bcd2

Change-Id: I3791ee5fbd0c16de6156b0ad36e50091eea498f9
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
Paul Lawrence
08b93c1e97 Move seccomp policy logic to bionic
Test: Make sure builds, runs, seccomp policy still applied
Bug: 35720753
Change-Id: Ieb09dd88cf070d4b4f1277d1a88d0ce250bb05b4
2017-02-27 09:35:18 -08:00
Paul Lawrence
a853184575 Merge "Revert "Move seccomp policy logic to bionic""
am: 4ebce43b37

Change-Id: I276412507fcb3ef577931e7406964fd7040615c7
2017-02-27 16:47:12 +00:00
Paul Lawrence
4ebce43b37 Merge "Revert "Move seccomp policy logic to bionic"" 2017-02-27 16:39:12 +00:00
Paul Lawrence
be0d6a6890 Revert "Move seccomp policy logic to bionic"
This reverts commit 48c30ef529543c9bbd1b55f9e05c666b3ffeb7c6.

Reverting build-breaking change

Change-Id: Iad6270e51cb1ead0efbd52c2dfcc6d2118931e4e
2017-02-27 16:35:53 +00:00
Paul Lawrence
d97791e74f Merge "Move seccomp policy logic to bionic"
am: 7ed4ca9032

Change-Id: I744d6c4545edd9d221deb79bbbeea83d459e3161
2017-02-27 16:15:38 +00:00
Paul Lawrence
7ed4ca9032 Merge "Move seccomp policy logic to bionic" 2017-02-27 16:09:39 +00:00
Tyler Gunn
2f96f34373 Merge "Fix videoStateToString for audio/paused state."
am: 89e7a888be

Change-Id: I04fe4d5b61c548f3b5f012af343c4e08334933e0
2017-02-27 03:01:08 +00:00
Tyler Gunn
89e7a888be Merge "Fix videoStateToString for audio/paused state." 2017-02-27 02:55:25 +00:00
Tyler Gunn
8ac499fbe6 Merge "Format Japanese numbers using national format when in Japan."
am: 050e5ddb4f

Change-Id: I996a79c2b3158e1fd6999330e0b0b21f8e4c8b4b
2017-02-27 02:54:49 +00:00
Tyler Gunn
050e5ddb4f Merge "Format Japanese numbers using national format when in Japan." 2017-02-27 02:48:11 +00:00
Jack Yu
82c46d11f6 resolve merge conflicts of e091985bb5b5 to stage-aosp-master
Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5
2017-02-24 18:47:01 -08:00
Treehugger Robot
e091985bb5 Merge "Added a settings for CMAS message broadcast" 2017-02-25 01:13:29 +00:00