OSDN Git Service
Jeff Sharkey [Wed, 28 Mar 2018 20:01:55 +0000 (14:01 -0600)]
API council requested tweaks to NetworkRequest.
If you put values into the Builder, you should be able to observe
those values on the built object.
Clean cherry-pick of ag/
3813257
Test: atest android.net.cts.NetworkRequestTest
Bug:
74945408
Change-Id: Ib28de279efb8b33ab46aa64f580e10fe5f8720e3
Merged-In: I0d090ebb7d57689a061badcf593ae9a37d88f7ce
Merged-In: I539184f7385c1f288cfb77be8307e4463e07e9e6
Pavel Maltsev [Thu, 22 Mar 2018 18:41:32 +0000 (11:41 -0700)]
Add OEM_PAID capability to system api
Some system apps should be able to request OEM_PAID networks. This
makes a lot of sense when Android is used as in-vehicle infotainment
systems.
Clean cherry-pick of ag/
3782591
Bug:
68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: I306f060c5a386ff4b82cd99a03dc037ce60ded6a
Merged-In: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa
Merged-In: I6e9c4130db23a4f1c89ce7e9071ae519a2b0b7ec
mswest46 [Mon, 12 Mar 2018 17:34:34 +0000 (10:34 -0700)]
add airplane mode shell commands to connectivity
Clean cherry-pick of ag/
3718273
Change-Id: I302802afc952b9df7a5544b12d9015091997bd67
Fixes:
74410990
Test: Manually checked that commands enable/disable airplane mode.
Merged-In: I8787d642594e6852bff5b902e8d0fa380ce7c37f
Adam Newman [Fri, 16 Mar 2018 17:36:35 +0000 (10:36 -0700)]
Enable cleartext for captive portal apps
When a user attempts to visit a captive portal the Activity will attempt
to load http://connectivitycheck.gstatic.com/generate_204 and a
walled-garden will typically intercept this and respond with a 302
redirect to a sign-in flow.
The new default of disabling cleartext unless explicitly enabled breaks
captive portal operation. This change enables cleartext for the two
applications that contain a CaptivePortalLoginActivity.
Clean cherry-pick of ag/
3750960
Bug:
75279991
Test: Manually associated with captive portals.
Exempt-From-Owner-Approval: Already approved by owner on pi-dev.
Change-Id: Ib9ea7a8a2aa72b8305fa7044df0e369a57d33953
Merged-In: Ie38d6ce6f54336db2f4672746dc7385e0a7979fb
Merged-In: I742bf6be74a9e6953d0a779bdab0c25cf32aa740
Chad Brubaker [Thu, 8 Mar 2018 18:37:09 +0000 (10:37 -0800)]
Expose CONNECTIVITY_ACTION to Instant Apps
Clean cherry-pick of ag/
3710436
Test: Broadcast is visible to Instant Apps
Bug:
69421898
Change-Id: Ibac92b5aa16bf1538776b90df5dc05362667e785
Merged-In: I0434f8c7292a85e25df3da2858e4d89cf55fab3d
Merged-In: I62ed2107d0b0712267a903e465cbeba6a4f0b346
Eric Enslen [Thu, 8 Feb 2018 02:03:53 +0000 (18:03 -0800)]
fix isActiveNetworkMetered with VPNs
Clean cherry-pick of ag/
3580901
Bug:
72871435
Test: flashed and verified, also ran runtest framework-net
Merged-In: I177eff1237dd59514ccf91397a3d307148bc37b1
Change-Id: Ic5919a32f91f7baee5f1370703ad166e6ea52b58
Treehugger Robot [Fri, 1 Jun 2018 17:21:27 +0000 (17:21 +0000)]
Merge "Fix comments to reflect changes in eth service"
Colin Cross [Thu, 31 May 2018 22:53:37 +0000 (22:53 +0000)]
Merge "Add support for --replace-version to aapt2"
Hall Liu [Thu, 31 May 2018 21:16:05 +0000 (21:16 +0000)]
Merge "Fix MbmsDownloadSession documentation"
Treehugger Robot [Thu, 31 May 2018 19:01:32 +0000 (19:01 +0000)]
Merge "DCB whitelist shortcode for user association"
Pavel Maltsev [Wed, 30 May 2018 19:31:21 +0000 (12:31 -0700)]
Fix comments to reflect changes in eth service
OEMs should be able to set gateway, DNS and domain for their static IP
configuration.
Cherry picked without conflicts.
Bug:
80090920
Test: m
Merged-in: Id7b6d538e2551cbd188821feb4b4feb102e4c751
(cherry picked from commit
d6b0780628bf4f758fd68534b4ecdf2da0fe2a7f)
Change-Id: I347a91e202fb6d6f1ae893c097c7d2e8856a3593
Hall Liu [Wed, 30 May 2018 23:11:11 +0000 (16:11 -0700)]
Fix MbmsDownloadSession documentation
Fix the TODO from forever ago and update the docs for the listener
registration methods.
Change-Id: I1276d0afe430e1b50c0af1fdfacb12a89ea5aa38
Fixes:
80493663
Test: None, comments only
Brad Ebinger [Thu, 31 May 2018 16:45:20 +0000 (16:45 +0000)]
Merge "IMS: Support for Implicit Call Rejection"
Remi NGUYEN VAN [Thu, 31 May 2018 02:23:17 +0000 (02:23 +0000)]
Merge "Add missing dependencies for libdexfile"
Omkar Kolangade [Mon, 2 Apr 2018 19:54:00 +0000 (12:54 -0700)]
IMS: Support for Implicit Call Rejection
Adding an API in MmTelFeature to allow IMS
Service to report the reasons for implicit
call rejections by lower layers. Corresponding
ImsReasonInfo codes are also being added.
The call rejections are not related to any
call session or a call that Framework is aware
of.
Change-Id: Ie47a239856db21e84d199a7620edf7b6ceeb81bc
Colin Cross [Sat, 26 May 2018 05:46:35 +0000 (22:46 -0700)]
Add support for --replace-version to aapt2
Implement --replace-version to match aapt1.
Bug:
79755007
Test: aapt2_tests
Change-Id: Iee2bd9a3981c7d4681509f18b735c6e9e6c1a336
Merged-In: Iee2bd9a3981c7d4681509f18b735c6e9e6c1a336
(cherry picked from commit
dcd58c420771af75c625242985bd96ba828aca56)
Hall Liu [Wed, 30 May 2018 20:24:34 +0000 (20:24 +0000)]
Merge "Add CallAudioState ctor as TestApi"
Treehugger Robot [Wed, 30 May 2018 19:54:42 +0000 (19:54 +0000)]
Merge "Check for bpf support at NetworkStatsService start"
Chenbo Feng [Sat, 19 May 2018 00:10:07 +0000 (17:10 -0700)]
Check for bpf support at NetworkStatsService start
The current implementation check for bpf map existance whenever a
NetworkStats request comes in. The check is not efficient and may
require additional permission for threads. So a member variable is added
to NetworkStatsService to store the bpf configuration status and is
initialized when NetworkStatsService start.
Test: -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
-m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug:
79994577
Change-Id: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
Merged-In: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
Colin Cross [Wed, 30 May 2018 05:01:08 +0000 (05:01 +0000)]
Merge "Use AAPT2 for more modules with manifest validation errors"
Remi NGUYEN VAN [Wed, 30 May 2018 04:52:08 +0000 (13:52 +0900)]
Add missing dependencies for libdexfile
Since a dependency was added to libartbase from libdexfile, this test
has been failing because of the missing deps. As discussed both
libartbase and its non-NDK dependencies need to be added.
Bug: b/
79785496
Bug: b/
80082746
Test: ApfTest and UidRangeTest now pass in master, still pass in aosp
Change-Id: Ia2c140514d7405d701c3ec520b77663abe2b34d5
Treehugger Robot [Wed, 30 May 2018 00:20:36 +0000 (00:20 +0000)]
Merge "Build java.obex with java_sdk_library"
Sundong Ahn [Fri, 18 May 2018 00:58:11 +0000 (09:58 +0900)]
Build java.obex with java_sdk_library
javax.obex is built with java_sdk_library and api files are added by
running "make update-api".
Remove java.obex is from platform.xml, since it will be generated
automatically by soong when the library is built with java_sdk_library.
Bug:
77577799
Test: make -j
make checkapi
Change-Id: Ib94955e62582ffbdfc7eb88cd0e494c61757c7aa
Tobias Thierer [Tue, 29 May 2018 12:11:58 +0000 (12:11 +0000)]
Merge "Track: Revert some needless differences vs upstream in Matcher.java"
Treehugger Robot [Tue, 29 May 2018 02:33:22 +0000 (02:33 +0000)]
Merge "apf: Increase test coverage of LDDW / STDW"
Treehugger Robot [Mon, 28 May 2018 17:00:50 +0000 (17:00 +0000)]
Merge "Do not setForceUse when a2dp config without change"
Jorim Jaggi [Mon, 28 May 2018 10:53:30 +0000 (10:53 +0000)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock"
Colin Cross [Fri, 18 May 2018 16:50:29 +0000 (09:50 -0700)]
Use AAPT2 for more 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: I5f20ca582e481f7dac7b6a236662a2d1f47ea9fa
Tobias Thierer [Sat, 26 May 2018 15:20:20 +0000 (16:20 +0100)]
Track: Revert some needless differences vs upstream in Matcher.java
Android Matcher.start(int) declared "throws IllegalStateException",
which is correct but redundant. Upstream OpenJDK8u121-b13 does not
have this declaration. Another CL in this topic drops the declaration,
without changing behavior.
Bug:
35910877
Test: Treehugger
Change-Id: I59778f13f0df8bd4112af4edc25ee5a93084ae35
Hall Liu [Sat, 12 May 2018 00:14:08 +0000 (17:14 -0700)]
Add CallAudioState ctor as TestApi
Needed for CTS testing
Bug:
79528185
Test: CTS
Change-Id: Iad154257a93cc776d5800527e46e777fd6c88220
Merged-In: Iad154257a93cc776d5800527e46e777fd6c88220
Bryan Henry [Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)]
Merge "Allow changing signing cert for system apps that use shared users"
Treehugger Robot [Fri, 25 May 2018 16:42:59 +0000 (16:42 +0000)]
Merge "Fix: ConnectivityManager is initialized with a wrong context"
Tetsutoki Shiozawa [Mon, 19 Feb 2018 01:24:43 +0000 (10:24 +0900)]
Fix: ConnectivityManager is initialized with a wrong context
ActivityThread#setHttpProxy uses a system context to get
a ConnectivityManager instance. If it's not already cached, the
system service registry will cache this instance initialized
with the system context, and subsequent calls to get this service
will return the bad instance.
This patch uses the application context instead, unless it's
not available for some unlikely reason.
A possible symptom of this issue is to have Bluetooth tethering
failing with a security exception, because it's requested by
the "android" package without system uid.
Merged-In: Ib8815f010883cdb94fcad2cdfb237de39327b20a
Bug:
73572062
Change-Id: Id652c1625194dc73dcbf8dfcad4b4e2e6fbebf4e
Treehugger Robot [Fri, 25 May 2018 10:04:43 +0000 (10:04 +0000)]
Merge changes from topic "location_provider"
* changes:
Remove FlpHardwareProvider
Create the stubs lib for com.android.location.provider
eddy-sh.chen [Fri, 25 May 2018 08:43:08 +0000 (16:43 +0800)]
Do not call finishKeyguardDrawn with PWM's mlock
Otherwise it may cause a deadlock between
PWM's mlock and WMS's mWindowMap.
Just post the work to the policy handler instead.
Bug:
80279029
Change-Id: Idae333687cf5c88e1893ee216c278b9e6c17dd98
Treehugger Robot [Fri, 25 May 2018 08:26:34 +0000 (08:26 +0000)]
Merge "Add permission check to setAllowOnlyVpnForUids"
Jiyong Park [Thu, 8 Mar 2018 07:43:07 +0000 (16:43 +0900)]
Remove FlpHardwareProvider
After Treble's FLP merge into GNSS HAL, the FlpHardwareProvider is just
an empty shell. Removing FusedLocation and/or Flp + Hardware classes
altogether.
Bug:
35726697
Test: m -j
Test: Open Google Map and then walk around. The dot moves as I walk.
Merged-In: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
Change-Id: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
(cherry picked from commit
4cc3a1c056f69ac4da1dc5055c36b7357e9f673c)
Jiyong Park [Tue, 27 Feb 2018 13:00:23 +0000 (22:00 +0900)]
Create the stubs lib for com.android.location.provider
com.android.location.provider.stubs is the stubs library for the shared
library com.android.location.provider. The stubs library is intended to
provide the stable set of APIs to the apps implementing location
provider.
Without the stubs library, apps had to directly link to the shared
library which is built without Android SDK and exposes private APIs that
are not intended to be used by apps. This also has been causing the
lin-type check warnings when the shared lib is used by apps built with
SDK; apps built with SDK is not allowed to link to lib built without
SDK. This has been reported as warnings but will soon be errors. Now
such apps are required to link to the stubs lib, which is built with
SDK.
While building the stubs library, following APIs are made hidden because
they are exposing private APIs from the Android platform.
1) Activity* classes are removed from the API, as they are not intended
to be used by apps since O.
2) GeocodeProvider and GeofenceProvider are removed from the API.
3) LocationProvider.mLocationManager is removed as it is exposing the
private symbol ILocationProvider
4) ProviderPropertiesUnbundle.getProviderProperties are removed from the
API as it is exposing the private symbol ProviderProperties.
5) The constructor of ProviderRequestUnbundled is removed since the
class is intended to be instantiated by the service.
Bug:
71420593
Test: m -j com.android.location.provider.stubs
Merged-In: I20aba7e9ca9c3adc75db241f37a55f0d657f3ced
Change-Id: I20aba7e9ca9c3adc75db241f37a55f0d657f3ced
(cherry picked from commit
eee99986c8021d6825f99a25434725fccf7b2b12)
Remi NGUYEN VAN [Fri, 25 May 2018 03:28:05 +0000 (03:28 +0000)]
Merge "Use AI_ADDRCONFIG for most DNS requests"
Remi NGUYEN VAN [Fri, 25 May 2018 03:27:39 +0000 (03:27 +0000)]
Merge "Migrating remaining core networking tests to Junit4"
zengjing [Fri, 25 May 2018 03:15:20 +0000 (11:15 +0800)]
Do not setForceUse when a2dp config without change
When device connected with wired headset and without any bluetooth
connection, APP may call MediaRouter to setForceUse to set FOR_MEDIA
with FORCE_SPEAKER, then sound be output to SPEAKER. In this case,
if setBluetoothA2dpOn(false) was called, FOR_MEDIA will be set with
FORCE_NONE and sound be output to wird headset.
The issue discussed above occurred on our device. We developed an FM radio APP.
Beforce work, wired headset must be plugged in to be used as antennas. Then we
setForceUse FOR_MEDIA to FORCE_SPEAKER, and audio stream was output to speaker.
At this moment, if we play other sound (such as ScreenCapture sound),
MediaRouterService will detected audio playbacked state changed. Because FM Audio
was not monitor by AudioPlaybackMonitor, there was not any audio playback active.
So, restoreBluetoothA2dp was called in the function of onAudioPlayerActiveStateChanged,
which call AudioService.setBluetoothA2dpOn(false). As a result sound was switch to headset.
There are two solutions to fix our issue.
1) Check a2dp state before setBluetoothA2dpOn in MediaRouterService::restoreBluetoothA2dp,
if a2dp state does not change, setBluetoothA2dpOn should not be called
2) Check a2dp state before setForceUse in AudioService::setBluetoothA2dpOn,
if a2dp state does not change, setForceUse should not be called
Consdering that setBluetoothA2dpOn may be called by other method, we try to fix it
with the second one.
Test: NA
Change-Id: I3a2e64e7d73d9aa9539176fea556feb433cb7211
Signed-off-by: zengjing <zengjing@xiaomi.com>
Treehugger Robot [Thu, 24 May 2018 19:13:19 +0000 (19:13 +0000)]
Merge "Work around b/
24465209, do not pack relocation table."
Treehugger Robot [Thu, 24 May 2018 18:28:59 +0000 (18:28 +0000)]
Merge "Framework: Add API to get zygote PID"
Treehugger Robot [Thu, 24 May 2018 16:55:49 +0000 (16:55 +0000)]
Merge "Use correct filename when adding to ringtone"
Chih-Hung Hsieh [Wed, 23 May 2018 04:37:08 +0000 (21:37 -0700)]
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
Treehugger Robot [Thu, 24 May 2018 10:14:08 +0000 (10:14 +0000)]
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
David Brazdil [Wed, 23 May 2018 14:58:36 +0000 (15:58 +0100)]
DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: Id81271ffe2080091d4e4c3d40325183b086dba8e
David Brazdil [Wed, 23 May 2018 14:54:31 +0000 (15:54 +0100)]
DO NOT MERGE ANYWHERE Sort hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: I8f298371df3efbc3d968c95337e058d6140fe5de
Remi NGUYEN VAN [Thu, 24 May 2018 07:53:00 +0000 (07:53 +0000)]
Merge changes I3b3bcbbd,I18b3f263,I3c416c1a
* changes:
Use CaptivePortalProbeSpec method in portal app
Add configurable captive portal probes
Move CaptivePortalProbeResult to its own file
Hugo Benichi [Thu, 12 Oct 2017 04:04:54 +0000 (13:04 +0900)]
Migrating remaining core networking tests to Junit4
Bug:
62918393
Test: runtest frameworks-net
Merged-In: I30f7eaa0307b8fad5a8de7a0da235a4f76c18677
(clean cherry-pick of I30f7eaa0307b8fad5a8de7a0da235a4f76c18677)
Change-Id: I272fea0bb4a9e7f6252bb3bd14a6b769a082039e
Treehugger Robot [Thu, 24 May 2018 07:07:15 +0000 (07:07 +0000)]
Merge "Fixup SntpClient to bypass Private DNS"
Erik Kline [Tue, 22 May 2018 12:15:49 +0000 (21:15 +0900)]
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
7eccfeb9ca60aa6e09afbdf3a4435cb2f0d12987)
Remi NGUYEN VAN [Tue, 22 May 2018 08:04:17 +0000 (17:04 +0900)]
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
Remi NGUYEN VAN [Tue, 22 May 2018 01:01:53 +0000 (10:01 +0900)]
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
Remi NGUYEN VAN [Tue, 22 May 2018 00:58:19 +0000 (09:58 +0900)]
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
Remi NGUYEN VAN [Tue, 22 May 2018 09:20:51 +0000 (18:20 +0900)]
Use AI_ADDRCONFIG for most DNS requests
Not using it doubles the number of DNS lookups for single-stack
networks.
Private DNS hostname resolution still does not use this flag so that we
get all address families in advance, in case of LinkProperties changes.
Bug: b/
79811321
Test: manual: Captive portal, 464xlat, networking in apps working
Merged-In: I7037342a93dc48b8e0988e719b9a9a2d5055bcf2
Merged-In: I8ca15fa079cd5ff94e4d9f7e0476504769f9708f
(Clean cherry-pick of pi-dev Ib46756e5e5f8d8d2698c90c5183c368d2d44be7a)
Change-Id: Iedb7a9c5f9caeb66de4505189fca8db91013d844
Daisuke Teranishi [Fri, 18 May 2018 00:43:54 +0000 (09:43 +0900)]
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
David Brazdil [Wed, 23 May 2018 16:36:47 +0000 (16:36 +0000)]
Merge "Update hidden API lists in AOSP"
Pete Gillin [Wed, 23 May 2018 15:55:48 +0000 (15:55 +0000)]
Merge "Remove Arrays.checkOffsetAndCount from the greylist."
David Brazdil [Wed, 23 May 2018 14:51:19 +0000 (15:51 +0100)]
Update hidden API lists in AOSP
This should only be merged into AOSP branches
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Test: N/A
Change-Id: Ia9b362cf44821273a8c4d25f73ffd881895e7df1
Pete Gillin [Tue, 22 May 2018 15:00:57 +0000 (16:00 +0100)]
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
094f08bc41d4124aed63123440d9efcafe1f473c)
Change-Id: I60a158654ad962c8e3b5282c035dae0c014903d0
Merged-In: Ic89cf0775170393fe906f581364bff0e852958ef
Jiyong Park [Wed, 23 May 2018 11:35:25 +0000 (11:35 +0000)]
Merge "Shared lib def for org.apache.http.legacy comes from java_sdk_library"
Treehugger Robot [Tue, 22 May 2018 23:15:36 +0000 (23:15 +0000)]
Merge "Reset the profile when system application change version."
Christopher Ferris [Tue, 22 May 2018 19:22:39 +0000 (19:22 +0000)]
Merge "Remove unnecessary references to libunwind."
Treehugger Robot [Tue, 22 May 2018 12:24:33 +0000 (12:24 +0000)]
Merge "PacProcessor: Include libpac as a JNI_SHARED_LIBRARY."
Jiyong Park [Tue, 1 May 2018 14:56:12 +0000 (23:56 +0900)]
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
49c0a869550dc6a80f75fb08fd38e11ee84bc33d)
Christopher Ferris [Mon, 7 May 2018 20:49:34 +0000 (13:49 -0700)]
Remove unnecessary references to libunwind.
Bug:
79209464
Test: Builds.
Change-Id: Ica58edd0d11b54c45b0af8e75eed67936f4309c2
Merged-In: Ica58edd0d11b54c45b0af8e75eed67936f4309c2
(cherry picked from commit
2197eebc6421cc98ee024b195915a97c037f7670)
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."
Eeshan Shrimali [Thu, 17 May 2018 08:02:52 +0000 (01:02 -0700)]
DCB whitelist shortcode for user association
This is to white list short code for DCB user
association for 18Q1. We will only whitelist
code that will actually trigger the premium SMS
warnings. Namely
CL - 9240
NO - 2171
BR - 4141, 8000
FI - 17110
ID - 363
There's also a config update for Thailand (TH).
The rest of the entries are in the bug
BUG:
72942242
Change-Id: I97c1631dc09e0dfcfa3c268f91e3955cab715195
Signed-off-by: Eeshan Shrimali <eeshans@google.com>
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