OSDN Git Service
Nathan Harold [Mon, 2 Jul 2018 20:40:55 +0000 (20:40 +0000)]
Merge "Update Docstrings for CellSignalStrengthLte"
Treehugger Robot [Mon, 2 Jul 2018 11:22:28 +0000 (11:22 +0000)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called."
Sehee Park [Tue, 19 Jun 2018 11:07:37 +0000 (20:07 +0900)]
Modify catch when addInterfaceToLocalNetwork() is called.
Fatal Exception is occured in system process. Becuase addInterfaceToLocalNetwork()
throw IllegalStateException but it can not be handled in TetherInterfaceStateMachine.
Modify catch from "RemoteException" to "Exception" when addInterfaceToLocalNetwork() is called.
Test: Repeat on/off tethering
Test: "runtest --no-hidden-api-checks frameworks-net" passes
Bug:
110396460
Change-Id: I2f2f1325cfcce40c3113ccccf69b2bbd5df4ae5b
Signed-off-by: Sehee Park <sehee32.park@samsung.com>
Jack Yu [Fri, 29 Jun 2018 23:54:32 +0000 (23:54 +0000)]
Merge "Used APN type instead of APN id"
Jack Yu [Tue, 26 Jun 2018 00:40:02 +0000 (17:40 -0700)]
Used APN type instead of APN id
APN id is similar to ApnSetting.ApnType. We can just use the apn
type. No need to use APN id anymore.
Test: Telephony sanity tests + unit tests
Bug:
77511388
Merged-In: If41845604ea14f36272262da110d682eea0d5451
Change-Id: If41845604ea14f36272262da110d682eea0d5451
(cherry picked from commit
f42d06010a522b0d519df1a2ce9fa5ba3aefb51f)
Nathan Harold [Fri, 29 Jun 2018 21:23:26 +0000 (21:23 +0000)]
Merge changes I0d635067,I1424973b
* changes:
Simplify equals() method of ServiceState
Update ServiceState.hashCode()
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)
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 [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
Nathan Harold [Thu, 28 Jun 2018 00:21:17 +0000 (17:21 -0700)]
Simplify equals() method of ServiceState
For whatever reason, ServiceState used a
somewhat-convoluted check for null and
class type. Updating to use a canonical
and brief approach.
Bug:
8675309
Test: compilation
Change-Id: I0d635067a06093affff478e13c28bbbe2bfda7df
Nathan Harold [Thu, 28 Jun 2018 00:07:52 +0000 (17:07 -0700)]
Update ServiceState.hashCode()
hashCode() was missing about 10 fields and was
using some unnecessary bespoke logic to generate
hashes for individual fields. This CL simplifies
the hashCode() implementation and adds the missing
fields.
Bug:
8675309
Test: compilation
Change-Id: I1424973b11fcc6480d6f8c83d5fd0eb1b5533c7f
Tyler Gunn [Wed, 27 Jun 2018 20:02:37 +0000 (20:02 +0000)]
Merge "ImsMultiEndPoint - Sip Notify Change"
Brad Ebinger [Wed, 27 Jun 2018 18:24:51 +0000 (18:24 +0000)]
Merge "Telephony: Introduce a base class for ISMS.aidl."
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 13:53:12 +0000 (13:53 +0000)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."
Neil Fuller [Wed, 27 Jun 2018 08:45:36 +0000 (08:45 +0000)]
Merge "Prepare for migration to the time detector service"
Nathan Harold [Tue, 26 Jun 2018 23:55:54 +0000 (16:55 -0700)]
Update Docstrings for CellSignalStrengthLte
Add comments to the docstrings to indicate optional
values that may not always be reported. Users are
still reporting bugs for missing fields, which we
consider optional. This should clarify which methods
are optional vs mandatory for LTE.
For signal strength, RSRP is mandatory, and TA is
mandatory while in LTE_ACTIVE. RSSNR, RSRQ, and CQI
are all optional.
Bug:
36995487
Test: compilation (docstring-only change)
Change-Id: I05af5d42cbf6836109efe6441e95223e81671534
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
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."
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
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 [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"
Treehugger Robot [Tue, 26 Jun 2018 07:11:02 +0000 (07:11 +0000)]
Merge "Make auto-upstream the default tethering behaviour"
Treehugger Robot [Mon, 25 Jun 2018 22:22:25 +0000 (22:22 +0000)]
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()"
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 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
Treehugger Robot [Fri, 22 Jun 2018 00:21:43 +0000 (00:21 +0000)]
Merge "Removed dead code in DcTracker"
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
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 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 16:43:58 +0000 (16:43 +0000)]
Merge "Clean up old Context references in ImsConfig"
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 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
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"
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
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 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
Treehugger Robot [Mon, 18 Jun 2018 06:16:23 +0000 (06:16 +0000)]
Merge "Apf: Avoid constant overflow"
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)
Tyler Gunn [Tue, 22 May 2018 22:01:43 +0000 (15:01 -0700)]
Update onDeregistered docs to make capability change expectations clear.
Updating the onDeregistered docs to make it clear that the ImsService
must report any feature capability changes to the framework prior to
de-registration.
Bug:
73076695
Test: Docs only change.
Merged-In: Ib9bc88bfb43670f04c8afde36d0947255399397a
Change-Id: Ib9bc88bfb43670f04c8afde36d0947255399397a
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
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 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 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.
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
Treehugger Robot [Tue, 12 Jun 2018 19:24:19 +0000 (19:24 +0000)]
Merge "Frameworks: Remove complex boolean"
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
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 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