309070 Commits

Author SHA1 Message Date
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
41a0efb3ca Expose isInstantApp() to more callers
Instead of just allowing the instant app itself, also allow anyone
with ACCESS_INSTANT_APP permission or apps that the instant app
has granted access.

Change-Id: I5a79ef9520db908ba9ab56af0157b1646d2d8cc1
Fixes: 34123112
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
2017-02-28 16:34:15 -08: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
TreeHugger Robot
a7aaae881c Merge "Delete ParcelableString, add StringParceledListSlice" 2017-02-28 22:09:06 +00:00
TreeHugger Robot
d92eee2344 Merge "Don't crash if client token is null." 2017-02-28 22:06:19 +00:00
Hassan Shojania
cb9fe89197 Merge "Earlier processing of DrmInfo notification" 2017-02-28 21:22:00 +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
Sunny Goyal
6d7cb23236 Sending explicit broadcast to the launcher when a package is installed
Test: Manually tested on device and add CTS tests
Bug: 32920609
Change-Id: Ic23c077a469fb41d6c4e123d4bc022899f634198
2017-02-28 12:55:59 -08:00
Dongwon Kang
77dde67d64 Merge "TIF: make Channels.COLUMN_BROWSABLE visible" 2017-02-28 20:36:44 +00:00
Aurimas Liutikas
2f16bc8a3a Do not send onTimeChanged updates if nothing actually changed.
Bug: 29314380
Test: android.widget.cts.TimePickerTest#testSetOnTimeChangedListener now passes.
Change-Id: I4df96cd306967027ea76e2c256b50ca687eae9ba
2017-02-28 12:19:30 -08:00
Abodunrinwa Toki
90ebaa8d2d Merge "Don't trigger textclassifier in a11y action." 2017-02-28 20:02:08 +00:00
TreeHugger Robot
c61276c997 Merge "Fix javadocs for layout attributes" 2017-02-28 19:59:19 +00:00
Fan Zhang
f1c1bb49f8 Remove drawer code from settings
Change-Id: I3e9920f62745f6ba2236e37689f7603f9a30d6a9
Fix: 35809663
Test: make RunSettingsLibRoboTests
2017-02-28 11:54:28 -08:00
Edman Anjos
3814d5d021 Merge "Fix is installed check condition in DevicePolicyManagerService" 2017-02-28 19:45:28 +00:00
TreeHugger Robot
e0177dbb8b Merge "Prevent packages besides android defining ephemeral permissions" 2017-02-28 19:39:05 +00:00
TreeHugger Robot
a6b5c94218 Merge "Api review feedback." 2017-02-28 19:38:12 +00:00
Andre Eisenbach
184465db14 Merge "Bluetooth: fix enable log: display 24h time" am: 17cb857301 am: add7c533c6
am: 5c44929f79

Change-Id: If69f2d82f61784b79e6f64d335c70c98b89f6542
2017-02-28 19:33:42 +00:00
Andre Eisenbach
5c44929f79 Merge "Bluetooth: fix enable log: display 24h time" am: 17cb857301
am: add7c533c6

Change-Id: Ib10e76a44ee4ea10294b65ba01d2b028df6afe50
2017-02-28 19:29:07 +00: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
Dongwon Kang
5fecfb37e3 TIF: add WatchNextPrograms in TvContracts
Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 35723325, Bug: 35724854
Change-Id: I3e476c514c73aa90fa20065e10202c2e363d5612
2017-02-28 11:04:10 -08: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
Chris Craik
894b5b9998 Merge "Revert "deprecate replayClips"" 2017-02-28 19:01:11 +00:00
Jin Qian
2e88d4b6fe BatteryManager: rename BATTERY_PROPERTY_BATTERY_STATUS
To BATTERY_PROPERTY_STATUS

Test: build
Bug: 35813122
Change-Id: Ia8308def79b79706dbdc3e47f93afa56661a47aa
2017-02-28 10:58:36 -08: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
Colin Cross
52f6ba9a9d Move SystemPerfTest out of java.* namespace
dx doesn't like classes in the java.* namespace unless it is compiling
a core library.  Move SystemPerfTest to
android.perftests.SystemPerfTest.

Test: builds
Change-Id: I24951d2c9a71d8bb873763d1ccd2f1a67f2be64e
2017-02-28 10:44:04 -08:00
TreeHugger Robot
b70ef8d79b Merge "Support confirmation of international calls while on WFC only." 2017-02-28 18:37:35 +00:00