Commit Graph

344828 Commits

Author SHA1 Message Date
Treehugger Robot
d01890df3c Merge "Work around b/24465209, do not pack relocation table." 2018-05-24 19:13:19 +00:00
Treehugger Robot
1109e2333f Merge "Framework: Add API to get zygote PID" 2018-05-24 18:28:59 +00:00
Treehugger Robot
daff857ffd Merge "Use correct filename when adding to ringtone" 2018-05-24 16:55:49 +00:00
Chih-Hung Hsieh
eeb1ea86ce Work around b/24465209, do not pack relocation table.
Global flag --pack-dyn-relocs=android is used with clang lld.
For b/24465209, we need to override that with pack_relocations:false.

Bug: 24465209
Bug: 80093890
Test: build with USE_CLANG_LLD=true and run dlext.compat_elf_hash_and_relocation_tables
Change-Id: I9364feb4070d4f75705d8651d535c792fe6ad6f7
2018-05-24 09:31:50 -07:00
Treehugger Robot
e7372ab0d5 Merge changes Id81271ff,I8f298371
* changes:
  DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
  DO NOT MERGE ANYWHERE Sort hiddenapi-p-light-greylist.txt
2018-05-24 10:14:08 +00:00
David Brazdil
85c81cb24c DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: Id81271ffe2080091d4e4c3d40325183b086dba8e
2018-05-24 08:39:02 +00:00
David Brazdil
1c04a887fb DO NOT MERGE ANYWHERE Sort hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: I8f298371df3efbc3d968c95337e058d6140fe5de
2018-05-24 08:26:02 +00:00
Remi NGUYEN VAN
7b0935509d Merge changes I3b3bcbbd,I18b3f263,I3c416c1a
* changes:
  Use CaptivePortalProbeSpec method in portal app
  Add configurable captive portal probes
  Move CaptivePortalProbeResult to its own file
2018-05-24 07:53:00 +00:00
Treehugger Robot
a7183b92c4 Merge "Fixup SntpClient to bypass Private DNS" 2018-05-24 07:07:15 +00:00
Erik Kline
9e3c25de55 Fixup SntpClient to bypass Private DNS
NTP may be necessary in order to validate Private DNS certificates,
so it should be allowed to bypass Private DNS.

Test: as follows
    - built, flashed, booted
    - tcpdump for port 53; adb shell am restart
      queries for the NTP hostname appear in the clear
    - runtest frameworks-net passes
Bug: 64133961
Bug: 80118648
Merged-In: I4655e3ce5691098c73bf070b8a9e4759485bb17a
Merged-In: I327b816a9f472e94328232157a3b8887d17b0baf
Change-Id: Id9ceb3fcaaffb48cbbd4cd381d48cae991572c9e
(cherry picked from commit 7eccfeb9ca)
2018-05-24 13:58:58 +09:00
Remi NGUYEN VAN
9f85505432 Use CaptivePortalProbeSpec method in portal app
This only changes behavior if the EXTRA_CAPTIVE_PORTAL_PROBE_SPEC extra
is passed, which only happens if extra probe specs have been defined in
settings.

Bug: b/79499239
Test: manual: on 2 different portals, works w/ and w/o the setting
Merged-In: Iebd307b5d73a7b4679baea2a1c12c3baba6a7447
Merged-In: I851d8c41d42dccb03f813e549439f44c83f7d5ac
(clean cherry-pick of pi-dev I70acfd9213bf620cbb79ad999b8ad03472e8d43f)

Change-Id: I3b3bcbbd380f8cbd0b663556d55276f43e30b3e5
2018-05-24 12:14:34 +09:00
Remi NGUYEN VAN
13e6e21db9 Add configurable captive portal probes
The probes allow testing for a configurable status code and location
header (regexes). They are disabled by default, so this CL is a
no-op unless the probe configurations are pushed.

Bug: b/79499239
Test: tests in CL pass, manual: captive portal login works
Merged-In: Iec7a74bbf2569a91e958c497200d77e8451cbf7b
Merged-In: Ia958815325d1466345e9626efc8f62fc9d08d774
(clean cherry-pick of pi-dev I785723aaed06054b9aa8ebff77803f23d7836db9)

Change-Id: I18b3f263fed08fa4fee20d5e88f3ec8647d7f835
2018-05-24 12:08:36 +09:00
Remi NGUYEN VAN
d57329d853 Move CaptivePortalProbeResult to its own file
This is necessary to resolve visibility issues for the next change.

Bug: b/79499239
Test: runtest frameworks-net
Merged-In: Ia48b32307a51a66f2672d7112f71166dd6db41b1
Merged-In: I5df7ee9f16bc6be4f02353d40a843a383dd4cbd9
(Clean cherry-pick of pi-dev I50bc96afe6ae88c8f58a693f0a4e821f1f9b3299)

