309042 Commits

Author SHA1 Message Date
Diego Perez
06a7ff3557 Add perf tests to Main
Test: N/A
Change-Id: I907ebdc28043e3ac92bae6b6a19451c2ca24423f
2017-03-01 16:06:59 +00:00
Nathan Harold
9ac082f8bb Merge "Add API Surface for creating IpSec Transforms" am: 7645fa2816 am: 0a6305d5dd
am: 3ddaf3e6b0

Change-Id: Idceae0e5a1af2f357378b03fc0d257dab605b217
2017-03-01 14:22:57 +00:00
Nathan Harold
3ddaf3e6b0 Merge "Add API Surface for creating IpSec Transforms" am: 7645fa2816
am: 0a6305d5dd

Change-Id: Ie1798e4d7dda91a970db40e078016fcbcf89149f
2017-03-01 14:17:46 +00: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
Erik Kline
23e6ad0eda Merge "Fix dead lock in Tethering state machine" am: 355dbae680 am: 0703f03953
am: 83385ed04a

Change-Id: I7d0974d5ec4e3cab1581e1cce0e01eeb6bf7448a
2017-03-01 11:55:44 +00:00
Erik Kline
83385ed04a Merge "Fix dead lock in Tethering state machine" am: 355dbae680
am: 0703f03953

Change-Id: I233d796cf67a71ebc43970f949930de46a0ddb3f
2017-03-01 11:50:41 +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
df71c58341 Merge "Also test for additional NetworkCallback calls" am: dff6c5c30d am: 47d8385184
am: 02310829cf

Change-Id: I0264a471312423e896a1c2f479c0eeda737a1567
2017-03-01 11:13:14 +00:00
Erik Kline
02310829cf Merge "Also test for additional NetworkCallback calls" am: dff6c5c30d
am: 47d8385184

Change-Id: I19ff91b1397abe20920bbae8aa6c976c6bcac0ba
2017-03-01 11:08:06 +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
TreeHugger Robot
5f9ba4e68e Merge "More accurate cascading submenu position" 2017-03-01 09:45:31 +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
TreeHugger Robot
983552d03e Merge "Move some static methods from NPMS to NPM class." 2017-03-01 08:38:46 +00:00
TreeHugger Robot
4825116c10 Merge "Fix default value for mUidState.get." 2017-03-01 06:38:14 +00:00
TreeHugger Robot
52473267a7 Merge "AudioService: fix volume shaper release" 2017-03-01 06:19:19 +00: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
TreeHugger Robot
eaff891f01 Merge "set bounds" 2017-03-01 02:24:33 +00:00
George Burgess IV
e556f11be4 Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad am: 43fd84a03c
am: 0d0ccb0c19

Change-Id: I0abbba291721af2b66735dcbd33bbc406767536c
2017-03-01 02:02:40 +00:00
George Burgess IV
0d0ccb0c19 Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad
am: 43fd84a03c

Change-Id: Id2b577a021a3163d9f489235bf7f76c5f5ae527e
2017-03-01 01:58:36 +00: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
1b4cdf909f Merge "Add boolean when instant apps are available" 2017-03-01 01:49:07 +00:00
Treehugger Robot
2006bfc9ad Merge "Fix memory-leak warnings from the static analyzer" 2017-03-01 01:45:52 +00:00
Android Build Merger (Role)
df228e3128 Merge "Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377 am: c284379659 am: f000639f82" 2017-03-01 01:11:54 +00:00
Hall Liu
91300fba36 Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377 am: c284379659
am: f000639f82

Change-Id: Ibcb239e0aa3499386f6f71026084276b07554cdb
2017-03-01 01:11:04 +00:00
TreeHugger Robot
247a3c0132 Merge "Introduce ANSWER_PHONE_CALLS permission" 2017-03-01 01:10:20 +00:00
Hall Liu
f000639f82 Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377
am: c284379659

Change-Id: I892dd9f7c070aade5962b53277a860a55ed237ea
2017-03-01 01:05:58 +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
Todd Kennedy
32e075de37 Merge "fix typo" 2017-03-01 00:25:04 +00:00
Todd Kennedy
bcdaf9208c fix typo
Fixes: 35840741
Test: None; it's a javadoc fix
Change-Id: Ic59fe12351c24630d7ba18ffaafeef8035be35f5
2017-02-28 16:21:03 -08: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
Sunny Goyal
e19e5677a5 Merge "Sending explicit broadcast to the launcher when a package is installed" 2017-02-28 23:58:38 +00:00
TreeHugger Robot
7bf167cc58 Merge "Remove drawer code from settings" 2017-02-28 23:38:45 +00:00
Todd Kennedy
533c9ff58d Add boolean when instant apps are available
Bug: 34168547
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: Ic1072d02aa4d43947e689e4381c2c5ee43704dd0
2017-02-28 15:34:26 -08:00
TreeHugger Robot
1e731c5316 Merge "Check hwbinder status before checking the returned result" 2017-02-28 23:23:12 +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
TreeHugger Robot
fe25c7ea57 Merge "TIF: add WatchNextPrograms in TvContracts" 2017-02-28 23:14:57 +00:00
Todd Kennedy
03f336b1fa set bounds
temporary workaround to prevent ephemeral app uninstallation from
crashing the system server.

Bug: 35673160
Test: manually uninstall ephemeral app and see the framework doesn't crash
Change-Id: I6542206b51a00ca4321de4310a59620569b1516a
2017-02-28 15:11:52 -08:00
Jean-Michel Trivi
0b30c5a64a AudioService: fix volume shaper release
Catch exception when applying a volume shaper to cancel any remaining
  volume shaper for release

Test: see bug
Bug: 35842573
Change-Id: Ic724a43fad6df599540369c095498c8adb2c73a8
2017-02-28 15:11:25 -08:00
Brad Ebinger
5463895805 Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am: b987777f20 am: 59282ad8df
am: 81f7d06a5e

Change-Id: I006cb9e34093cfccbfb036c82c95adc91d8cc28e
2017-02-28 23:00:28 +00:00
Brad Ebinger
81f7d06a5e Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am: b987777f20
am: 59282ad8df

Change-Id: I9637f55a80f89afa89111b5889b69987aba3e20a
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

Change-Id: I6c33449b917b6d0c2a3396eea40065c2b0bc6862
2017-02-28 22:50:38 +00:00
TreeHugger Robot
a140c067c2 Merge "Cleanup else blocks on security checks." 2017-02-28 22:50:00 +00:00
TreeHugger Robot
e89454ed84 Merge "Move SystemPerfTest out of java.* namespace" 2017-02-28 22:49:17 +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
Aurimas Liutikas
1ca63ec5fb Merge "Do not send onTimeChanged updates if nothing actually changed." 2017-02-28 22:35:58 +00:00
TreeHugger Robot
30a50a02f0 Merge "BatteryManager: rename BATTERY_PROPERTY_BATTERY_STATUS" 2017-02-28 22:33:47 +00:00