374057 Commits

Author SHA1 Message Date
Treehugger Robot
3580a6a996 Merge "Prefer default Internet network for upstream tethering." 2018-06-25 12:08:46 +00:00
Erik Kline
72302908d4 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)
2018-06-25 19:25:17 +09:00
Brad Ebinger
8f074959e5 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
2018-06-22 16:14:17 -07:00
Sumit Das
0c7adfae2a 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
2018-06-22 16:08:57 -07:00
David Sehr
de8d0bd931 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)
2018-06-22 23:02:59 +00:00
Jack Yu
5ae46260e4 Merge "Removed dead code in DcTracker"
am: a0b9309ba2

Change-Id: I807835bcc1194f695e5fb30098cc82f50fef5d59
2018-06-21 20:28:45 -07:00
Treehugger Robot
a0b9309ba2 Merge "Removed dead code in DcTracker" 2018-06-22 00:21:43 +00:00
Neil Fuller
d85b36fde3 [automerger skipped] Merge "Trim away some dead code"
am: d6a1657466  -s ours

Change-Id: I7cb1845584c838fe6bcce743d9f3b9944da5d41b
2018-06-21 16:10:26 -07:00
Jack Yu
2de4c6ca12 Removed dead code in DcTracker
This work is part of IWLAN refactoring

Test: Build
Bug: 73659459
Change-Id: I041bdda1e168dde0bf5bff08c8c235986d2d8d7d
2018-06-21 14:56:48 -07:00
zhangkuili
399ac24bdf Merge "[Stability][hwui] check mmap return value"
am: b352dcd153

Change-Id: I8d04c5433ca881e62a23e0aa13e022cdf8d16d9a
2018-06-21 14:53:15 -07:00
Treehugger Robot
d6a1657466 Merge "Trim away some dead code" 2018-06-21 20:15:31 +00:00
Treehugger Robot
b352dcd153 Merge "[Stability][hwui] check mmap return value" 2018-06-21 20:13:36 +00:00
Neil Fuller
f13f8f7165 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
2018-06-21 15:40:47 +01:00
zhangkuili
24a1bc39bb [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>
2018-06-21 17:43:10 +08:00
Neil Fuller
cccc48d0fe 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
2018-06-21 09:30:34 +00:00
Chalard Jean
946957bc32 Merge "Add StackedLinkProperties test case"
am: faf31f8638

Change-Id: I33d75bf593708317dca4ba6cec035b7f035cfa86
2018-06-20 21:23:17 -07:00
Dan Zhang
26f781db62 Merge "Fix <UCP>[Power] toggled the power status"
am: b3eeb859f7

Change-Id: I7f56ece79f0eb10cc27d5c62d1c8300933b1c23b
2018-06-20 21:18:07 -07:00
John Reck
bd31702374 [automerger skipped] Merge "Fix PixelCopyTest failure in CTS"
am: b773556215  -s ours

Change-Id: I6d5d15e89dcf03c8002452018b1e8922890d2814
2018-06-20 21:10:33 -07:00
Chalard Jean
faf31f8638 Merge "Add StackedLinkProperties test case" 2018-06-21 03:39:15 +00:00
Dan Zhang
b3eeb859f7 Merge "Fix <UCP>[Power] toggled the power status" 2018-06-21 02:41:59 +00:00
John Reck
b773556215 Merge "Fix PixelCopyTest failure in CTS" 2018-06-21 00:48:44 +00:00
Romain Guy
0e6f553743 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)
2018-06-20 22:52:35 +00:00
Brad Ebinger
cacc29957a [automerger skipped] Merge "Clean up old Context references in ImsConfig"
am: a54d5e31e3  -s ours

Change-Id: Iab246476747293816b72ef6755ce2c875638179f
2018-06-20 10:45:28 -07:00
Brad Ebinger
a54d5e31e3 Merge "Clean up old Context references in ImsConfig" 2018-06-20 16:43:58 +00:00
Beverly
1382d8d50e resolve merge conflicts
resolve merge conflicts of d9b0bdcbc41e9e57a2fea5424a580c52272852cd
to stage-aosp-master

Bug: none
Test: n/a
Change-Id: I97a0b4dd0736561e5575b1344f37a25847e4703e
2018-06-20 09:26:22 -04:00
Treehugger Robot
d9b0bdcbc4 Merge "Allow apps to queue multiple toast messages." 2018-06-19 22:20:24 +00:00
Colin Cross
234a906ee1 Merge "Don't override targetVers with minCode"
am: 3b0eba4499

