344633 Commits

Author SHA1 Message Date
Jiyong Park
863f353865 Fix link-type check warning on com.android.nfc_extras
The library has been built without SDK, and is used by an app
NfcExtrasTests that is built with SDK. Such this SDK -> non-SDK
dependency has been causing link-type check warnings, which will turn
into errors soon.

This change fixes the warning by making a stub library
com.android.nfc_extras.stubs from the runtime library and let the app to
link against the stub library. Since the stubs library does not use any
private APIs, it is built with SDK.

Bug: 69899800
Test: m -j NfcExtrasTests is successful and does not show any link-type
check warning.

Merged-In: I57980ccbc9036d7cc6df114a975a384d10a2962b
Change-Id: I57980ccbc9036d7cc6df114a975a384d10a2962b
(cherry picked from commit ded4fd729b50d5298e77199194996d22d3b573cf)
2018-04-27 12:39:45 +09:00
android-build-prod (mdb)
8e386b7132 Merge "Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS" 2018-04-27 01:10:49 +00:00
Mika Raento
ecb0302ae9 Merge "Systrace support for NNAPI" 2018-04-26 17:01:32 +00:00
David Brazdil
eddd165c20 Merge "Generate @removed DEX API signatures" 2018-04-26 12:39:41 +00:00
Mika Raento
6a30ff8326 Systrace support for NNAPI
Change-Id: Ie73d28937eba33e2d90f1447f17fd6d8e5719a65
Bug: 78137932
Test: mm
2018-04-26 09:34:12 +01:00
Erik Kline
6a1707a0e7 Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 64133961
Bug: 77140445
Bug: 78548486

Change-Id: I48c60fd6711dcf5406fba62a3f88aea12183ff87
2018-04-26 13:17:14 +09:00
Erik Kline
ec629e2f43 Merge "Fix CaptivePortalLoginActivity probes to bypass Private DNS" 2018-04-26 04:15:20 +00:00
Erik Kline
848d842a3a Fix CaptivePortalLoginActivity probes to bypass Private DNS
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual testing on captive portal networks
Bug: 64133961
Bug: 77140445
Bug: 78548486

Change-Id: Idbc4d90eeec257b36c5f374d61dea4600a0f8ebb
2018-04-26 11:37:03 +09:00
Shuo Qian
b686b9cf6d Merge "Revert "Revert "Remove the OEM hook implementation and usage""" 2018-04-25 19:31:54 +00:00
Shuo Qian
f09bde2809 Revert "Revert "Remove the OEM hook implementation and usage""
This reverts commit 00b89515a54b7f8d635408994c6384fb80fe2127.

Change-Id: I61c5d47fabf760bfefe843fb7a31f0a481c94c50

Merged-In: Icb06aea5eb42fd156a967c4d4e39aefc51d91cf4
2018-04-25 01:59:53 +00:00
Treehugger Robot
8252157aca Merge "Fixed the document of getNetworkCountryIso" 2018-04-24 23:02:38 +00:00
Tyler Gunn
a355552bfe Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds." 2018-04-24 15:33:29 +00:00
David Brazdil
df41728b85 Generate @removed DEX API signatures
CL I8fe27e8c03334f9c90204db1e69447de65a06a38 adds support to generate
a list of all @removed DEX API signatures. Amend the public API build
rule to produce this file.

Bug: 78182899
Test: make
Change-Id: Iba8869ce6e4f401a8e420ad83ab459d25bbbaae0
2018-04-24 16:27:53 +01:00
Treehugger Robot
238eaf5183 Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" 2018-04-24 03:56:40 +00:00
Treehugger Robot
5faf7291f0 Merge "PackageManager: Skip dexopt on install for debuggable apps" 2018-04-23 22:35:17 +00:00
Jack Yu
78e352f1e2 Fixed the document of getNetworkCountryIso
Test: Build
Bug: 64335394
Change-Id: Ic8fc41380e15a40f9498c990b0074571cdffd018
2018-04-23 13:41:25 -07:00
Anton Hansson
2a4277fb00 Merge "Move frameworks/base off the SRC_API_DIR variable." 2018-04-23 20:16:57 +00:00
Treehugger Robot
361ab2c581 Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" 2018-04-23 20:01:02 +00:00
Hansong Zhang
917f4b332e BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF
Add dumpsys logs for state transition from BLE_ON to OFF. This can be
either from location settings off or airplane mode enabled.

Test: manual
Bug: 74090881
Change-Id: I1f6cfe691b359591af60c3be2e015bec5d3859e8
2018-04-23 11:17:17 -07:00
Andreas Gampe
58adf3a8ee PackageManager: Skip dexopt on install for debuggable apps
To reduce install-to-started latency, skip dexopt at install-time
for debuggable apps. This is a conscious tradeoff, as the app
will run slower, and do repeated work on every startup. However,
for debuggable apps, turnaround time is more important.

