OSDN Git Service
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
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
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
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>
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
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
Colin Cross [Fri, 15 Jun 2018 23:59:21 +0000 (16:59 -0700)]
Merge "Fix ManifestMerger issues"
am:
684b5f038b
Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
Colin Cross [Thu, 14 Jun 2018 22:23:21 +0000 (15:23 -0700)]
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
Christopher Ferris [Fri, 15 Jun 2018 21:36:42 +0000 (21:36 +0000)]
Merge "Use the malloc debug heap dumper."
Jack Yu [Fri, 15 Jun 2018 21:34:22 +0000 (14:34 -0700)]
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
Treehugger Robot [Fri, 15 Jun 2018 20:47:30 +0000 (20:47 +0000)]
Merge "Fix ManifestMerger issues"
Christopher Ferris [Wed, 13 Jun 2018 20:19:57 +0000 (13:19 -0700)]
Use the malloc debug heap dumper.
Instead of having the malloc debug heap dump code live in frameworks
code, call into malloc debug to do the dump.
Test: Ran am dumpheap -n <PID> <FILE> of a process with and without
Test: malloc debug enabled.
Change-Id: I7911a3ee7dcbc79dd11003a24e27ff99c8301d43
Merged-In: I7911a3ee7dcbc79dd11003a24e27ff99c8301d43
(cherry picked from commit
38e2c3bc9c50770aa5efce47f90fbcfcdda523de)
Sundong Ahn [Fri, 15 Jun 2018 04:59:40 +0000 (21:59 -0700)]
Merge "Build com.android.location.provider with java_sdk_library"
am:
aa5d8dfeb0
Change-Id: I53720ed4fcbe9f00f2f1f607d07efa9adaaf7bb4
Bernie Innocenti [Fri, 15 Jun 2018 04:55:53 +0000 (21:55 -0700)]
Merge "Make dumpHexString() tolerate null arrays."
am:
a917c1db32
Change-Id: Ib0160e232cab0a713853a65eef26f7a02d65c1f1
Treehugger Robot [Fri, 15 Jun 2018 03:41:18 +0000 (03:41 +0000)]
Merge "Build com.android.location.provider with java_sdk_library"
Treehugger Robot [Fri, 15 Jun 2018 02:32:54 +0000 (02:32 +0000)]
Merge "Make dumpHexString() tolerate null arrays."
Colin Cross [Thu, 14 Jun 2018 22:23:21 +0000 (15:23 -0700)]
Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in SettingsLib 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: Ie2c2458647cd6495418999b35894dc92343992cc
Neil Fuller [Thu, 14 Jun 2018 21:15:04 +0000 (14:15 -0700)]
Merge "Clear calling identity before doing any work"
am:
31686e954a
Change-Id: I144fd2b5f46ce7d7a06195a2dd5207d44cd951f0
Treehugger Robot [Thu, 14 Jun 2018 19:13:29 +0000 (19:13 +0000)]
Merge "Clear calling identity before doing any work"
Neil Fuller [Wed, 13 Jun 2018 15:56:38 +0000 (16:56 +0100)]
Clear calling identity before doing any work
This makes sure that the system server is credited/blamed
for the logic being executed.
Test: (internal) atest FrameworksServicesTests:com.android.server.timedetector
Bug:
78217059
Change-Id: Ie2586cf0d983e9aef9371d6db285c8420e9c8dc0
Andreas Gampe [Wed, 13 Jun 2018 18:35:16 +0000 (11:35 -0700)]
Apf: Avoid constant overflow
The used constant overflows. This is irrelevant to the test, so
decrease test constant.
Bug:
110155920
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Idfc7e987ba9c36389a20c7fc01b1161ef89483d8
Bernie Innocenti [Thu, 14 Jun 2018 08:55:58 +0000 (17:55 +0900)]
Make dumpHexString() tolerate null arrays.
Rationale: hexdumps are mainly used when verbose logging is enabled,
which means that callers are rarely exercised (let alone tested).
Crashing on unchecked null pointers doesn't make debugging any easier,
nor production code any more robust.
Moreover, this is the behavior of system.out.println() and other
logging APIs.
Test: runtest -x core/tests/coretests/src/com/android/internal/util/HexDumpTest.java
Bug:
110177912
Change-Id: Idccd81a5654ed0f7fee6b27177941bf8c311973e
Neil Fuller [Thu, 14 Jun 2018 09:40:17 +0000 (02:40 -0700)]
Merge "Add TimestampedValue.toString()"
am:
bfa58946f7
Change-Id: I38760ef47ba04f20882a467857e7c57c088d4391
Neil Fuller [Thu, 14 Jun 2018 08:21:27 +0000 (08:21 +0000)]
Merge "Add TimestampedValue.toString()"
Nan Zhang [Thu, 14 Jun 2018 00:38:37 +0000 (17:38 -0700)]
Enabled annotations for Metalava based api-stubs.
Test: m -j metalava-api-stubs-docs
Bug: b/
78245848
Change-Id: I4ba661900a52f246fc0191c31aabfc96b89fa2db
Pengquan Meng [Wed, 13 Jun 2018 22:33:08 +0000 (15:33 -0700)]
Merge changes from topic "clean"
am:
9f2362bb82
Change-Id: I9a0554d7cacd8c02d78ad08b7d05b074720dfe2a
Benjamin Miller [Wed, 13 Jun 2018 22:26:20 +0000 (15:26 -0700)]
[automerger skipped] Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
am:
ce3d429832 -s ours
Change-Id: If38c9f39b28e39f26481671bfc7f293e321a26d9
Pengquan Meng [Wed, 13 Jun 2018 20:47:13 +0000 (20:47 +0000)]
Merge changes from topic "clean"
* changes:
Remove internal ApnSetting.
Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
Evan Laird [Wed, 13 Jun 2018 15:56:41 +0000 (08:56 -0700)]
Merge "Use disableForUser in StatusBarManager"
am:
5392d799ab
Change-Id: I346f8a17d43e65c6e9ed362942345146ad6cac1d
Neil Fuller [Wed, 13 Jun 2018 14:23:32 +0000 (15:23 +0100)]
Add TimestampedValue.toString()
To make debug logging useful.
Bug:
78217059
Test: Build
Change-Id: I710b56d189afeb26ac50f55d9286d04219779ee7
Treehugger Robot [Wed, 13 Jun 2018 14:19:32 +0000 (14:19 +0000)]
Merge "Use disableForUser in StatusBarManager"
yuemingw [Wed, 13 Jun 2018 11:32:13 +0000 (12:32 +0100)]
Remove internal ApnSetting.
Bug:
77511388
Test: atest FrameworksTelephonyTests
Change-Id: I0da354c7d55ac49f90ca1376e8f2034e65e4e274
Merged-In: I9757ef4aae269d828c98a7363c98629c9be74846
Benjamin Miller [Thu, 7 Jun 2018 19:10:08 +0000 (19:10 +0000)]
Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
Doc-only change.
Also improved the class descriptions and fixed some typos.
Bug:
80238372
Test: make ds-docs with visual inspection of generated HTML
Change-Id: I460d70d692cc1a04cf0efd6b9d0b1e13a9403968
Merged-In: Id4a00c1a44dc3cbbaefc94c0438eb1a077f06e5e
Andreas Gampe [Tue, 12 Jun 2018 21:58:00 +0000 (14:58 -0700)]
[automerger skipped] Merge "Frameworks: Remove complex boolean"
am:
16eef1aad8 -s ours
Change-Id: I407b42d45738599955bca210b5f9896753e51224
Mark Salyzyn [Tue, 12 Jun 2018 21:14:03 +0000 (14:14 -0700)]
Merge "persist.sys.boot.reason is cleared once read by bootstat"
am:
8ec0c6ba48
Change-Id: Ib52e362e07a81086e142ff1f120a266862f0a073
Treehugger Robot [Tue, 12 Jun 2018 19:24:19 +0000 (19:24 +0000)]
Merge "Frameworks: Remove complex boolean"
Neil Fuller [Tue, 12 Jun 2018 19:10:22 +0000 (20:10 +0100)]
Fix a syntax error in SystemServiceRegistry
The syntax error was introduced by a bad conflict resolution
in http://ag/
4324946.
Bug:
110097023
Test: Inspection only
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I546f2d010faa6f75033cf7e3e51ef7ed640854ed
Treehugger Robot [Tue, 12 Jun 2018 19:19:57 +0000 (19:19 +0000)]
Merge "persist.sys.boot.reason is cleared once read by bootstat"
Evan Laird [Tue, 29 May 2018 21:28:58 +0000 (17:28 -0400)]
Use disableForUser in StatusBarManager
If a secondary user is added to the device and in the middle of SUW, the
SUW process can be killed via ADB. This will cause the process to get
restarted and call StatusBarManager#disable()/disable2(), which uses the
StatusBarManagerService methods that use the current uid.
The fix is to use Binder.getCallingUserHandle() in StatusBarManager so that the
SUW from another user can't affect the current user unless it is
current.
Test: start SUW from new user, cancel set up and go back to primary
user. Kill the SUW process. Nav bars remain un-hidden
Change-Id: Ie6f648827d8d384ae87f74e2d746b7566a7b9011
Fixes:
78360699
Neil Fuller [Tue, 12 Jun 2018 18:17:51 +0000 (11:17 -0700)]
Merge "Simple pass-through TimeDetectorService"
am:
cb749e2e50
Change-Id: Ic2e3d3c3f9181ef4054f599baf4ac086ec21d8bd
Andreas Gampe [Tue, 12 Jun 2018 17:37:04 +0000 (10:37 -0700)]
Frameworks: Remove complex boolean
To allow an Errorprone warning to become an error.
Bug:
72451126
Test: m
Change-Id: I8733f0ee74de615e4ffc979fb9de38730c2506c6
Merged-In: Ia6856157e8813856268fba003e1e591d690cb26e
Treehugger Robot [Tue, 12 Jun 2018 17:01:25 +0000 (17:01 +0000)]
Merge "Simple pass-through TimeDetectorService"
Neil Fuller [Fri, 8 Jun 2018 17:44:49 +0000 (18:44 +0100)]
Simple pass-through TimeDetectorService
This is sufficient to wire up time detection from telephony
to the new service without breaking time detection.
This cherry-pick contains a small change: to use
SystemClock.elapsedRealtime() instead of the newer
SystemClock.elapsedRealtimeClock() with Clock.millis().
Bug:
78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Merged-In: Id7175878dc22e5272c31f3e478af4b0e4183b62b
Change-Id: Id7175878dc22e5272c31f3e478af4b0e4183b62b
(cherry picked from commit
24836bfb1564b1f98c322108a924965a8dbbee4f)
Chalard Jean [Tue, 12 Jun 2018 13:57:33 +0000 (06:57 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
am:
6c0106b57f
Change-Id: I86bc83e2bd859b48017f12832e9ff0080ec162b8
Neil Fuller [Tue, 12 Jun 2018 13:14:13 +0000 (14:14 +0100)]
resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790
Chalard Jean [Tue, 12 Jun 2018 12:23:59 +0000 (12:23 +0000)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
* changes:
[PT06] Move setGlobalProxy into ProxyTracker
[PT05] Move sendProxyBroadcast into ProxyTracker.
[PT04] Move PacManager into ProxyTracker.
[PT03] Move some more code into ProxyTracker.
[PT02] Move static methods to ProxyTracker
[PT01] Introduce ProxyTracker
Remove a useless parameter.
Small cleanup of Network.
Cleanup of LinkProperties.
Chalard Jean [Fri, 8 Jun 2018 03:41:21 +0000 (12:41 +0900)]
[PT09] Add javadoc comments to all ProxyTracker methods/members.
Also rename some vars and inline a function that is now private.
Test: runtest
Change-Id: I4b1bca8b29f46d97056973cd38ed8effc3f5b591
Chalard Jean [Fri, 8 Jun 2018 03:20:15 +0000 (12:20 +0900)]
[PT08] Move setDefaultProxy to ProxyTracker
Test: runtest
Change-Id: Idb7d2f2895aac63d54e3a6481379b739a726eff6
Chalard Jean [Thu, 7 Jun 2018 09:37:59 +0000 (18:37 +0900)]
[PT06] Move setGlobalProxy into ProxyTracker
Test: runtest
Change-Id: I6abd2221882db368a411b7174c66d8bd3b6b5110
Chalard Jean [Thu, 7 Jun 2018 10:40:24 +0000 (19:40 +0900)]
[PT07] Small cleanup of setGlobalProxy
Test: runtest
Change-Id: I4825e6326f7ce7bd45d625d57824f8d27c51d6f2
Chalard Jean [Thu, 7 Jun 2018 10:30:29 +0000 (19:30 +0900)]
[PT05] Move sendProxyBroadcast into ProxyTracker.
Test: runtest
Change-Id: I2c149d29d4b75d3978021b940b6bc58f677b8d17
Chalard Jean [Thu, 7 Jun 2018 10:20:08 +0000 (19:20 +0900)]
[PT04] Move PacManager into ProxyTracker.
Test: runtest
Change-Id: I45d22857459fe1746d484ac04f8d5cd81fc61835
Chalard Jean [Thu, 7 Jun 2018 09:02:37 +0000 (18:02 +0900)]
[PT03] Move some more code into ProxyTracker.
Add finals and annotations. Remove comments that have lost their
context (they were in the context of disabling a permission check
that had been added, but constituted an API change that would not
serve any real purpose).
Test: runtest
Change-Id: I1f879b2c105d2127072b88233d72097a0d78fe14
Chalard Jean [Thu, 7 Jun 2018 08:41:29 +0000 (17:41 +0900)]
[PT02] Move static methods to ProxyTracker
No logic changes. Only changes are adding nullability annotations,
final modifiers, and adding an s in a comment.
Test: runtests
Change-Id: If4986a25bb36819de8ff459c4c0439c56d4e5a50
Chalard Jean [Thu, 7 Jun 2018 07:44:04 +0000 (16:44 +0900)]
[PT01] Introduce ProxyTracker
The goal of this is to simplify ConnectivityService by reducing
the amount of code it contains. This is small enough to be obviously
correct and followup changes will move code into this class.
Test: runtest
Change-Id: Ic5ab19b521e98ae397c9bf657856820304362fbb
Chalard Jean [Thu, 7 Jun 2018 07:11:34 +0000 (16:11 +0900)]
Remove a useless parameter.
This argument is useless because all its callers pass the same
value : false.
Test: runtest
Change-Id: Id921caa4ffadef535a5bbcfea052283a07320b28
Chalard Jean [Thu, 7 Jun 2018 04:46:52 +0000 (13:46 +0900)]
Small cleanup of Network.
Test: runtest
Change-Id: I56dbd37bb8f890938d360f45835de72be4beb91a
Chalard Jean [Thu, 7 Jun 2018 04:27:00 +0000 (13:27 +0900)]
Cleanup of LinkProperties.
Test: runtest
Change-Id: I7299de93a79901635ce755a2d933666ee43767d5
Neil Fuller [Tue, 12 Jun 2018 09:50:32 +0000 (09:50 +0000)]
Merge "Minimum viable TimeDetectorService"
Brad Ebinger [Mon, 11 Jun 2018 22:24:19 +0000 (15:24 -0700)]
[automerger skipped] Merge "Update Docs to clarify using a Message across IPC"
am:
0be0692691 -s ours
Change-Id: I1d3887c7d4a868a1f1b56c0d2e4f824eef29fb3a