Commit Graph

345611 Commits

Author SHA1 Message Date
Jordan Liu
d15962b260 Merge "Change directory where apns-conf.xml is stored"
am: d25198f62f

Change-Id: I33db5a97978e17d82da98344c25788fc3bb42e89
2018-05-21 14:20:34 -07:00
Jordan Liu
d25198f62f Merge "Change directory where apns-conf.xml is stored" 2018-05-21 19:06:54 +00:00
Andreas Gampe
2d47ac0df7 Merge "ActivityManager: Fix slow-app ANR dumping"
am: 923208e8c9

Change-Id: Ifed1ed567587b7616880f3b640d3162c57a40644
2018-05-21 11:17:24 -07:00
Treehugger Robot
923208e8c9 Merge "ActivityManager: Fix slow-app ANR dumping" 2018-05-21 16:59:17 +00:00
Niklas Lindgren
d3904f1ca3 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
2018-05-21 18:43:44 +02:00
Bernie Innocenti
0ec7b1e85e Merge changes from topic "apf-read-ram"
am: b5dda0e316

Change-Id: I80d70e5bce6d1a0903599e98d2d251459df1292a
2018-05-21 09:40:29 -07:00
Treehugger Robot
b5dda0e316 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
2018-05-21 15:33:28 +00:00
Tyler Gunn
6a8b23774e Merge "Require READ_CALL_LOG permission to see phone numbers in phone state."
am: b1b864cee2

Change-Id: I50a4fd925f22ffd1f255e8876e714b836948726d
2018-05-18 18:36:54 -07:00
Tyler Gunn
b1b864cee2 Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." 2018-05-19 00:13:15 +00:00
Xiangyu/Malcolm Chen
dc8a57472c Merge "Add carrier config for partial sms raw message expiration."
am: 54bd56d6c5

Change-Id: I23978e4efee3c25027f126b724946227cb6870a2
2018-05-18 16:10:47 -07:00
Xiangyu/Malcolm Chen
dc7e45e1f3 Merge "Fix UiccSlotInfo equals method."
am: 147dc32b0b

Change-Id: I29992b5d61f70086d15464cb7d5692cae31604cc
2018-05-18 15:15:52 -07:00
Tyler Gunn
84dad9565f 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
2018-05-18 14:37:43 -07:00
Xiangyu/Malcolm Chen
54bd56d6c5 Merge "Add carrier config for partial sms raw message expiration." 2018-05-18 21:05:55 +00:00
Xiangyu/Malcolm Chen
147dc32b0b Merge "Fix UiccSlotInfo equals method." 2018-05-18 21:05:43 +00:00
Remi NGUYEN VAN
f121c090c2 Merge changes Ieb0a5d24,I44df6668
am: 646dfc7703

Change-Id: Icb2a3df0de05012e3627807a5bf710b43de9b111
2018-05-17 20:40:35 -07:00
nharold
20d1bc0f1e Merge "Add toString() method to PhysicalChannelConfig"
am: 71c11daaf5

Change-Id: Ida6f578d12ea16877763ad19dbdfc696ed93bbc6
2018-05-17 19:32:16 -07:00
Remi NGUYEN VAN
646dfc7703 Merge changes Ieb0a5d24,I44df6668
* changes:
  Fix SntpClientTest failures with no active network
  Allow specifying a network for SNTP time sync
2018-05-18 01:44:44 +00:00
nharold
71c11daaf5 Merge "Add toString() method to PhysicalChannelConfig" 2018-05-18 01:15:48 +00:00
Malcolm Chen
b668535a69 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
2018-05-17 16:49:12 -07:00
Malcolm Chen
9fd71f8ec5 Fix UiccSlotInfo equals method.
In UiccSlotInfo#equals method, it's comparing Strings incorrectly.

Bug: 78033760
Test: GTS test
Change-Id: I4fed0a70ee0ef06bcf7a1af544e6aebced31d9c2
Merged-In: I4fed0a70ee0ef06bcf7a1af544e6aebced31d9c2
2018-05-17 16:30:32 -07:00
Nathan Harold
c50d40aa9f 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 2636dd435a)
2018-05-17 11:48:53 -07:00
Nicolas Geoffray
8223390490 Merge "Add a new dalvik.vm.jitpthreadpriority option."
am: d27a9f4465

Change-Id: Iaea7eca7b6535933da0af6b45453e7aba10ff1c8
2018-05-17 09:05:33 -07:00
Nicolas Geoffray
d27a9f4465 Merge "Add a new dalvik.vm.jitpthreadpriority option." 2018-05-17 15:08:01 +00:00
Eric Schwarzenbach
a5b52f17bf Merge "Add constant for PhysicalChannelConfig UNSOL"
am: 6ca9d3d97e