Bug: 78200989
Test: m
Test: Device boots
Test: CTS (wrap & JVMTI)
Change-Id: I749934e794b0c89d72ea8ee413b845e7804de184
2018-04-23 10:21:17 -07:00
Tyler Gunn
9bc35116e3 Add ability to log last 2 digits of dialed numbers in userdebug builds.
Filers of bugs often refer to specific phone numbers.  Bug reports by
default obscure dialed phone numbers from the Telecom logs.  This makes it
difficult to relate events in the bug report to what the bug filer refers
to.

To ease this, in userdebug builds we will now leave the last 2 digits of
dialed phone numbers un-obfuscated.  User builds will remain obfuscated.

Test: Added unit tests to cover this case.
Bug: 78457192
Change-Id: I52704cf57ed11b1fa53a55bc883d7d090af661f4
2018-04-23 09:52:25 -07:00
Anton Hansson
e5bf20608a Move frameworks/base off the SRC_API_DIR variable.
This directory is going away. Migrate to the new paths, and replace the
long list of "since" arguments with a loop in the makefile. Also fix the
soong buildfile to use the new path and the 28 prebuilts.

This removes the need to update it every time an API is finalized (in make,
I don't know how to make loops in soong).

Bug: 77525052
Test: Verified variable is the same before & after, except for path change
Change-Id: I1d4e87e7840e979b83779a2aefe176e7c1ed1527
Merged-In: I1d4e87e7840e979b83779a2aefe176e7c1ed1527
2018-04-23 15:46:19 +01:00
Treehugger Robot
fc9bc10d69 Merge "Set country code even when device is not registered on network" 2018-04-23 05:48:18 +00:00
Jack Yu
d33f8a1e91 Set country code even when device is not registered on network
Extends the functionality of getNetworkCountryIso to support
no SIM/no service case. When no SIM/no service, it returns
the country code of nearby network (unregistered but cell info
is available to the device).

Test: Manual
Bug: 64335394
Merged-In: Ia32cbc9df9b9adf5d7c24c8b90be20063a94a514
Change-Id: Ia32cbc9df9b9adf5d7c24c8b90be20063a94a514
(cherry picked from commit ac36896f1aa90ef21cd23bd213674a01f68f48d3)
2018-04-22 14:19:59 -07:00
Treehugger Robot
03cdc95f1c Merge "Catch double unbind of dead service" 2018-04-20 17:14:39 +00:00
Tobias Lindskog
00c7393a7c Catch double unbind of dead service
If a service receives onBindingDied after it has successfully connected
once, unbindService would be called once from the onBindingDied and then
again from registerServiceLocked when the service was rebound.  This
second attempt would typically crash.

The first unbindService call has a try/catch, add one around the second
call as well.

Test: Manual.  Boots and reboots without problems.
Change-Id: Ie9eabbcb6ee89c05abc565427465cfd6906f3fa3
2018-04-20 08:31:28 +02:00
Treehugger Robot
9ee5bb0037 Merge "apf: Add immediate encoding tests for LI" 2018-04-20 01:09:33 +00:00
Treehugger Robot
3a1ca762c9 Merge "Fix the implementation of BluetoothCodecStatus.equals()" 2018-04-19 23:55:31 +00:00
Pavlin Radoslavov
9d36e6babc Fix the implementation of BluetoothCodecStatus.equals()
Previously, the BluetoothCodecStatus.equals() implementation
was incorrect when comparing arrays of capabilities.
In the new implementation, the arrays are compared correctly,
and also the ordering of the capabilities in each array is ignored.

Also, added unit tests for class BluetoothCodecConfig and class
BluetoothCodecStatus.

Bug: 73404858
Bug: 73379307
Test: Unit tests (in frameworks/base)
  runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecConfigTest.java
  runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecStatusTest.java

Change-Id: If22087465397b7c4175c33f7d1909a15d957fb24
2018-04-19 14:36:18 -07:00
Cassie Han
122a7b33ad Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'" 2018-04-19 19:23:58 +00:00
Bernie Innocenti
18050000d7 apf: Add immediate encoding tests for LI
This tests that ApfGenerator knows how to optimally encode positive and
negative immediates of various sizes.

Equivalent tests will follow for LDDW and STDW.

Change-Id: Ia904aecb155c78569e3cf32a2431570281570481
Bug: 73804303
Test: runtest tests/net/java/android/net/apf/ApfTest.java
2018-04-19 22:55:35 +09:00
Bernie Innocenti
05011abf27 Merge "Adjust APF interpreter tests to match APFv4" 2018-04-19 13:17:20 +00:00
Treehugger Robot
5ace372bc2 Merge "Actually resolve all IPs for Private DNS hostname" 2018-04-19 11:02:29 +00:00
Erik Kline
71d90c4301 Actually resolve all IPs for Private DNS hostname
Previously, we reused the OneAddressPerFamilyNetwork which does
what it says on the tin.  For the resolution that will be used
to program netd this is not what we really want.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual testing of Private DNS passes
Bug: 64133961
Change-Id: Ieccc4d208b314b81061dc78d83848f97acefe04b
2018-04-19 18:02:45 +09:00
Cassie
91c5dc9a6a Cherry-pick 'Fix a tiny bug in NetworkScanRequest'
Bug: 77487847
Test: cts-tradefed run cts -m CtsCarrierApiTestCases --test android.carrierapi.cts.NetworkScanApiTest
Change-Id: Ic4b167cf4929a1bb86fa7e6768672a9288b96911
Merged-In: Ic4b167cf4929a1bb86fa7e6768672a9288b96911
2018-04-18 21:02:02 +00:00
Treehugger Robot
0e5b92eea6 Merge "Migrate android_uiautomator generation to Soong." 2018-04-18 20:17:54 +00:00
Nan Zhang
9f8b61b88a Migrate android_uiautomator generation to Soong.
Bug: b/70351683
Test: m clean && m android_uiautomator
and compare the old and new stubs.jar using md5sum.

Change-Id: I01937352ae1a470745f2ab1a9acbb4ea9520e153
Merged-In: I01937352ae1a470745f2ab1a9acbb4ea9520e153
2018-04-18 11:06:01 -07:00
Treehugger Robot
b47c9019b5 Merge "Stop InCall Notification to avoid track leak" 2018-04-18 12:53:30 +00:00
Treehugger Robot
5ab0fe1f56 Merge "Remove duplicated code in IMMS" 2018-04-18 04:09:28 +00:00
Shuo Qian
e7a099149f Merge "Revert "Remove the OEM hook implementation and usage"" 2018-04-18 01:39:43 +00:00
luochaojiang
50e5273c5f Stop InCall Notification to avoid track leak
There is no ringtone when a call is in comming. The audio track is
out of limit, for the notification tone can not be recycled timely.
Here is the steps to reproduce this issue.
1. Call the test device and keep it in communication
2. Send message to test device, more than 15 messages.
3. Stop call on test device, re-call the test device.
4. This is no ringtone now, if not, re try the previous steps.

Test: make, take a photo, record a video and play video

Change-Id: Iba4a41d7b8b601fa500b8a60cadaf04651f37fed
Signed-off-by: luochaojiang <luochaojiang@xiaomi.com>
2018-04-18 09:29:18 +08:00
tiansiming [田思明]
e102c97b93 Remove duplicated code in IMMS
There is no need to judge mIsInteractive again

Bug: N/A
Test: N/A

Change-Id: I887b5fdd16e4c39ff2dcf13902dfed69741635f8
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
2018-04-18 09:13:42 +08:00
Treehugger Robot
1cb379b782 Merge "Correct sendBroadcast test" 2018-04-17 19:50:41 +00:00
sqian
00b89515a5 Revert "Remove the OEM hook implementation and usage"
This reverts commit 2635a89c8cb536d487c5a77ea205f787c19dc92e.

Bug: 34344851
Change-Id: I96697165fd75054de42f007c16ca294ed6725708
2018-04-17 11:55:30 -07:00
Daniel Bonnevier
502f453ac4 Correct sendBroadcast test
Commit 23eb3a19 changed the implementation from sendBroadcast to
sendBroadcastAsUser but didn't change the test.

Test: adb shell am instrument -r -w -e class \
        android.app.timezone.RulesUpdaterContractTest#sendBroadcast \
        com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug: 78166765
Merged-In: I0a47e096a46fc63d46dd9ff878a4af0d76af82f0
Change-Id: I0a47e096a46fc63d46dd9ff878a4af0d76af82f0
2018-04-17 17:01:53 +00:00
Bernie Innocenti
545d9367e2 Adjust APF interpreter tests to match APFv4
Change-Id: I4311c754f1cb79633d49c5c1c0b4e27c8dde727e
Bug: 73804303
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
2018-04-17 17:30:41 +09:00
Treehugger Robot
f493c66f39 Merge "Clarify API doc for BluetoothGattServer::addService" 2018-04-17 00:07:38 +00:00
Treehugger Robot
7b25698549 Merge "Cleanup documentation for LE CoC in BluetoothAdapter" 2018-04-17 00:02:32 +00:00
Treehugger Robot
d53bd6b86e Merge "Source of deadlock between PlayerBase.mLock and PlaybackActivityMonitor.mPlayerLock:" 2018-04-16 23:48:48 +00:00
Stanley Tng
dac8e14018 Cleanup documentation for LE CoC in BluetoothAdapter
Test: Compile
Bug: 77631591
Change-Id: Ic3c7f13e560534a048bf5c8b274fe62190c214c7
2018-04-16 22:33:31 +00:00