Change-Id: Ied3eb76b2b996500c540965d970fc9cc05fccbd9
2018-06-19 13:10:23 -07:00
nharold
df00ad1a4b Merge "Use Uppercase instead of Lowercase for PLMN Decode"
am: e61215cab1

Change-Id: I8c75abbd7574072e9b6c501b5fabf61bf2148592
2018-06-19 11:39:07 -07:00
Colin Cross
3b0eba4499 Merge "Don't override targetVers with minCode" 2018-06-19 18:14:39 +00:00
nharold
e61215cab1 Merge "Use Uppercase instead of Lowercase for PLMN Decode" 2018-06-19 17:16:11 +00:00
Beverly Tai
98efc79f81 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
2018-06-19 14:12:19 +00:00
junyulai
4a192e2bba 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
2018-06-19 16:53:08 +08:00
Jack Yu
65c04cd491 Merge "Fixed the incorrect permission for data/network service binding"
am: a9bf7a8810

Change-Id: Ic3c463d7e7755efcb048e84c338ffbe256475874
2018-06-18 18:49:09 -07:00
Sundong Ahn
9794d2a5b9 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
2018-06-19 10:22:30 +09:00
Treehugger Robot
a9bf7a8810 Merge "Fixed the incorrect permission for data/network service binding" 2018-06-19 00:36:38 +00:00
TreeHugger Robot
669c4d7ae7 Merge "Fix ManifestMerger issues" into stage-aosp-master 2018-06-18 20:15:00 +00:00
Colin Cross
f61f9e3cd9 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
2018-06-18 12:58:11 -07:00
Nan Zhang
0da95a5d64 Merge "Enabled annotations for Metalava based api-stubs."
am: 79d3bf6e54

Change-Id: I8b91e2259ce3b15313d5d4b822bf77696a6ebd5b
2018-06-18 12:13:35 -07:00
Nathan Harold
7a061af317 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)
2018-06-18 11:50:43 -07:00
Treehugger Robot
79d3bf6e54 Merge "Enabled annotations for Metalava based api-stubs." 2018-06-18 16:55:28 +00:00
Chalard Jean
ea044ca373 Merge changes I4b1bca8b,Idb7d2f28,I4825e632
am: 84d4e535ae

Change-Id: I7278ffe7ca8e25b040d6bce7fb880ccf0984f6ee
2018-06-18 03:06:05 -07:00
Chalard Jean
84d4e535ae 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
2018-06-18 09:00:40 +00:00
Andreas Gampe
4afe1f957b Merge "Apf: Avoid constant overflow"
am: 5b99659943

Change-Id: Iacf849e3739f24cd430e6210a2e6a1c67ae0614f
2018-06-18 01:20:28 -07:00
Treehugger Robot
5b99659943 Merge "Apf: Avoid constant overflow" 2018-06-18 06:16:23 +00:00
Christopher Ferris
84c9e9a787 Merge "Use the malloc debug heap dumper."
am: 0ec0c17596

Change-Id: I0f0d6a01a4a0d55f18e3f7b7ac7c64534d4b8f54
2018-06-15 22:41:30 -07:00
Colin Cross
c5e5b64b04 Merge "Fix ManifestMerger issues"
am: 684b5f038b

Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
2018-06-15 16:59:21 -07:00
Colin Cross
ff311dd893 Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in aapt2 integration test libraries so that
the build system doesn't raise the minSdkVersion value specified in
the manifest, which causes ManifestMerger to error when trying to
merge it into a package that specifies a lower minSdkVersion.

Bug: 78447299
Test: m java
Change-Id: If5d4f97bb2d8a503bd3c20f2ea8aea2519c51e85
2018-06-15 23:03:46 +00:00
Christopher Ferris
0ec0c17596 Merge "Use the malloc debug heap dumper." 2018-06-15 21:36:42 +00:00
Jack Yu
063ed82eef Fixed the incorrect permission for data/network service binding
The permission renaming was done in ag/3552774. Other places
need to be fixed accordingly.

Test: Unit tests
Bug: 73659459
Change-Id: Ic325d666c333eef22dba95f8d2488fb172810c2c
2018-06-15 14:34:22 -07:00
Treehugger Robot
684b5f038b Merge "Fix ManifestMerger issues" 2018-06-15 20:47:30 +00:00