Change-Id: Iede552d63ec1ee1285f6e60ca1da11f20477cf2e
2018-05-16 19:42:41 -07:00
Remi NGUYEN VAN
6657d42602 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
2018-05-17 10:25:05 +09:00
Treehugger Robot
6ca9d3d97e Merge "Add constant for PhysicalChannelConfig UNSOL" 2018-05-17 01:08:13 +00:00
Eric Schwarzenbach
45ed35e577 Add constant for PhysicalChannelConfig UNSOL
Bug: 78791811
Test: compilation

Change-Id: I48404342daaaf74d81386aa64cac99ae1a5dfa8b
(cherry picked from commit ef44f95cd4)
2018-05-16 16:24:28 -07:00
Colin Cross
1d9a9610ae Merge "Disable AAPT2 for modules that use missing features"
am: 87dc8d6576

Change-Id: I0b745f8f9bd0af7eaa4a395a7f024b981f4193c3
2018-05-16 14:05:09 -07:00
Treehugger Robot
87dc8d6576 Merge "Disable AAPT2 for modules that use missing features" 2018-05-16 19:31:42 +00:00
Colin Cross
940b98ee4e 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
2018-05-16 09:34:26 -07:00
Nicolas Geoffray
24934a9c33 Add a new dalvik.vm.jitpthreadpriority option.
To dynamically play with JIT thread priorities.

bug: 79570024
Test: m
Change-Id: I84c691fb57b37e699429b9f511b2e235259d718a
2018-05-16 17:22:37 +01:00
Pete Gillin
ca2bafa5b7 Merge "Stop using Arrays.checkOffsetAndCount."
am: ca3450b524

Change-Id: I9652cdbab5e0b5e0777611ebd013df6c30fc61c5
2018-05-16 08:12:15 -07:00
Android Build Merger (Role)
72629d9999 Merge "Stop using Arrays.checkOffsetAndCount. am: 60f55a255f" into stage-aosp-master 2018-05-16 15:00:12 +00:00
Pete Gillin
a9d6a27a2e Stop using Arrays.checkOffsetAndCount.
am: 60f55a255f

Change-Id: Ic9f894d8fe813d0bb6e3776790ff113d2826d881
2018-05-16 07:11:54 -07:00
Android Build Merger (Role)
501f20bc63 Merge "Merge "Update Android.bp for api-stubs in order to do api-check." am: 001d2aed31" into stage-aosp-master 2018-05-16 14:09:18 +00:00
Nan Zhang
bc4d61ed6c Merge "Update Android.bp for api-stubs in order to do api-check."
am: 001d2aed31

Change-Id: Ic7500b86c150b2c5f5870374a6ab5b0215278814
2018-05-16 07:08:44 -07:00
Pete Gillin
ca3450b524 Merge "Stop using Arrays.checkOffsetAndCount." 2018-05-16 13:04:13 +00:00
Kurt Marcinkiewicz
7a4ff6447d 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
2018-05-16 16:43:43 +09:00
Nan Zhang
da5d25cac5 Merge "Update Android.bp for api-stubs in order to do api-check."
am: 001d2aed31

Change-Id: I6db802857405e61b96c9f1863f96584d43bcbc9a
2018-05-15 19:47:02 -07:00
Nan Zhang
001d2aed31 Merge "Update Android.bp for api-stubs in order to do api-check." 2018-05-16 01:40:53 +00:00
Colin Cross
ef9db6bfb6 Merge "Fix errors caught by aapt2"
am: 6d78fe0385

Change-Id: Ie8e1374011a8494842efcae6881239d2f3728c3a
2018-05-15 17:04:43 -07:00
Nan Zhang
39d2d18b80 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
2018-05-15 15:47:01 -07:00
Treehugger Robot
6d78fe0385 Merge "Fix errors caught by aapt2" 2018-05-15 22:21:56 +00:00
Dan Willemsen
b1005a8a2a Merge "Convert to Soong"
am: acbd94d76f

Change-Id: Ib04e6936303b53cf4d919ad07a27a9b8dda86168
2018-05-15 15:00:18 -07:00
Xiangyu/Malcolm Chen
5d17ca309d Merge "Unhide constructors of DataService and NetworkService."
am: 272769c41a

Change-Id: I9c892244ef457a00e59700eb634cdef08b749046
2018-05-15 14:28:05 -07:00
Jordan Liu
3ae696bff2 Merge "Update documentation of ApnSetting with V5 example"
am: 1c0ef18c39

Change-Id: I36cdf4d62fe7a482fef1e7d30e011d12c19695c3
2018-05-15 13:22:56 -07:00
Treehugger Robot
acbd94d76f Merge "Convert to Soong" 2018-05-15 19:35:04 +00:00
Xiangyu/Malcolm Chen
272769c41a Merge "Unhide constructors of DataService and NetworkService." 2018-05-15 18:54:50 +00:00
Jordan Liu
1c0ef18c39 Merge "Update documentation of ApnSetting with V5 example" 2018-05-15 18:16:33 +00:00
Jiyong Park
06bbf7e675 Merge "Add api txt files for nfc-extras"
am: be7959bb10

Change-Id: Iea39dee06752e13bb659f5f31f555b089ca4b90d
2018-05-14 23:57:56 -07:00