OSDN Git Service
Tyler Gunn [Thu, 24 May 2018 17:44:44 +0000 (10:44 -0700)]
Ensure self-managed calls use voip audio mode.
Although Telecom ensures that new calls use voip audio mode, the default
value from a Connection would override the Telecom default.
Bug:
76362663
Test: Modify test app to ensure it does not set voip audio mode, ensure
Telecom uses voip audio mode for new calls.
Change-Id: Ie6477659cf6dabd08f371d4958ece1d258cd3106
Treehugger Robot [Tue, 22 May 2018 12:24:33 +0000 (12:24 +0000)]
Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY."
Treehugger Robot [Mon, 21 May 2018 19:53:38 +0000 (19:53 +0000)]
Merge "Use AAPT2 for modules with manifest validation errors"
Colin Cross [Fri, 18 May 2018 16:50:29 +0000 (09:50 -0700)]
Use AAPT2 for modules with manifest validation errors
Add LOCAL_AAPT_FLAGS += --warn-manifest-validation to the modules
that have manifests that AAPT2 can't parse.
Bug:
79755007
Test: m checkbuild
Change-Id: I357fcba75909495ba2b46b9ed1b532e65fee3fe1
Colin Cross [Mon, 21 May 2018 19:52:24 +0000 (19:52 +0000)]
Merge changes from topic "aapt2-warn-manifest-validation"
* changes:
AAPT2: treat manifest validation errors as warnings when asked
AAPT2: Better error messages for ManifestFixer
AAPT2: Differentiate between Android and Java package names
Izabela Orlowska [Tue, 19 Dec 2017 16:22:42 +0000 (16:22 +0000)]
AAPT2: treat manifest validation errors as warnings when asked
Bug:
65670329
Test: updated
Change-Id: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9
Merged-In: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9
(cherry picked from commit
ad9e1324ff2c459d0ee6ee571d4a3e458c02cc81)
Adam Lesinski [Thu, 2 Nov 2017 19:07:08 +0000 (12:07 -0700)]
AAPT2: Better error messages for ManifestFixer
AAPT2 will now print the XML hierarchy where it found an unexpected
element.
Test: make aapt2_tests
Change-Id: Iac7918b2f344fab874f0a3e7aa9c6936ecde8913
Merged-In: Iac7918b2f344fab874f0a3e7aa9c6936ecde8913
(cherry picked from commit
ed37f4842ad838792b16bf19768ed9b2519b0194)
Adam Lesinski [Mon, 6 Nov 2017 18:44:46 +0000 (10:44 -0800)]
AAPT2: Differentiate between Android and Java package names
Android package names are more strict (ASCII only) than Java package names.
Also fixed an issue where trailing underscores were disallowed in Android
package names.
(cherry picked from commit
96ea08f1e737e0d19e274e9a29f71c387d81b09a)
Also includes part of I357fb84941bfbb3892a8c46feb47f55b865b6649 to remove
usage of FindNonAlphaNumericAndNotInSet.
Bug:
79481102
Test: make aapt2_tests
Change-Id: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Merged-In: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Treehugger Robot [Mon, 21 May 2018 19:46:00 +0000 (19:46 +0000)]
Merge "Change ownership of AAPT2 and libandroidfw"
Jordan Liu [Mon, 21 May 2018 19:06:54 +0000 (19:06 +0000)]
Merge "Change directory where apns-conf.xml is stored"
Treehugger Robot [Mon, 21 May 2018 16:59:17 +0000 (16:59 +0000)]
Merge "ActivityManager: Fix slow-app ANR dumping"
Niklas Lindgren [Fri, 18 May 2018 12:48:43 +0000 (14:48 +0200)]
Change directory where apns-conf.xml is stored
When apns are downloaded OTA they are stored directly under data/misc
by system server. Files created there gets assigned with file context
system_data_file which TelephonyProvider cannot read.
In order to make sure that downloaded apns gets a file context TelephonyProvider
can read we create an apns sub directory in init where radio_data_file:s are
created. The data path to where apns-conf is stored is here changed from /data/misc/
to /data/misc/apns/.
This change is aligned with other files that ConfigUpdateInstallReceiver writes.
Test: Trigger Apn update via intent UPDATE_APN_DB
Go to settings/apn-list and verify that newly downloaded are present
Bug:
79948106
Change-Id: I5a9ec262bfbac291cca9fee5accf93eb6c06f253
Treehugger Robot [Mon, 21 May 2018 15:33:28 +0000 (15:33 +0000)]
Merge changes from topic "apf-read-ram"
* changes:
apf: Add counters for dropped / passed packets
Add support for reading a snapshot of the APF data
Tyler Gunn [Sat, 19 May 2018 00:13:15 +0000 (00:13 +0000)]
Merge "Require READ_CALL_LOG permission to see phone numbers in phone state."
Tyler Gunn [Thu, 26 Apr 2018 21:43:31 +0000 (14:43 -0700)]
Require READ_CALL_LOG permission to see phone numbers in phone state.
Incoming and outgoing call phone numbers are visible in the phone state
broadcast and via the PhoneStateListener. To enhance user privacy, change
to require the READ_CALL_LOG permission in order to receive the call
phone numbers.
This means to see phone numbers:
1. android.intent.action.PHONE_STATE - requires READ_PHONE_STATE and
READ_CALL_LOG permission.
2. PhoneStateListener#onCallStateChanged - now required READ_CALL_LOG
permission.
To support this new behavior, added sendBroadcastAsUserMultiplePermissions
method to context to allow sending the broadcast to all users while
requiring the two permissions.
Bug:
78650469
Test: Created PHONE_STATE broadcast receiver in test app and verified that
when no permissions are granted, the phone number is empty for incoming
and outgoing calls.
Test: Granted Phone state permission to test app and verified that phone
number is not populated.
Test: Granted test app read call log permission and verified that phone
number is populated.
Test: Created PhoneStateListener in test app and verified that when no
permissions are granted, phone number is empty for incoming and outgoing.
calls.
Test: Granted read call log permission to test app and verified that both
the incoming and outgoing numbers are populated.
Change-Id: I857ea00cc58a0abbb77960643f361dd6dd9c8b56
Xiangyu/Malcolm Chen [Fri, 18 May 2018 21:05:55 +0000 (21:05 +0000)]
Merge "Add carrier config for partial sms raw message expiration."
Xiangyu/Malcolm Chen [Fri, 18 May 2018 21:05:43 +0000 (21:05 +0000)]
Merge "Fix UiccSlotInfo equals method."
Adam Lesinski [Fri, 2 Mar 2018 20:10:25 +0000 (12:10 -0800)]
Change ownership of AAPT2 and libandroidfw
toddke@ is now the new owner of these projects.
Exempt-From-Owner-Approval: setting new owners
Test: none
Change-Id: Ie92b020e0ba063f48ce8a76ebaef768fe0d554f1
Merged-In: Ie92b020e0ba063f48ce8a76ebaef768fe0d554f1
(cherry picked from commit
a95e841846c3add37cab0ca228e1e1a4eb0a1455)
Remi NGUYEN VAN [Fri, 18 May 2018 01:44:44 +0000 (01:44 +0000)]
Merge changes Ieb0a5d24,I44df6668
* changes:
Fix SntpClientTest failures with no active network
Allow specifying a network for SNTP time sync
nharold [Fri, 18 May 2018 01:15:48 +0000 (01:15 +0000)]
Merge "Add toString() method to PhysicalChannelConfig"
Malcolm Chen [Mon, 16 Apr 2018 22:20:38 +0000 (15:20 -0700)]
Add carrier config for partial sms raw message expiration.
Everytime at boot-up, we check Sms raw table, and delete the rows
with any partial message that is too old. By default the expiration
age is 30 days, but we want to make it configurable.
Bug:
77910620
Test: sanity-test
Change-Id: Ibd2374324be5513cbd09c04889e7b96051c26fb4
Merged-In: Ibd2374324be5513cbd09c04889e7b96051c26fb4
Malcolm Chen [Sat, 14 Apr 2018 02:33:08 +0000 (19:33 -0700)]
Fix UiccSlotInfo equals method.
In UiccSlotInfo#equals method, it's comparing Strings incorrectly.
Bug:
78033760
Test: GTS test
Change-Id: I4fed0a70ee0ef06bcf7a1af544e6aebced31d9c2
Merged-In: I4fed0a70ee0ef06bcf7a1af544e6aebced31d9c2
Nathan Harold [Tue, 24 Apr 2018 22:41:17 +0000 (15:41 -0700)]
Add toString() method to PhysicalChannelConfig
We need to be able to print the PhysicalChannelConfig
for debugging/dumping, so adding a toString() method
to print in a format that we can easily digest and
is consistent with other Telephony log formatting.
Bug:
78791811
Test: manual / TelephonyDebugMenu
Merged-In: Ieb12f78a821369072ca9f03d28b28759836f84b4
Change-Id: Ieb12f78a821369072ca9f03d28b28759836f84b4
(cherry picked from commit
2636dd435a7054b3101b041ef1570573c04afe96)
Nicolas Geoffray [Thu, 17 May 2018 15:08:01 +0000 (15:08 +0000)]
Merge "Add a new dalvik.vm.jitpthreadpriority option."
Remi NGUYEN VAN [Wed, 16 May 2018 08:29:32 +0000 (17:29 +0900)]
Fix SntpClientTest failures with no active network
The last change is using getActiveNetwork to run the queries, which
results in an NPE if there is no network on the device. Using network 0
causes no socket tagging and allows queries to the local test SNTP
server to go through as previously.
Also migrating to JUnit4 and moving mServer and mClient initializers to
setUp().
Test: SntpClientTest now passes
Change-Id: Ieb0a5d247129bcad89c1add0e9c1c504f516e2a9
Treehugger Robot [Thu, 17 May 2018 01:08:13 +0000 (01:08 +0000)]
Merge "Add constant for PhysicalChannelConfig UNSOL"
Eric Schwarzenbach [Tue, 15 May 2018 19:53:53 +0000 (12:53 -0700)]
Add constant for PhysicalChannelConfig UNSOL
Bug:
78791811
Test: compilation
Change-Id: I48404342daaaf74d81386aa64cac99ae1a5dfa8b
(cherry picked from commit
ef44f95cd42bf422c89718b447bc863b8a31f429)
Treehugger Robot [Wed, 16 May 2018 19:31:42 +0000 (19:31 +0000)]
Merge "Disable AAPT2 for modules that use missing features"
Colin Cross [Wed, 16 May 2018 16:21:18 +0000 (09:21 -0700)]
Disable AAPT2 for modules that use missing features
Use LOCAL_USE_AAPT2 := false to disable AAPT2 for modules that
use features that are not implemented in AAPT2.
Fixes:
frameworks/base/core/tests/coretests/apks/install_multi_package/AndroidManifest.xml:46: error: unexpected element <package> found in <manifest>.
frameworks/base/core/tests/coretests/apks/install_multi_package/AndroidManifest.xml:82: error: unexpected element <package> found in <manifest>.
frameworks/base/core/tests/coretests/apks/install_verifier_bad/AndroidManifest.xml:19: error: unexpected element <package-verifier> found in <manifest>.
frameworks/base/core/tests/coretests/apks/install_verifier_good/AndroidManifest.xml:19: error: unexpected element <package-verifier> found in <manifest>.
frameworks/base/packages/CtsShim/build/shim/AndroidManifest.xml:25: error: unexpected element <restrict-update> found in <manifest>.
frameworks/base/tests/ActivityTests/AndroidManifest.xml:42: error: unexpected element <preferred> found in <manifest><application><activity>.
out/target/common/obj/APPS/CtsShimPriv_intermediates/AndroidManifest.xml:25: error: unexpected element <restrict-update> found in <manifest>.
frameworks/base/core/tests/coretests/AndroidManifest.xml:26: error: unexpected element <meta-data> found in <manifest><permission>.
...
Bug:
79755007
Test: m FORCE_AAPT2=true java
Change-Id: I393b697c521ab2a4fbc00b29a43aed6b4729b9a8
Nicolas Geoffray [Wed, 16 May 2018 16:22:37 +0000 (17:22 +0100)]
Add a new dalvik.vm.jitpthreadpriority option.
To dynamically play with JIT thread priorities.
bug:
79570024
Test: m
Change-Id: I84c691fb57b37e699429b9f511b2e235259d718a
Pete Gillin [Wed, 16 May 2018 13:04:13 +0000 (13:04 +0000)]
Merge "Stop using Arrays.checkOffsetAndCount."
Kurt Marcinkiewicz [Mon, 5 Mar 2018 22:45:04 +0000 (14:45 -0800)]
Allow specifying a network for SNTP time sync
Permits syncing over a specific network instead of the default for
the process. This was causing an issue with Android Wear devices
paired with iOS where the default network is bluetooth
(see b/
32663274).
This CL is in support of ag/
3776564
Bug:
32663274
Test: adb shell am instrument -e class android.net.SntpClientTest -w \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
(cherry-pick of pi-dev Ic9fc169cf75457810d4992121d85d7642e350b90)
Merged-In: I339c77063c72a9d76a5c4cb17052e20fb6e045a6
Merged-In: I8dfd1cad99c63efdc14c174c19f094a61cdfc44f
Change-Id: I44df66688292b144ec7dfcdd9ae5d82489f82774
Nan Zhang [Wed, 16 May 2018 01:40:53 +0000 (01:40 +0000)]
Merge "Update Android.bp for api-stubs in order to do api-check."
Nan Zhang [Sat, 5 May 2018 01:36:45 +0000 (18:36 -0700)]
Update Android.bp for api-stubs in order to do api-check.
Bug: b/
78034256
Test: m clean && m checkapi
Change-Id: Ifbda8825f95e26bb79aac9b1bb73c5e43f12d1fb
Merged-In: Ifbda8825f95e26bb79aac9b1bb73c5e43f12d1fb
Treehugger Robot [Tue, 15 May 2018 22:21:56 +0000 (22:21 +0000)]
Merge "Fix errors caught by aapt2"
Treehugger Robot [Tue, 15 May 2018 19:35:04 +0000 (19:35 +0000)]
Merge "Convert to Soong"
Xiangyu/Malcolm Chen [Tue, 15 May 2018 18:54:50 +0000 (18:54 +0000)]
Merge "Unhide constructors of DataService and NetworkService."
Jordan Liu [Tue, 15 May 2018 18:16:33 +0000 (18:16 +0000)]
Merge "Update documentation of ApnSetting with V5 example"
Narayan Kamath [Tue, 15 May 2018 10:12:50 +0000 (11:12 +0100)]
PacProcessor: Include libpac as a JNI_SHARED_LIBRARY.
libpac is only used by the PacProcessor, so this prevents us
from installing both the 32 and 64 bit versions of the library
on the system partition.
Test: make
Change-Id: I61033ba66116cf21f5518657df8fcd9fa46cd1b5
Colin Cross [Tue, 15 May 2018 05:42:30 +0000 (22:42 -0700)]
Fix errors caught by aapt2
Fixes:
frameworks/base/tests/LotsOfApps/AndroidManifest.xml:10: error: attribute 'android:name' in <activity> tag must be a valid Java class name.
frameworks/base/tests/LotsOfApps/AndroidManifest.xml:17: error: attribute 'android:name' in <activity> tag must be a valid Java class name.
frameworks/base/tests/LotsOfApps/AndroidManifest.xml:24: error: attribute 'android:name' in <activity> tag must be a valid Java class name.
...
Bug:
79481102
Test: m java FORCE_AAPT2=true
Change-Id: Ib00f277d251497942ad53f1ba1f8f5e12b2f7ba9
Jiyong Park [Tue, 15 May 2018 05:30:41 +0000 (05:30 +0000)]
Merge "Add api txt files for nfc-extras"
Bernie Innocenti [Mon, 23 Apr 2018 16:25:42 +0000 (01:25 +0900)]
apf: Add counters for dropped / passed packets
ApfFilter maintains separate counters for each reason why a packet was
passed or dropped by the filter logic.
There's also a total which should match the individual counters,
*unless* the APF interpreter aborted execution early due to an illegal
instruction or an out-of-bounds access.
Test: both on APFv2 and APFv4-capable device:
runtest -x tests/net/java/android/net/ip/IpClientTest.java
runtest -x tests/net/java/android/net/apf/ApfTest.java
manual tests connected to an AP
Bug:
73804303
Change-Id: I54b17fcbb95dfaea5db975d282314ce73d79d6ec
Merged-In: I54b17fcbb95dfaea5db975d282314ce73d79d6ec
(cherry picked from commit
3cc40ea6c50c976dd4e6485574a8be899867f610)
Bernie Innocenti [Mon, 16 Apr 2018 11:15:12 +0000 (20:15 +0900)]
Add support for reading a snapshot of the APF data
No functional change yet, since startReadPacketFilter() has no callers
at this time. In the future, this new hook will be used to take
periodic snapshots of the APF memory (for instance, when the device
wakes up).
Design note: WifiStateMachine grabs the APF data synchronously
from another thread, but then the data snapshot is delivered to IpClient
via an asynchronous reply, following the same pattern used by other
commands. This means that there's no (practical) way for IpClient to
read the APF data just before replacing the APF program.
Even with this limitation, it's still possible to reliably decode packet
counters and compute deltas relative to the last snapshot, provided that
the address range isn't cleared when installing a new APF filter.
Bug:
73804303
Test: Manual - called the new code and inspected 'dumpsys wifi' output.
Change-Id: Ia0923d71cf3ee4128fb1c381557316300adac1a3
Merged-In: Ia0923d71cf3ee4128fb1c381557316300adac1a3
Merged-In: I3b940f5a3b795f85d244882eaa7eca56bd9e167d
Merged-In: I283fd5fb71f8a679911e58c487a4ac12a5190049
(cherry picked from commit
bb2193bf5877b7a93aebefdb74a8c7f410a17907)
nharold [Tue, 15 May 2018 02:46:05 +0000 (02:46 +0000)]
Merge "Use INetd Constant for IpSec Interface Prefix"
Dan Willemsen [Thu, 10 May 2018 03:30:33 +0000 (20:30 -0700)]
Convert to Soong
See build/soong/README.md for more information.
Test: m libframeworks_coretests_jni
Test: m FrameworkCoreTests_install
Test: m libshim_jni
Test: m CtsShimPrivUpgrade
Test: m libfilterfw
Test: m PMTest_Java_dual
Test: m libdefcontainer_jni
Test: m libperftestscore_jni
Test: m libpmtest32 libpmtest64
Test: m libprintspooler_jni
Test: m libsmartcamera_jni
Test: m idmap
Test: m libdrmframework_jni
Test: m libdvr_loader com.google.vr.platform com.google.vr.platform.xml
Test: m libfilterpack_imageproc libfilterpack_base
Test: m libwebviewchromium_loader
Test: m shared_mem_test
Test: m test-touchlag
Change-Id: I868561dd237fa28647896d59049ab9260373ada1
Malcolm Chen [Tue, 3 Apr 2018 18:48:56 +0000 (11:48 -0700)]
Unhide constructors of DataService and NetworkService.
DataService and NetworkService are System level classes. We shouldn't
hide their constructors otherwise their System level sub-class
can't be instantiated properly.
Test: gts
Bug:
77531655
Change-Id: I1a58b4857dbcf939ac124e20eb0a801ad5a9b597
Merged-In: I1a58b4857dbcf939ac124e20eb0a801ad5a9b597
Colin Cross [Mon, 14 May 2018 22:42:03 +0000 (22:42 +0000)]
Merge "Fix errors caught by aapt2"
Colin Cross [Mon, 14 May 2018 22:41:42 +0000 (22:41 +0000)]
Merge "Fix errors caught by aapt2"
Nathan Harold [Thu, 26 Apr 2018 18:47:14 +0000 (11:47 -0700)]
Use INetd Constant for IpSec Interface Prefix
Convert to using a constant in INetd to ensure
that there is a consistent tunnel prefix between
Java and native code.
Bug:
74560705
Test: atest FramworksNetTest; atest CtsNetTestCases
Change-Id: Ida233aac2e6c6b26567463964e0ebac9d52eff1e
(cherry picked from commit
649df5e07a968ac98b41a1da60a04d59149d2385)
Jordan Liu [Wed, 9 May 2018 22:51:49 +0000 (15:51 -0700)]
Update documentation of ApnSetting with V5 example
ApnSetting#fromString has had 2 version bumps since the documentation
was written. Users of the resource overlay can mix and match versions,
so this documentation gives an example of a V5 format ApnSetting with a
V3 one.
Bug:
70172263
Test: manual; no behavior change
Change-Id: I20ff199fb60304fbb7c2a8b837869bfd143eba16
Merged-In: I20ff199fb60304fbb7c2a8b837869bfd143eba16
Treehugger Robot [Mon, 14 May 2018 16:28:51 +0000 (16:28 +0000)]
Merge "When suid_dumpable == 2, set dumpable to 0 for apps"
Pirama Arumuga Nainar [Mon, 14 May 2018 16:17:35 +0000 (16:17 +0000)]
Merge "For Win32, don't cast ssize_t while printing"
Nicolas Geoffray [Mon, 14 May 2018 15:28:35 +0000 (15:28 +0000)]
Merge "Bugreport greylist updates."
Nicolas Geoffray [Mon, 14 May 2018 10:29:56 +0000 (11:29 +0100)]
Bugreport greylist updates.
Monday edition.
Manual as it looks the tables haven't been populated yet.
bug:
79630776
bug:
79577968
bug:
79604623
Test: m
Change-Id: I569b827821ed5651afab409a66704ba61a572a7c
Merged-in: I569b827821ed5651afab409a66704ba61a572a7c
David Brazdil [Mon, 14 May 2018 10:23:10 +0000 (10:23 +0000)]
Merge "Include in hidden API dark greylist based on package name"
Jiyong Park [Sat, 12 May 2018 13:36:10 +0000 (22:36 +0900)]
Add api txt files for nfc-extras
java_sdk_library now does the apicheck by default. Not-yet-released
version of API txt files for the nfc-extras library are added by running
`m update-api'
Bug:
77575606
Test: m -j
Test: m -j checkapi
Change-Id: I1a9141c71e085be8944943b4df7d3695237f7c69
Pirama Arumuga Nainar [Fri, 11 May 2018 22:52:49 +0000 (15:52 -0700)]
For Win32, don't cast ssize_t while printing
Bug: http://b/
69933068
This is a partial revert of
https://android-review.googlesource.com/c/platform/frameworks/base/+/109433
so we can use Clang for windows cross compilation.
Clang does not allow a cast to 'signed size_t' and both Clang and
current MinGW accept a ssize_t to the '%zd' format specifier.
Test: m native-host, m native-host-cross with both MinGW and Clang
Change-Id: I5366622b91be1433f6c533c55a9ae429b57c7a27
Treehugger Robot [Fri, 11 May 2018 23:13:23 +0000 (23:13 +0000)]
Merge "BluetoothManager: Continue when BLE not supported"
Myles Watson [Fri, 11 May 2018 15:47:24 +0000 (08:47 -0700)]
BluetoothManager: Continue when BLE not supported
Bluetooth should turn on completely (without GATT) when the chip
does not support Bluetooth Low Energy.
Bug:
77495521
Test: Remove vendor/etc/permissions/android.hardware.bluetooth_le.xml
Reboot
Toggle Bluetooth
Change-Id: I9314ee473b4a5a158196bab3037b1452247ba466
Treehugger Robot [Fri, 11 May 2018 17:36:24 +0000 (17:36 +0000)]
Merge "add install action for carrier id to system API"
Jordan Liu [Fri, 11 May 2018 15:57:16 +0000 (15:57 +0000)]
Merge "Add Carriers.APN_SET_ID and NO_SET_SET"
fionaxu [Tue, 8 May 2018 18:57:53 +0000 (11:57 -0700)]
add install action for carrier id to system API
Bug:
79426800
Test: Manual
Change-Id: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
(cherry picked from commit
2776ed56b846ff34e45467f7618a679049d16f3f)
Merged-in: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
David Brazdil [Thu, 10 May 2018 14:50:02 +0000 (15:50 +0100)]
Include in hidden API dark greylist based on package name
Dark greylist has so far been populated with the remaining class
members of classes listed on the light greylist. This patch changes
the rule to include all remaining classes and class members in the
same package (sub-packages not included).
Bug:
64382372
Test: make -j64 out/target/common/obj/PACKAGING/hiddenapi-dark-greylist.txt
Change-Id: Icf3f60f1e776f092103c612fc3995ce0e66617ea
Merged-In: Icf3f60f1e776f092103c612fc3995ce0e66617ea
(cherry picked from commit
4c3c03129ba95dccab30ba7579dc91b97843271f)
Treehugger Robot [Fri, 11 May 2018 11:41:40 +0000 (11:41 +0000)]
Merge "Add static analysis data."
Nicolas Geoffray [Fri, 11 May 2018 10:08:01 +0000 (11:08 +0100)]
Add static analysis data.
bug:
64382372
Test: m
Change-Id: Ie0696a5eecf610165c4b9c339a789f76964a0623
Merged-in: I188a69ad05fffa69be79fec36b180fc9f76998fa
Colin Cross [Fri, 11 May 2018 05:15:31 +0000 (22:15 -0700)]
Fix errors caught by aapt2
Fixes:
frameworks/base/media/tests/NativeMidiDemo/AndroidManifest.xml:11: error: unknown element <uses-feature> found.
Bug:
79481102
Test: m java FORCE_AAPT2=true
Change-Id: Ife9b7c9eb97adfd6525912776f16cb27b5d22677
Merged-In: I7bb02b8926d01090132ce873c785b5323a9fa5f8
Colin Cross [Thu, 10 May 2018 22:40:35 +0000 (15:40 -0700)]
Fix errors caught by aapt2
Fixes:
frameworks/base/tests/ActivityTests/res/values/themes.xml:18: error: resource previously defined here.
frameworks/base/tests/ActivityTests/res/values/themes.xml:21: error: duplicate value for resource 'style/SlowDialog' with config ''.
Bug:
79481102
Test: m java FORCE_AAPT2=true
Change-Id: I06b1552220b5acd8790d72555e36a0466c523b67
Jordan Liu [Thu, 10 May 2018 23:10:08 +0000 (23:10 +0000)]
Merge "Add documentation for what to use for SS changes"
Jordan Liu [Thu, 10 May 2018 22:56:27 +0000 (22:56 +0000)]
Merge "Update getIccAuthentication documentation"
Jordan Liu [Fri, 6 Apr 2018 18:10:12 +0000 (11:10 -0700)]
Add Carriers.APN_SET_ID and NO_SET_SET
Add them as hidden for now.
Bug:
70172263
Test: TelephonyProviderTest#testApnSetId
Change-Id: Id16dd5631d327f403a7347b72ecfb27a5e298541
Merged-In: Id16dd5631d327f403a7347b72ecfb27a5e298541
Jordan Liu [Tue, 17 Apr 2018 21:43:39 +0000 (14:43 -0700)]
Add documentation for what to use for SS changes
Since the broadcast is deprecated in favor of the ServiceStateProvider,
the documentation should reflect this.
Note that the LteEarfcnRsrpBoost has not been migrated into the provider
so this also needs to happen.
Bug:
33756364
Fixes:
78188866
Test: no behavior change, ran make
Change-Id: Ia15a7408bdc79927438fa243cce77b262bbb66c4
Merged-In: Ia15a7408bdc79927438fa243cce77b262bbb66c4
Jordan Liu [Mon, 9 Apr 2018 23:33:17 +0000 (16:33 -0700)]
Update getIccAuthentication documentation
Explain what it means if the function returns null. This is based on the
spec at TS 31.102 section 7.3.1.
Bug:
74392381
Test: manual
Change-Id: Ic84d94589431109079a866027953ab9dbef103b8
Merged-In: Ic84d94589431109079a866027953ab9dbef103b8
Shuo Qian [Thu, 10 May 2018 20:56:06 +0000 (20:56 +0000)]
Merge "Enhance adding subscription logs"
Victor Hsieh [Thu, 10 May 2018 19:16:22 +0000 (12:16 -0700)]
When suid_dumpable == 2, set dumpable to 0 for apps
Core dumps for zygote children are expected to be disabled in CTS, but
on system like Chrome OS, suid_dumpable is 2, thus not compliant with
CTS. This patch sets dumpable to 0 for apps when suid_dumpable is 2.
Test: atest \
android.permission.cts.FileSystemPermissionTest#testAllBlockDevicesAreSecure \
android.os.cts.SecurityFeaturesTest#testPrctlDumpable \
android.seccomp.cts.SeccompHostJUnit4DeviceTest#testCTSSyscallBlocked
Bug:
62379607
Bug:
79094505
Change-Id: Ida43b16590dca1e85a0f9549c779e38c00bc6a0c
sqian [Tue, 8 May 2018 21:11:11 +0000 (14:11 -0700)]
Enhance adding subscription logs
Bug:
79428110
Test: Manual
Change-Id: Ie77128f447ad0628336b2af38344d2d7a07f1eab
Merged-In: Ie77128f447ad0628336b2af38344d2d7a07f1eab
(cherry picked from commit
a77d9d7f2a733c67b471086f95fa3f7c70d6c1dc)
Pete Gillin [Thu, 10 May 2018 14:40:32 +0000 (15:40 +0100)]
Stop using Arrays.checkOffsetAndCount.
Start using ArrayUtils.throwsIfOutOfBounds instead. The Arrays method
is going to be removed.
Bug:
78447530
Test: cts-tradefed run cts-dev -m CtsOsTestCases (shows only unrelated failures: two user/userdebug mismatches and one from b/
79471510)
Test: cts-tradefed run cts-dev -m CtsDrmTestCases
Test: adb shell am instrument -w -e class android.content.pm.LimitedLengthInputStreamTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: adb shell am instrument -w -e class android.os.FileBridgeTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ib3cd4f4ead61dbec1ccdc94b2ad4ad9c28574582
David Brazdil [Thu, 10 May 2018 15:46:56 +0000 (15:46 +0000)]
Merge "Greylist hidden methods for exempting trusted test code"
Remi NGUYEN VAN [Thu, 10 May 2018 00:11:21 +0000 (00:11 +0000)]
Merge "Fix android.net.SSLTest"
Treehugger Robot [Wed, 9 May 2018 23:26:23 +0000 (23:26 +0000)]
Merge "Bluetooth: Update grey list to match hidden API change"
Calin Juravle [Wed, 9 May 2018 22:12:42 +0000 (22:12 +0000)]
Merge "Properly prepare system server profiles"
Calin Juravle [Wed, 9 May 2018 22:12:07 +0000 (22:12 +0000)]
Merge "Make system server profiling an explicit runtime intent"
android-build-prod (mdb) [Wed, 9 May 2018 17:52:34 +0000 (17:52 +0000)]
Merge "AudioService: Do not disconnect SCO started externally"
David Brazdil [Wed, 9 May 2018 17:02:03 +0000 (18:02 +0100)]
Greylist hidden methods for exempting trusted test code
Bug:
64382372
Test: N/A
Change-Id: I8bcc3d23d0b942e70a16a9d28ea0d21ce4fe75a2
Tyler Gunn [Wed, 9 May 2018 16:22:44 +0000 (16:22 +0000)]
Merge "Make TelecomManager#endCall a public API."
David Brazdil [Wed, 9 May 2018 13:58:50 +0000 (13:58 +0000)]
Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b
* changes:
Manualy blacklist certain hidden APIs
Populate hidden API dark greylist
Refactor build rules for hidden API lists
David Brazdil [Wed, 9 May 2018 12:42:30 +0000 (12:42 +0000)]
Merge "Revert^2 "Fix signature of recently changed methods""
David Brazdil [Wed, 9 May 2018 12:35:20 +0000 (12:35 +0000)]
Revert^2 "Fix signature of recently changed methods"
This reverts commit
29b92c610a61f88ebf25e764994b70d61bc3cea8.
Merge the CL again, this time without a Merged-In flag which
prevented it from merging into the internal tree.
Change-Id: Ie1b9de8c45cb174437fa4acdd78e6cdd4b660623
David Brazdil [Wed, 9 May 2018 12:32:28 +0000 (12:32 +0000)]
Merge "Revert "Fix signature of recently changed methods""
David Brazdil [Wed, 9 May 2018 12:27:27 +0000 (12:27 +0000)]
Revert "Fix signature of recently changed methods"
This reverts commit
ca930d166ec2b3d20a8abc03aaabb7874a6c7745.
Reason for revert: the Merged-In tag conflicts with
a cherry-pick into AOSP
Merged-In: Id50db88f4ff36069b0f392c81dd9d90c24cd2206
Change-Id: If284ac4957cf84f0acc118f232f6acf476e05b98
David Brazdil [Wed, 9 May 2018 09:43:46 +0000 (09:43 +0000)]
Merge "Fix signature of recently changed methods"
David Brazdil [Wed, 9 May 2018 09:10:18 +0000 (10:10 +0100)]
Fix signature of recently changed methods
BluetoothHeadset methods startScoUsingVirtualVoiceCall and
stopScoUsingVirtualVoiceCall recently changed their signature.
Fix this in the hiddenapi-light-greylist.txt to unblock the build.
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Merged-In: Id50db88f4ff36069b0f392c81dd9d90c24cd2206
Change-Id: I295886b0cd35936d0b8c1a8e4a9b9c5054dda001
David Brazdil [Tue, 8 May 2018 15:49:02 +0000 (16:49 +0100)]
Manualy blacklist certain hidden APIs
Previous CL introduced the concept of populating the dark greylist
with remaining members of classes on the light greylist. This breaks
the assumption that some methods/fields will always remain blacklisted.
Introduce a new file which forces their blacklisting and adjust the
build rules accordingly.
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Merged-In: I8b20e03c50f4027a24d2a6081bedb08bc8a34011
Change-Id: I8b20e03c50f4027a24d2a6081bedb08bc8a34011
(cherry picked from commit
4b34f79a35a6602962ed1df1accd9d6ea6e41e77)
David Brazdil [Tue, 8 May 2018 14:28:31 +0000 (15:28 +0100)]
Populate hidden API dark greylist
This patch will iterate over all classes in the light greylist and
add the remaining (currently blacklisted) class members into the
dark greylist. This is meant to mitigate the impact of the feature
on legacy apps, in case their hidden API uses have not been detected
by our analyses. The dark greylist entries will be available to apps
targeting pre-P SDK versions, but blocked for apps targeting P or later.
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-dark-greylist.txt
Merged-In: Id1ef4ab523b3b4d1333b5fbf2b3e6622ef2be607
Change-Id: Id1ef4ab523b3b4d1333b5fbf2b3e6622ef2be607
(cherry picked from commit
185f00e6677cea3fb135648f4a19d22dec54bbb5)
David Brazdil [Tue, 8 May 2018 14:04:20 +0000 (15:04 +0100)]
Refactor build rules for hidden API lists
The build rules were getting messy and too difficult to extend.
Extract assertions into own functions, create shared variables.
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Merged-In: Ie34adb8b5349b30daa2e9e4976d285f6d9711f0e
Change-Id: Ie34adb8b5349b30daa2e9e4976d285f6d9711f0e
(cherry picked from commit
721bc8e6a8b1350c62b4a570f523541d1ce1124a)
David Brazdil [Wed, 9 May 2018 08:10:19 +0000 (08:10 +0000)]
Merge changes from topic "hiddenapi-cherrypick"
* changes:
Enable hidden API blacklist in AOSP
Populate hidden API light greylist for AOSP
Add presubmit hook for hidden API lists.
Fix typo in comments.
Treat hidden API exemptions as whitelist.
Replace ALL_LISTS policy with JUST_WARN.
Jack He [Tue, 8 May 2018 21:51:07 +0000 (14:51 -0700)]
AudioService: Do not disconnect SCO started externally
* AudioService should not disconnect Bluetooth SCO if it is started
externally
* When SCO has already started externally, all SCO connection attempts
through AudioManager API will fail with SCO_AUDIO_STATE_DISCONNECTED
intent
* Remove SCO_STATE_DEACTIVATE_EXT_REQ state since AudioService could no
longer disconnect SCO audio that is started externally
* Change SCO_STATE_* values so that they are consecutive
Bug:
79407565
Test: With Bluetooth HFP device connected:
Test1: make a outgoing call
Test2: make VoIP call during cellular call
Test3: make a VoIP call during another VoIP call
Change-Id: I1e0a10aeb0eac59d4826f9defa595aebd85f534c
(cherry picked from commit
33c3a17113ee93bfd4575241cc15e78afc300f0e)
Jack He [Wed, 9 May 2018 02:35:31 +0000 (19:35 -0700)]
Bluetooth: Update grey list to match hidden API change
* startScoUsingVirtualVoiceCall() and stopScoUsingVirtualVoiceCall()
no longer takes arguments
Bug:
76114959
Test: build only, no functional change
Change-Id: I16e5345bbfaa5d42490122a4330673e1152f687f
Calin Juravle [Wed, 9 May 2018 01:55:51 +0000 (01:55 +0000)]
Merge "Process "dalvik.vm.profilebootimage" system property"
Remi NGUYEN VAN [Wed, 9 May 2018 01:29:34 +0000 (01:29 +0000)]
Merge "Add NETWORK_BYPASS_PRIVATE_DNS permission"
android-build-prod (mdb) [Wed, 9 May 2018 00:25:12 +0000 (00:25 +0000)]
Merge "Bluetooth: Fix HFP SCO logic and documentation"