OSDN Git Service
Amit Mahajan [Fri, 29 Jun 2018 21:05:51 +0000 (14:05 -0700)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming."
am:
c8eb9ef591
Change-Id: I1cc5af7ab6cbb722c14b549047cccd73a5ad9720
Treehugger Robot [Fri, 29 Jun 2018 19:55:16 +0000 (19:55 +0000)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming."
Amit Mahajan [Tue, 5 Jun 2018 23:27:32 +0000 (16:27 -0700)]
Add new carrier config for CDMA registered PLMN when not roaming.
Test: manual
Bug:
80145031
Merged-in: I6533b4097f729df88f287348924563c6f459401c
Change-Id: I6533b4097f729df88f287348924563c6f459401c
(cherry picked from commit
22e89f4773d9cbc8f5911b65b2dae3e3add7bdb6)
Sundong Ahn [Fri, 29 Jun 2018 03:38:09 +0000 (20:38 -0700)]
Merge "Build com.android.future.usb.accessory with java_sdk_library"
am:
10cfc61774
Change-Id: Ie6abdaa1c9f58ada60da5514bbd1ed261d09fd0b
Remi NGUYEN VAN [Fri, 29 Jun 2018 03:34:19 +0000 (20:34 -0700)]
[automerger skipped] Merge "Disable hidden API checks on unit tests"
am:
855f0f03e1 -s ours
Change-Id: I9ad7743e43efd5aaa722e73ea0b2543537d23c50
Treehugger Robot [Fri, 29 Jun 2018 02:51:43 +0000 (02:51 +0000)]
Merge "Build com.android.future.usb.accessory with java_sdk_library"
Remi NGUYEN VAN [Fri, 29 Jun 2018 02:15:47 +0000 (02:15 +0000)]
Merge "Disable hidden API checks on unit tests"
Brad Ebinger [Fri, 29 Jun 2018 00:26:39 +0000 (17:26 -0700)]
Merge "Emergency SMS carrier config flag"
am:
36a9fa62be
Change-Id: If6a2b0316ee0fdac29eedcf77686694f538d5017
Nathan Harold [Thu, 28 Jun 2018 23:26:56 +0000 (16:26 -0700)]
[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
am:
9ca4d43922 -s ours
Change-Id: I2e148a4e55510acf0c0425b7e1ed6cdc1fb9eb34
Brad Ebinger [Thu, 28 Jun 2018 22:16:10 +0000 (22:16 +0000)]
Merge "Emergency SMS carrier config flag"
Nathan Harold [Thu, 28 Jun 2018 22:05:56 +0000 (22:05 +0000)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
Nathan Harold [Tue, 26 Jun 2018 02:13:29 +0000 (19:13 -0700)]
Allow Cell Location for SYSTEM_UID and ROOT_UID
This change permits the system uid and root uid to
access cellular location information via the binder.
Previously this was restricted to the phone uid, but
running with uid=system is a privileged situation,
which makes me think this this wasn't intentional.
Also add a few lines of debug code to make issues
in LocationAccessPolicy easier to track down in the
future.
Bug:
110806860
Test: manual - ran with SL4A as SYSTEM_UID and
verified access to getAllCellInfo.
Merged-In: Ie18be2cd72c49f1859d1434428f82f164bed8756
Change-Id: Ie18be2cd72c49f1859d1434428f82f164bed8756
Tyler Gunn [Wed, 27 Jun 2018 22:28:10 +0000 (15:28 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change"
am:
af228ca978
Change-Id: I49bcddccfa561ee4464ebcb2f8b07612b8e95e65
Nathan Harold [Wed, 27 Jun 2018 20:02:59 +0000 (20:02 +0000)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" into stage-aosp-master
Tyler Gunn [Wed, 27 Jun 2018 20:02:37 +0000 (20:02 +0000)]
Merge "ImsMultiEndPoint - Sip Notify Change"
Brad Ebinger [Wed, 27 Jun 2018 19:46:39 +0000 (12:46 -0700)]
Merge "Telephony: Introduce a base class for ISMS.aidl."
am:
f03b8e2471
Change-Id: I2c155c6bb46baa411f531e411f86efe0e56c20dc
Nathan Harold [Tue, 26 Jun 2018 02:13:29 +0000 (19:13 -0700)]
Allow Cell Location for SYSTEM_UID and ROOT_UID
This change permits the system uid and root uid to
access cellular location information via the binder.
Previously this was restricted to the phone uid, but
running with uid=system is a privileged situation,
which makes me think this this wasn't intentional.
Also add a few lines of debug code to make issues
in LocationAccessPolicy easier to track down in the
future.
Bug:
110806860
Test: manual - ran with SL4A as SYSTEM_UID and
verified access to getAllCellInfo.
Change-Id: Ie18be2cd72c49f1859d1434428f82f164bed8756
Rubin Xu [Wed, 27 Jun 2018 18:27:29 +0000 (11:27 -0700)]
[automerger skipped] Merge "Support seamless handover between VPN fds."
am:
9916d4b3e8 -s ours
Change-Id: Ieac6b403e5c242f161da56a917e55b07badc888d
Brad Ebinger [Wed, 27 Jun 2018 18:24:51 +0000 (18:24 +0000)]
Merge "Telephony: Introduce a base class for ISMS.aidl."
Tobias Thierer [Wed, 27 Jun 2018 18:21:42 +0000 (11:21 -0700)]
Merge "Track dropping of throws clause in Pattern.java."
am:
251a0cfb78
Change-Id: Icb30c1ffaba63d9f633bf45c9af2a949ddbf1fcd
Rubin Xu [Wed, 27 Jun 2018 16:27:26 +0000 (16:27 +0000)]
Merge "Support seamless handover between VPN fds."
Treehugger Robot [Wed, 27 Jun 2018 16:01:14 +0000 (16:01 +0000)]
Merge "Track dropping of throws clause in Pattern.java."
Avinash Nalluri [Sat, 21 Apr 2018 21:06:06 +0000 (14:06 -0700)]
Emergency SMS carrier config flag
Allow send sms over ims to emergency number when the device is in
lte/limited lte mode without normal ims registration.
Modem will use emergency ims pdn to submit sms to network.
Change-Id: I5762102c695fe309a4a5b318abccded5c50154e0
Bug:
110462046
Tobias Thierer [Wed, 27 Jun 2018 15:14:58 +0000 (08:14 -0700)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."
am:
b5f35aeaf3
Change-Id: I55ba23bfae8f578eb75a4cbfeb2ed4ad1492867d
Tobias Thierer [Wed, 27 Jun 2018 13:53:12 +0000 (13:53 +0000)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."
Neil Fuller [Wed, 27 Jun 2018 10:40:06 +0000 (11:40 +0100)]
resolve merge conflicts of
bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib06f2869e5aa1788c8d5fc281a8565420e93d8f7
Neil Fuller [Wed, 27 Jun 2018 08:45:36 +0000 (08:45 +0000)]
Merge "Prepare for migration to the time detector service"
David Sehr [Wed, 27 Jun 2018 00:13:55 +0000 (17:13 -0700)]
[automerger skipped] Merge "Split fork and specialize in zygote"
am:
f40f05229c -s ours
Change-Id: I3d5162e3967503d85aae73fe6bd37e0f50516b9d
Josh Gao [Wed, 27 Jun 2018 00:09:06 +0000 (17:09 -0700)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory."
am:
c00dd28164
Change-Id: I788e8747361a5c0e3324aa7ac88951428b5f0829
Ajay Nambi [Wed, 28 Feb 2018 02:40:14 +0000 (18:40 -0800)]
Telephony: Introduce a base class for ISMS.aidl.
Add a dummy base class implementation for
AIDL APIs defined. Clients can override the
required APIs.
Bug:
73994017
Change-Id: Ifd14e04ae0467a7b963cd993cfd514660f14fa95
Tyler Gunn [Tue, 26 Jun 2018 22:26:09 +0000 (15:26 -0700)]
[automerger skipped] Merge "Update onDeregistered docs to make capability change expectations clear."
am:
690f008e3f -s ours
Change-Id: Ibb2c56554f0df15cf287c90aa1f183674e948f3d
David Sehr [Tue, 26 Jun 2018 22:02:16 +0000 (22:02 +0000)]
Merge "Split fork and specialize in zygote"
Treehugger Robot [Tue, 26 Jun 2018 21:38:14 +0000 (21:38 +0000)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory."
Tyler Gunn [Tue, 26 Jun 2018 21:14:27 +0000 (21:14 +0000)]
Merge "Update onDeregistered docs to make capability change expectations clear."
TreeHugger Robot [Tue, 26 Jun 2018 20:49:15 +0000 (20:49 +0000)]
Merge "services.core.unboosted: hidl manager->static_libs" into stage-aosp-master
David Sehr [Wed, 23 May 2018 22:23:01 +0000 (15:23 -0700)]
Split fork and specialize in zygote
Separate the portions of the zygote jni library that perform forking
from specialization into system_server or app process. This is a small
step towards separating forking into a pre-launch activity, possibly
with a pool of pre-application processes.
Bug:
68253328
Test: boot and run
Change-Id: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
Merged-In: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
Josh Gao [Tue, 26 Jun 2018 18:41:34 +0000 (11:41 -0700)]
Fix memory leak in RenderThread::dumpGraphicsMemory.
This would have been a double-close of fd, except we just leak the
FILE* instead.
Test: treehugger
Change-Id: I519366fbcf0eb6f03f79c22abfa2b1b1b493a70a
David Sehr [Tue, 26 Jun 2018 16:34:43 +0000 (16:34 +0000)]
Merge "Split fork and specialize in zygote" into stage-aosp-master
Steven Moreland [Mon, 25 Jun 2018 19:42:51 +0000 (12:42 -0700)]
services.core.unboosted: hidl manager->static_libs
Bug:
77307025
Test: boot device w/o hidl libs on boot classpath, no loading
error
Change-Id: Iae2b0015a29de71c22e6bc31004613bbf4ca971b
Tobias Thierer [Thu, 21 Jun 2018 15:59:18 +0000 (16:59 +0100)]
Track dropping of throws clause in Pattern.java.
This is not really an API change because PatternSyntaxException
is unchecked (extends RuntimeException). The behavior has not
changed (PatternSyntaxException can still be thrown).
Bug:
109659282
Test: Treehugger
Change-Id: I5759eee10b27307b68f15fdd6f6f1a258ee01529
Tobias Thierer [Thu, 21 Jun 2018 09:31:39 +0000 (10:31 +0100)]
TextUtils: track behavior change of Pattern.split() when targeting > 28.
Another CL in this topic changes the behavior of String.split() and
Pattern.split() to omit a "" generated by a leading zero-width match.
TextUtils.split() is implemented on top of these methods and therefore
adopts the behavior change by default.
The behavior change only affects apps targeting API versions > 28.
Test: cts-tradefed run singleCommand cts-dev -m CtsTextTestCases \
-t android.text.cts.TextUtilsTest
Test: cts-tradefed run singleCommand cts-dev -m CtsLibcoreTestCases
Bug:
109659282
Change-Id: I8abe251353f8eacf1429ac9a8e272d50a0944c29
Neil Fuller [Tue, 26 Jun 2018 12:14:31 +0000 (05:14 -0700)]
Merge "Add more behavior to TimeDetectorService"
am:
b1fc5a4c7e
Change-Id: Ibbda2d253bf807cc480a4218aa1d898d6737ec7b
Neil Fuller [Tue, 26 Jun 2018 10:55:46 +0000 (11:55 +0100)]
resolve merge conflicts of
55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie524607cabc6688911eee7e4f61c50fd406c71f4
Neil Fuller [Thu, 21 Jun 2018 14:16:36 +0000 (15:16 +0100)]
Prepare for migration to the time detector service
Paves the way for moving more behavior to the time detector
service from the NetworkTimeUpdateService.
The NewNetworkTimeUpdateService is effectively identical to
the OldNetworkTimeUpdateService in this initial commit.
Bug:
78217059
Test: build / boot
Merged-In: Ica9fa9b61c849e034d76c0faae5693b60a4a197f
Change-Id: Ica9fa9b61c849e034d76c0faae5693b60a4a197f
Neil Fuller [Tue, 26 Jun 2018 08:43:55 +0000 (08:43 +0000)]
Merge "Add more behavior to TimeDetectorService"
Neil Fuller [Tue, 26 Jun 2018 08:34:56 +0000 (08:34 +0000)]
Merge "Minimum viable TimeZoneDetectorService"
Erik Kline [Tue, 26 Jun 2018 08:32:31 +0000 (01:32 -0700)]
Merge "Make auto-upstream the default tethering behaviour"
am:
e193298c4a
Change-Id: Ie160bb6422f7a8f218dbf1374fdfadb0b957150d
Treehugger Robot [Tue, 26 Jun 2018 07:11:02 +0000 (07:11 +0000)]
Merge "Make auto-upstream the default tethering behaviour"
Amit Mahajan [Mon, 25 Jun 2018 23:31:55 +0000 (16:31 -0700)]
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()"
am:
3838ff457e
Change-Id: I46a8a708e949e134b8e4cb05fe315b058ad500fc
Treehugger Robot [Mon, 25 Jun 2018 22:22:25 +0000 (22:22 +0000)]
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()"
Brad Ebinger [Mon, 25 Jun 2018 18:45:32 +0000 (11:45 -0700)]
Merge "Fix Possible Deadlock with getFeatureState"
am:
6bebb8418c
Change-Id: I675c116e54d961971d4a32f87dd247cca51b5069
Neil Fuller [Tue, 12 Jun 2018 20:06:20 +0000 (21:06 +0100)]
Add more behavior to TimeDetectorService
The client code now "suggests" time updates
to the time detection service. The current implementation
of the time detection service will validate and set the
device system clock as needed. In future it will ignore
these suggestions if better information is available.
Responsibility for sending the
TelephonyIntents.ACTION_NETWORK_SET_TIME intent has
been moved to the time detection service until it can be
removed or replaced.
The telephony code is still responsible for basic rate
limiting but the majority of the decision logic has been
moved to the service.
There is an associated change in telephony code to switch to
using the server.
Bug:
78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Change-Id: I4f7a10ac06b2d32da22689e1ddf309e0a2795f30
Brad Ebinger [Mon, 25 Jun 2018 17:30:02 +0000 (17:30 +0000)]
Merge "Fix Possible Deadlock with getFeatureState"
Erik Kline [Mon, 25 Jun 2018 13:24:22 +0000 (06:24 -0700)]
Merge "Prefer default Internet network for upstream tethering."
am:
3580a6a996
Change-Id: I0990d077627aed71b03e7aa40a8acc460448a774
Erik Kline [Mon, 25 Jun 2018 12:58:04 +0000 (21:58 +0900)]
Make auto-upstream the default tethering behaviour
Test: as follows
- built
- flashed
- booted
- runtest --no-hidden-api-checks frameworks-net
Bug:
32163131
Bug:
62648872
Bug:
63282480
Bug:
110118584
Change-Id: I3af6594cd16ecefa3d4a44902f2138fa635fbae1
Treehugger Robot [Mon, 25 Jun 2018 12:08:46 +0000 (12:08 +0000)]
Merge "Prefer default Internet network for upstream tethering."
Erik Kline [Thu, 14 Jun 2018 08:36:40 +0000 (17:36 +0900)]
Prefer default Internet network for upstream tethering.
Rather than use the crufty config.xml list of upstream transport types,
use ConnectivityService's notion of the default network for the upstream.
In cases where a DUN network is required and the default network is
currently a mobile network, look for a DUN network (code in Tethering
is currently responsible for requesting one).
Test: as follows
- built, flashed, booted
- runtest frameworks-net
- tethered via mobile, joined captive portal network, maintained
laptop access via mobile until captive passed (then used wifi)
- disabled client mode wifi, disabled mobile data, plugged in
ethernet adapter, observed connectivity via ethernet
Bug:
32163131
Bug:
62648872
Bug:
63282480
Bug:
109786760
Bug:
110118584
Bug:
110260419
Merged-In: I9cddf1fb7aa3b8d56bf048c563556244e74808c2
Merged-In: Icac3e5e20e99093ddb85aae1ca07ed7b5cf309fd
Change-Id: I925b75994e31df8046f3ef9916a2457b4210485e
(cherry picked from commit
4080a1bd15572caf149762e45c958627feceb74d)
Brad Ebinger [Thu, 21 Jun 2018 17:18:21 +0000 (10:18 -0700)]
Fix Possible Deadlock with getFeatureState
Use the ImsFeature lock for concurrency in MmTelFeature
instead of declaring its own lock.
Also, fixed up some other concurrency code.
Bug:
110507525
Test: Manual, Telephony Unit Tests
Change-Id: I5a7ef1beca619873a7c228bed0e1b82843d4de63
Sumit Das [Fri, 22 Jun 2018 23:08:57 +0000 (16:08 -0700)]
ImsMultiEndPoint - Sip Notify Change
-Propagate the local-identity field to AOSP to help differentiate
between local calls and calls on secondary devices
Change-Id: I78c8f721dcffa167c7d65c474f13a8a377e4cd39
David Sehr [Fri, 22 Jun 2018 17:45:36 +0000 (10:45 -0700)]
Split fork and specialize in zygote
Separate the portions of the zygote jni library that perform forking
from specialization into system_server or app process. This is a small
step towards separating forking into a pre-launch activity, possibly
with a pool of pre-application processes.
Bug:
68253328
Test: boot and run
Change-Id: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
(cherry picked from commit
c5c8bcd506f081180660ad8714adb9ee8a5176e9)
Jack Yu [Fri, 22 Jun 2018 03:28:45 +0000 (20:28 -0700)]
Merge "Removed dead code in DcTracker"
am:
a0b9309ba2
Change-Id: I807835bcc1194f695e5fb30098cc82f50fef5d59
Treehugger Robot [Fri, 22 Jun 2018 00:21:43 +0000 (00:21 +0000)]
Merge "Removed dead code in DcTracker"
Neil Fuller [Thu, 21 Jun 2018 23:10:26 +0000 (16:10 -0700)]
[automerger skipped] Merge "Trim away some dead code"
am:
d6a1657466 -s ours
Change-Id: I7cb1845584c838fe6bcce743d9f3b9944da5d41b
Jack Yu [Thu, 21 Jun 2018 21:56:48 +0000 (14:56 -0700)]
Removed dead code in DcTracker
This work is part of IWLAN refactoring
Test: Build
Bug:
73659459
Change-Id: I041bdda1e168dde0bf5bff08c8c235986d2d8d7d
zhangkuili [Thu, 21 Jun 2018 21:53:15 +0000 (14:53 -0700)]
Merge "[Stability][hwui] check mmap return value"
am:
b352dcd153
Change-Id: I8d04c5433ca881e62a23e0aa13e022cdf8d16d9a
Treehugger Robot [Thu, 21 Jun 2018 20:15:31 +0000 (20:15 +0000)]
Merge "Trim away some dead code"
Treehugger Robot [Thu, 21 Jun 2018 20:13:36 +0000 (20:13 +0000)]
Merge "[Stability][hwui] check mmap return value"
Neil Fuller [Fri, 24 Nov 2017 08:51:40 +0000 (08:51 +0000)]
Trim away some dead code
The time zone listening is currently unused so can
be removed. Also removed an unused constant and made a
constant final.
Bug:
63743683
Test: Build
Merged-In: I15870a025e9acac597edd914c9e59df415108586
Change-Id: I15870a025e9acac597edd914c9e59df415108586
zhangkuili [Tue, 29 May 2018 02:23:29 +0000 (10:23 +0800)]
[Stability][hwui] check mmap return value
If mmap failed, it return -1 (MAP_FAILED)
Bug:
110507462
Test: manual
Change-Id: I3d0bac2e7c8b0bdc9cfb4ebb7b766d858876679d
Signed-off-by: zhangkuili <zhangkuili@xiaomi.com>
Neil Fuller [Tue, 19 Jun 2018 11:53:47 +0000 (12:53 +0100)]
Minimum viable TimeZoneDetectorService
This is a do-nothing TimeZoneDetectorService that can be
populated in following commits. A temporary method has been
added so the service has one method.
Unit tests can be run with:
atest FrameworksServicesTests:TimeZoneDetectorServiceTest
Test: build / boot
Test: See above
Merged-In: I565fb5dd2f18b7aac2e5779d346bfe69e9da02af
Change-Id: I565fb5dd2f18b7aac2e5779d346bfe69e9da02af
Chalard Jean [Thu, 21 Jun 2018 04:23:17 +0000 (21:23 -0700)]
Merge "Add StackedLinkProperties test case"
am:
faf31f8638
Change-Id: I33d75bf593708317dca4ba6cec035b7f035cfa86
Dan Zhang [Thu, 21 Jun 2018 04:18:07 +0000 (21:18 -0700)]
Merge "Fix <UCP>[Power] toggled the power status"
am:
b3eeb859f7
Change-Id: I7f56ece79f0eb10cc27d5c62d1c8300933b1c23b
John Reck [Thu, 21 Jun 2018 04:10:33 +0000 (21:10 -0700)]
[automerger skipped] Merge "Fix PixelCopyTest failure in CTS"
am:
b773556215 -s ours
Change-Id: I6d5d15e89dcf03c8002452018b1e8922890d2814
Chalard Jean [Thu, 21 Jun 2018 03:39:15 +0000 (03:39 +0000)]
Merge "Add StackedLinkProperties test case"
Dan Zhang [Thu, 21 Jun 2018 02:41:59 +0000 (02:41 +0000)]
Merge "Fix <UCP>[Power] toggled the power status"
John Reck [Thu, 21 Jun 2018 00:48:44 +0000 (00:48 +0000)]
Merge "Fix PixelCopyTest failure in CTS"
Romain Guy [Wed, 1 Nov 2017 16:50:28 +0000 (09:50 -0700)]
Fix PixelCopyTest failure in CTS
This feature needs support for renderable float textures, but the checks
were only guaranteeing support for float texture reads.
Bug:
68754504
Test: CtsViewTestCases
Change-Id: I0ce4a81cb8e09c10a5f1e65234685767a24ef8c4
Merged-In: I0ce4a81cb8e09c10a5f1e65234685767a24ef8c4
(cherry picked from commit
8472ac67fd1d815022874f5addace0c4334ae9f6)
(cherry picked from commit
8dc7f8275e5ba9004d219d7d7d990e91fc702095)
Brad Ebinger [Wed, 20 Jun 2018 17:45:28 +0000 (10:45 -0700)]
[automerger skipped] Merge "Clean up old Context references in ImsConfig"
am:
a54d5e31e3 -s ours
Change-Id: Iab246476747293816b72ef6755ce2c875638179f
Brad Ebinger [Wed, 20 Jun 2018 16:43:58 +0000 (16:43 +0000)]
Merge "Clean up old Context references in ImsConfig"
Beverly [Wed, 20 Jun 2018 13:25:51 +0000 (09:25 -0400)]
resolve merge conflicts
resolve merge conflicts of
d9b0bdcbc41e9e57a2fea5424a580c52272852cd
to stage-aosp-master
Bug: none
Test: n/a
Change-Id: I97a0b4dd0736561e5575b1344f37a25847e4703e
Treehugger Robot [Tue, 19 Jun 2018 22:20:24 +0000 (22:20 +0000)]
Merge "Allow apps to queue multiple toast messages."
Colin Cross [Tue, 19 Jun 2018 20:10:23 +0000 (13:10 -0700)]
Merge "Don't override targetVers with minCode"
am:
3b0eba4499
Change-Id: Ied3eb76b2b996500c540965d970fc9cc05fccbd9
nharold [Tue, 19 Jun 2018 18:39:07 +0000 (11:39 -0700)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode"
am:
e61215cab1
Change-Id: I8c75abbd7574072e9b6c501b5fabf61bf2148592
Colin Cross [Tue, 19 Jun 2018 18:14:39 +0000 (18:14 +0000)]
Merge "Don't override targetVers with minCode"
nharold [Tue, 19 Jun 2018 17:16:11 +0000 (17:16 +0000)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode"
Beverly Tai [Mon, 11 Jun 2018 14:50:36 +0000 (14:50 +0000)]
Allow apps to queue multiple toast messages.
This reverts commit
4ee785b698211b5ccce104e226b073ffbb12df55.
Test: manual
Bug:
70864097
Reason for revert: Apps should use the same toast for same message
Change-Id: I1dfacef240f9b6548ff30a45da1d843047bf4e90
junyulai [Wed, 13 Jun 2018 07:00:37 +0000 (15:00 +0800)]
Add StackedLinkProperties test case
Change access level of getNetworkAgentInfoForNetwork in ConnectivityService to get
better testability. And add test case to verify clat state transition and make sure
linkProperties are updated correctly.
Bug:
80261579,
109913107
Test: runtest frameworks-net -c com.android.server.ConnectivityServiceTest \
-m testStackedLinkProperties
Change-Id: I72fce594d74bd349f65557edca03640e1b86317c
Jack Yu [Tue, 19 Jun 2018 01:49:09 +0000 (18:49 -0700)]
Merge "Fixed the incorrect permission for data/network service binding"
am:
a9bf7a8810
Change-Id: Ic3c463d7e7755efcb048e84c338ffbe256475874
Sundong Ahn [Mon, 4 Jun 2018 05:05:57 +0000 (14:05 +0900)]
Build com.android.future.usb.accessory with java_sdk_library
com.android.future.usb.accessory is built with java_sdk_library and api
files are added by running "make update-api".
Bug:
77577799
Test: make -j
Test: make checkapi
Test: adb shell cmd package list libraries |\
grep com.android.future.usb.accessory
And check the com.android.future.usb.accessory library
Change-Id: I21c635c06ab809b3d1b34b2a8de055fa20d9b066
Treehugger Robot [Tue, 19 Jun 2018 00:36:38 +0000 (00:36 +0000)]
Merge "Fixed the incorrect permission for data/network service binding"
TreeHugger Robot [Mon, 18 Jun 2018 20:15:00 +0000 (20:15 +0000)]
Merge "Fix ManifestMerger issues" into stage-aosp-master
Colin Cross [Mon, 18 Jun 2018 18:47:45 +0000 (11:47 -0700)]
Don't override targetVers with minCode
If a package contains minSdkVersion="Q" targetSdkVersion="25",
targetCode will be initialized to "Q" when reading minCode,
but targetVers will be set to "25". targetCode overrides
targetVers, so this results in the computed targetSdkVersion
being "Q". If minSdkVersion were instead "28", the computed
targetSdkVersion would be "Q".
Make the computed targetSdkVersion consistent by leaving
targetCode and targetVers unset while parsing minSdkVersion,
and then setting them to minCode and minVers if there is
no targetSdkVersion attribute.
Bug:
110167203
Bug:
110353795
Test: install DeviceHealthChecks, verify targetSdk=25
Change-Id: I9547e9b4720543f0c892cbf4de92888c8eead44f
Nan Zhang [Mon, 18 Jun 2018 19:13:35 +0000 (12:13 -0700)]
Merge "Enabled annotations for Metalava based api-stubs."
am:
79d3bf6e54
Change-Id: I8b91e2259ce3b15313d5d4b822bf77696a6ebd5b
Nathan Harold [Thu, 7 Jun 2018 23:00:22 +0000 (16:00 -0700)]
Use Uppercase instead of Lowercase for PLMN Decode
A change to IccUtils converted from using lowercase
to uppercase and broke the PLMN trimming logic.
This resolves bugs where the platform may report
5-digit PLMNs with an invalid trailing 'F' character.
This fixes an issue introduced by aosp/575243, which
impacts the Manual Network Selection menu and
the public API.
Bug:
79561854
Test: compilation
Merged-In: I5ea7867cd9c11fe4454188fd1f30bf58b2911712
Change-Id: I5ea7867cd9c11fe4454188fd1f30bf58b2911712
(cherry picked from commit
b70fbc85f7496dd1b43ed70f0c480184ba5e9585)
Treehugger Robot [Mon, 18 Jun 2018 16:55:28 +0000 (16:55 +0000)]
Merge "Enabled annotations for Metalava based api-stubs."
Chalard Jean [Mon, 18 Jun 2018 10:06:05 +0000 (03:06 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
am:
84d4e535ae
Change-Id: I7278ffe7ca8e25b040d6bce7fb880ccf0984f6ee
Chalard Jean [Mon, 18 Jun 2018 09:00:40 +0000 (09:00 +0000)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
* changes:
[PT09] Add javadoc comments to all ProxyTracker methods/members.
[PT08] Move setDefaultProxy to ProxyTracker
[PT07] Small cleanup of setGlobalProxy
Andreas Gampe [Mon, 18 Jun 2018 08:20:28 +0000 (01:20 -0700)]
Merge "Apf: Avoid constant overflow"
am:
5b99659943
Change-Id: Iacf849e3739f24cd430e6210a2e6a1c67ae0614f
Treehugger Robot [Mon, 18 Jun 2018 06:16:23 +0000 (06:16 +0000)]
Merge "Apf: Avoid constant overflow"
Christopher Ferris [Sat, 16 Jun 2018 05:41:30 +0000 (22:41 -0700)]
Merge "Use the malloc debug heap dumper."
am:
0ec0c17596
Change-Id: I0f0d6a01a4a0d55f18e3f7b7ac7c64534d4b8f54