Change-Id: I3c416c1a91ebfdf914fd528ff8ab73e3eb490562
2018-05-24 12:04:27 +09:00
Daisuke Teranishi
ce4d67b6d0 Use correct filename when adding to ringtone
If the title of the music file includes "/", it's recognized
as a directory separator.
Use correct filename to select the file properly.

Bug: 80202253
Test: Add mp3 which title includes "/" to ringtone

Change-Id: I9bb05f6fe2d7d4dbbdf4f67db7ac6fde04707979
2018-05-24 11:39:33 +09:00
David Brazdil
ddceca858f Merge "Update hidden API lists in AOSP" 2018-05-23 16:36:47 +00:00
Pete Gillin
0040a61c3e Merge "Remove Arrays.checkOffsetAndCount from the greylist." 2018-05-23 15:55:48 +00:00
David Brazdil
aa8d4ef032 Update hidden API lists in AOSP
This should only be merged into AOSP branches

Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Test: N/A
Change-Id: Ia9b362cf44821273a8c4d25f73ffd881895e7df1
2018-05-23 16:04:34 +01:00
Pete Gillin
46ab91aa14 Remove Arrays.checkOffsetAndCount from the greylist.
This method is being removed. All usages of this @hide method in the
platform have already been removed. For an analysis of the usage in
apps, see the bug.

Bug: 78447530
Test: cts-tradefed run cts-dev -m CtsLibcoreTestCases

(cherry picked from commit 094f08bc41)

Change-Id: I60a158654ad962c8e3b5282c035dae0c014903d0
Merged-In: Ic89cf0775170393fe906f581364bff0e852958ef
2018-05-23 14:16:31 +00:00
Jiyong Park
9f89b3393d Merge "Shared lib def for org.apache.http.legacy comes from java_sdk_library" 2018-05-23 11:35:25 +00:00
Treehugger Robot
1771240c80 Merge "Reset the profile when system application change version." 2018-05-22 23:15:36 +00:00
Christopher Ferris
10e3fdd263 Merge "Remove unnecessary references to libunwind." 2018-05-22 19:22:39 +00:00
Treehugger Robot
00c0a5bb23 Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY." 2018-05-22 12:24:33 +00:00
Jiyong Park
c73b9e9e17 Shared lib def for org.apache.http.legacy comes from java_sdk_library
org.apache.http.legacy is now built using java_sdk_library. Since the
share lib defintion file for the lib is automatically created and
installed, we don't need to have duplicated entry for the lib.

Bug: 77577799
Test: m -j
Test: adb shell cmd package list libraries shows an entry for
org.apache.http.legacy

Merged-In: I06b356c2ba08abc6c1cece81daf7c1773ed93ed0
Change-Id: I06b356c2ba08abc6c1cece81daf7c1773ed93ed0
(cherry picked from commit 49c0a86955)
2018-05-22 20:43:51 +09:00
Christopher Ferris
41fa069e52 Remove unnecessary references to libunwind.
Bug: 79209464

Test: Builds.
Change-Id: Ica58edd0d11b54c45b0af8e75eed67936f4309c2
Merged-In: Ica58edd0d11b54c45b0af8e75eed67936f4309c2
(cherry picked from commit 2197eebc64)
2018-05-21 14:19:06 -07:00
Treehugger Robot
59fa1bcf69 Merge "Use AAPT2 for modules with manifest validation errors" 2018-05-21 19:53:38 +00:00
Colin Cross
b3c1814b98 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
2018-05-21 19:52:43 +00:00
Colin Cross
61f92e7e13 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
2018-05-21 19:52:24 +00:00
Izabela Orlowska
533c09b01b AAPT2: treat manifest validation errors as warnings when asked
Bug: 65670329
Test: updated
Change-Id: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9
Merged-In: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9
(cherry picked from commit ad9e1324ff)
2018-05-21 19:51:50 +00:00
Adam Lesinski
b2b20f26db 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 ed37f4842a)
2018-05-21 19:51:42 +00:00
Adam Lesinski
ef506c73bb 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 96ea08f1e7)

Also includes part of I357fb84941bfbb3892a8c46feb47f55b865b6649 to remove
usage of FindNonAlphaNumericAndNotInSet.

Bug: 79481102
Test: make aapt2_tests
Change-Id: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Merged-In: I1052e9e82b6617db6065ce448d9bf7972bb68d59
2018-05-21 19:48:36 +00:00
Treehugger Robot
1e0a5d397d Merge "Change ownership of AAPT2 and libandroidfw" 2018-05-21 19:46:00 +00:00
Jordan Liu
d25198f62f Merge "Change directory where apns-conf.xml is stored" 2018-05-21 19:06:54 +00: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
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
b1b864cee2 Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." 2018-05-19 00:13:15 +00: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
Adam Lesinski
89794158a1 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 a95e841846)
2018-05-17 22:13:11 -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
d27a9f4465 Merge "Add a new dalvik.vm.jitpthreadpriority option." 2018-05-17 15:08:01 +00: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
Treehugger Robot
87dc8d6576 Merge "Disable AAPT2 for modules that use missing features" 2018-05-16 19:31:42 +00:00