OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Track dropping of throws clause in Pattern.java."
Treehugger Robot [Wed, 27 Jun 2018 16:01:14 +0000 (16:01 +0000)]
Merge "Track dropping of throws clause in Pattern.java."

6 years agoMerge "TextUtils: track behavior change of Pattern.split() when targeting > 28."
Tobias Thierer [Wed, 27 Jun 2018 13:53:12 +0000 (13:53 +0000)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."

6 years agoMerge "Prepare for migration to the time detector service"
Neil Fuller [Wed, 27 Jun 2018 08:45:36 +0000 (08:45 +0000)]
Merge "Prepare for migration to the time detector service"

6 years agoMerge "Split fork and specialize in zygote"
David Sehr [Tue, 26 Jun 2018 22:02:16 +0000 (22:02 +0000)]
Merge "Split fork and specialize in zygote"

6 years agoMerge "Fix memory leak in RenderThread::dumpGraphicsMemory."
Treehugger Robot [Tue, 26 Jun 2018 21:38:14 +0000 (21:38 +0000)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory."

6 years agoMerge "Update onDeregistered docs to make capability change expectations clear."
Tyler Gunn [Tue, 26 Jun 2018 21:14:27 +0000 (21:14 +0000)]
Merge "Update onDeregistered docs to make capability change expectations clear."

6 years agoSplit fork and specialize in zygote
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

6 years agoFix memory leak in RenderThread::dumpGraphicsMemory.
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

6 years agoTrack dropping of throws clause in Pattern.java.
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

6 years agoTextUtils: track behavior change of Pattern.split() when targeting > 28.
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

6 years agoPrepare for migration to the time detector service
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

6 years agoMerge "Add more behavior to TimeDetectorService"
Neil Fuller [Tue, 26 Jun 2018 08:43:55 +0000 (08:43 +0000)]
Merge "Add more behavior to TimeDetectorService"

6 years agoMerge "Minimum viable TimeZoneDetectorService"
Neil Fuller [Tue, 26 Jun 2018 08:34:56 +0000 (08:34 +0000)]
Merge "Minimum viable TimeZoneDetectorService"

6 years agoMerge "Make auto-upstream the default tethering behaviour"
Treehugger Robot [Tue, 26 Jun 2018 07:11:02 +0000 (07:11 +0000)]
Merge "Make auto-upstream the default tethering behaviour"

6 years agoMerge "Update comments for TelephonyManager.getUiccSlotsInfo()"
Treehugger Robot [Mon, 25 Jun 2018 22:22:25 +0000 (22:22 +0000)]
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()"

6 years agoAdd more behavior to TimeDetectorService
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

6 years agoMerge "Fix Possible Deadlock with getFeatureState"
Brad Ebinger [Mon, 25 Jun 2018 17:30:02 +0000 (17:30 +0000)]
Merge "Fix Possible Deadlock with getFeatureState"

6 years agoMake auto-upstream the default tethering behaviour
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

6 years agoMerge "Prefer default Internet network for upstream tethering."
Treehugger Robot [Mon, 25 Jun 2018 12:08:46 +0000 (12:08 +0000)]
Merge "Prefer default Internet network for upstream tethering."

6 years agoPrefer 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)

6 years agoFix Possible Deadlock with getFeatureState
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

6 years agoMerge "Removed dead code in DcTracker"
Treehugger Robot [Fri, 22 Jun 2018 00:21:43 +0000 (00:21 +0000)]
Merge "Removed dead code in DcTracker"

6 years agoRemoved 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

6 years agoMerge "Trim away some dead code"
Treehugger Robot [Thu, 21 Jun 2018 20:15:31 +0000 (20:15 +0000)]
Merge "Trim away some dead code"

6 years agoMerge "[Stability][hwui] check mmap return value"
Treehugger Robot [Thu, 21 Jun 2018 20:13:36 +0000 (20:13 +0000)]
Merge "[Stability][hwui] check mmap return value"

6 years agoTrim away some dead code
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

6 years ago[Stability][hwui] check mmap return value
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>
6 years agoMinimum viable TimeZoneDetectorService
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

6 years agoMerge "Add StackedLinkProperties test case"
Chalard Jean [Thu, 21 Jun 2018 03:39:15 +0000 (03:39 +0000)]
Merge "Add StackedLinkProperties test case"

6 years agoMerge "Fix <UCP>[Power] toggled the power status"
Dan Zhang [Thu, 21 Jun 2018 02:41:59 +0000 (02:41 +0000)]
Merge "Fix <UCP>[Power] toggled the power status"

6 years agoMerge "Fix PixelCopyTest failure in CTS"
John Reck [Thu, 21 Jun 2018 00:48:44 +0000 (00:48 +0000)]
Merge "Fix PixelCopyTest failure in CTS"

6 years agoFix 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)

6 years agoMerge "Clean up old Context references in ImsConfig"
Brad Ebinger [Wed, 20 Jun 2018 16:43:58 +0000 (16:43 +0000)]
Merge "Clean up old Context references in ImsConfig"

6 years agoMerge "Allow apps to queue multiple toast messages."
Treehugger Robot [Tue, 19 Jun 2018 22:20:24 +0000 (22:20 +0000)]
Merge "Allow apps to queue multiple toast messages."

6 years agoMerge "Don't override targetVers with minCode"
Colin Cross [Tue, 19 Jun 2018 18:14:39 +0000 (18:14 +0000)]
Merge "Don't override targetVers with minCode"

6 years agoMerge "Use Uppercase instead of Lowercase for PLMN Decode"
nharold [Tue, 19 Jun 2018 17:16:11 +0000 (17:16 +0000)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode"

6 years agoAllow apps to queue multiple toast messages.
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

6 years agoAdd StackedLinkProperties test case
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: 80261579109913107
Test: runtest frameworks-net -c com.android.server.ConnectivityServiceTest \
          -m testStackedLinkProperties
Change-Id: I72fce594d74bd349f65557edca03640e1b86317c

6 years agoMerge "Fixed the incorrect permission for data/network service binding"
Treehugger Robot [Tue, 19 Jun 2018 00:36:38 +0000 (00:36 +0000)]
Merge "Fixed the incorrect permission for data/network service binding"

6 years agoDon't override targetVers with minCode
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

6 years agoUse Uppercase instead of Lowercase for PLMN Decode
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)

6 years agoMerge "Enabled annotations for Metalava based api-stubs."
Treehugger Robot [Mon, 18 Jun 2018 16:55:28 +0000 (16:55 +0000)]
Merge "Enabled annotations for Metalava based api-stubs."

6 years agoMerge changes I4b1bca8b,Idb7d2f28,I4825e632
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

6 years agoMerge "Apf: Avoid constant overflow"
Treehugger Robot [Mon, 18 Jun 2018 06:16:23 +0000 (06:16 +0000)]
Merge "Apf: Avoid constant overflow"

6 years agoMerge "Use the malloc debug heap dumper."
Christopher Ferris [Fri, 15 Jun 2018 21:36:42 +0000 (21:36 +0000)]
Merge "Use the malloc debug heap dumper."

6 years agoFixed the incorrect permission for data/network service binding
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

6 years agoMerge "Fix ManifestMerger issues"
Treehugger Robot [Fri, 15 Jun 2018 20:47:30 +0000 (20:47 +0000)]
Merge "Fix ManifestMerger issues"

6 years agoUse the malloc debug heap dumper.
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)

6 years agoUpdate onDeregistered docs to make capability change expectations clear.
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

6 years agoMerge "Build com.android.location.provider with java_sdk_library"
Treehugger Robot [Fri, 15 Jun 2018 03:41:18 +0000 (03:41 +0000)]
Merge "Build com.android.location.provider with java_sdk_library"

6 years agoMerge "Make dumpHexString() tolerate null arrays."
Treehugger Robot [Fri, 15 Jun 2018 02:32:54 +0000 (02:32 +0000)]
Merge "Make dumpHexString() tolerate null arrays."

6 years agoFix ManifestMerger issues
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

6 years agoMerge "Clear calling identity before doing any work"
Treehugger Robot [Thu, 14 Jun 2018 19:13:29 +0000 (19:13 +0000)]
Merge "Clear calling identity before doing any work"

6 years agoClear 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

6 years agoApf: Avoid constant overflow
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

6 years agoMake dumpHexString() tolerate null arrays.
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

6 years agoMerge "Add TimestampedValue.toString()"
Neil Fuller [Thu, 14 Jun 2018 08:21:27 +0000 (08:21 +0000)]
Merge "Add TimestampedValue.toString()"

6 years agoEnabled annotations for Metalava based api-stubs.
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

6 years agoMerge changes from topic "clean"
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.

6 years agoAdd TimestampedValue.toString()
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

6 years agoMerge "Use disableForUser in StatusBarManager"
Treehugger Robot [Wed, 13 Jun 2018 14:19:32 +0000 (14:19 +0000)]
Merge "Use disableForUser in StatusBarManager"

6 years agoRemove internal ApnSetting.
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

6 years agoDocs: noted that setting proxy hostnames on an ApnSetting requires an internet connec...
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

6 years agoMerge "Frameworks: Remove complex boolean"
Treehugger Robot [Tue, 12 Jun 2018 19:24:19 +0000 (19:24 +0000)]
Merge "Frameworks: Remove complex boolean"

6 years agoMerge "persist.sys.boot.reason is cleared once read by bootstat"
Treehugger Robot [Tue, 12 Jun 2018 19:19:57 +0000 (19:19 +0000)]
Merge "persist.sys.boot.reason is cleared once read by bootstat"

6 years agoUse disableForUser in StatusBarManager
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

6 years agoFrameworks: Remove complex boolean
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

6 years agoMerge "Simple pass-through TimeDetectorService"
Treehugger Robot [Tue, 12 Jun 2018 17:01:25 +0000 (17:01 +0000)]
Merge "Simple pass-through TimeDetectorService"

6 years agoSimple 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)

6 years agoMerge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
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.

6 years ago[PT09] Add javadoc comments to all ProxyTracker methods/members.
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

6 years ago[PT08] Move setDefaultProxy to ProxyTracker
Chalard Jean [Fri, 8 Jun 2018 03:20:15 +0000 (12:20 +0900)]
[PT08] Move setDefaultProxy to ProxyTracker

Test: runtest
Change-Id: Idb7d2f2895aac63d54e3a6481379b739a726eff6

6 years ago[PT06] Move setGlobalProxy into ProxyTracker
Chalard Jean [Thu, 7 Jun 2018 09:37:59 +0000 (18:37 +0900)]
[PT06] Move setGlobalProxy into ProxyTracker

Test: runtest
Change-Id: I6abd2221882db368a411b7174c66d8bd3b6b5110

6 years ago[PT07] Small cleanup of setGlobalProxy
Chalard Jean [Thu, 7 Jun 2018 10:40:24 +0000 (19:40 +0900)]
[PT07] Small cleanup of setGlobalProxy

Test: runtest
Change-Id: I4825e6326f7ce7bd45d625d57824f8d27c51d6f2

6 years ago[PT05] Move sendProxyBroadcast into ProxyTracker.
Chalard Jean [Thu, 7 Jun 2018 10:30:29 +0000 (19:30 +0900)]
[PT05] Move sendProxyBroadcast into ProxyTracker.

Test: runtest
Change-Id: I2c149d29d4b75d3978021b940b6bc58f677b8d17

6 years ago[PT04] Move PacManager into ProxyTracker.
Chalard Jean [Thu, 7 Jun 2018 10:20:08 +0000 (19:20 +0900)]
[PT04] Move PacManager into ProxyTracker.

Test: runtest
Change-Id: I45d22857459fe1746d484ac04f8d5cd81fc61835

6 years ago[PT03] Move some more code into ProxyTracker.
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

6 years ago[PT02] Move static methods to ProxyTracker
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

6 years ago[PT01] Introduce ProxyTracker
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

6 years agoRemove a useless parameter.
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

6 years agoSmall cleanup of Network.
Chalard Jean [Thu, 7 Jun 2018 04:46:52 +0000 (13:46 +0900)]
Small cleanup of Network.

Test: runtest
Change-Id: I56dbd37bb8f890938d360f45835de72be4beb91a

6 years agoCleanup of LinkProperties.
Chalard Jean [Thu, 7 Jun 2018 04:27:00 +0000 (13:27 +0900)]
Cleanup of LinkProperties.

Test: runtest
Change-Id: I7299de93a79901635ce755a2d933666ee43767d5

6 years agoMerge "Minimum viable TimeDetectorService"
Neil Fuller [Tue, 12 Jun 2018 09:50:32 +0000 (09:50 +0000)]
Merge "Minimum viable TimeDetectorService"

6 years agoClean up old Context references in ImsConfig
Brad Ebinger [Thu, 26 Apr 2018 21:27:10 +0000 (14:27 -0700)]
Clean up old Context references in ImsConfig

Bug: 77941698
Test: Manual
Merged-In: I9d9b5ac97c710b1d742fc25730e3e28172ff75e3
Change-Id: Ieb24830ef60d1bc383639777f8e22d0dc994782a

6 years agoMerge "Update Docs to clarify using a Message across IPC"
Brad Ebinger [Mon, 11 Jun 2018 19:56:07 +0000 (19:56 +0000)]
Merge "Update Docs to clarify using a Message across IPC"

6 years agoMerge "Framework: Disable native-bridge for non-zygote"
Treehugger Robot [Mon, 11 Jun 2018 15:23:38 +0000 (15:23 +0000)]
Merge "Framework: Disable native-bridge for non-zygote"

6 years agoMerge "ScanRecord.getServiceData NPE fix"
Jakub Pawlowski [Mon, 11 Jun 2018 14:43:57 +0000 (14:43 +0000)]
Merge "ScanRecord.getServiceData NPE fix"

6 years agoScanRecord.getServiceData NPE fix
Jakub Pawlowski [Mon, 4 Jun 2018 17:32:06 +0000 (10:32 -0700)]
ScanRecord.getServiceData NPE fix

Bug: 109662587
Change-Id: I0e9653d9cd7e4b748870bacb6fbcecae535ebb2a

6 years agoMinimum viable TimeDetectorService
Neil Fuller [Wed, 30 May 2018 13:35:24 +0000 (14:35 +0100)]
Minimum viable TimeDetectorService

This is a do-nothing TimeDetectorService 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:TimeDetectorServiceTest

Test: build / boot
Test: See above
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
(cherry picked from commit feeee682a23f25760c4a1aa07c00945901911ba3)

6 years agoMerge changes Ifd7d73ad,Id79096fa
Treehugger Robot [Mon, 11 Jun 2018 11:54:21 +0000 (11:54 +0000)]
Merge changes Ifd7d73ad,Id79096fa

* changes:
  Bugfixes in LinkProperties#toString
  Cleanup of ConnectivityManager.

6 years agoBugfixes in LinkProperties#toString
Chalard Jean [Thu, 7 Jun 2018 04:28:09 +0000 (13:28 +0900)]
Bugfixes in LinkProperties#toString

We should stop trying to use a human brain to write code

Test: manual
Change-Id: Ifd7d73ad65de0f671466080beacbd97287e17bfe

6 years agoCleanup of ConnectivityManager.
Chalard Jean [Mon, 4 Jun 2018 07:52:49 +0000 (16:52 +0900)]
Cleanup of ConnectivityManager.

This is not exhaustive, but still an undeniable improvement.

Test: runtest frameworks-net
Change-Id: Id79096faf20eec80de7c17b261ef338b895af1e0

6 years agoMerge "Use ParcelFileDescriptor's C++ implementation in libbinder"
Treehugger Robot [Mon, 11 Jun 2018 07:27:41 +0000 (07:27 +0000)]
Merge "Use ParcelFileDescriptor's C++ implementation in libbinder"

6 years agoMerge "No-op cleanup of ConnectivityService."
Treehugger Robot [Mon, 11 Jun 2018 04:57:31 +0000 (04:57 +0000)]
Merge "No-op cleanup of ConnectivityService."

6 years agoMerge "Copy clat modified linkProperties into new one."
Treehugger Robot [Mon, 11 Jun 2018 03:26:26 +0000 (03:26 +0000)]
Merge "Copy clat modified linkProperties into new one."

6 years agoMerge changes from topic "audio-package-update"
Treehugger Robot [Fri, 8 Jun 2018 20:47:03 +0000 (20:47 +0000)]
Merge changes from topic "audio-package-update"

* changes:
  Include InCallNotification.ogg in AllAudio.mk file
  Add ChargingStarted + InCallNotif to AudioPackage

6 years agoMerge "Check for null path in getInternalPathForUser"
Treehugger Robot [Fri, 8 Jun 2018 20:16:14 +0000 (20:16 +0000)]
Merge "Check for null path in getInternalPathForUser"

6 years agoCheck for null path in getInternalPathForUser
Jerry Zhang [Wed, 6 Jun 2018 18:04:46 +0000 (11:04 -0700)]
Check for null path in getInternalPathForUser

In some situations, path could be null resulting
in a crash.

Test: no crash
Bug: 109730998
Change-Id: I2ce0410162d1327905d690331f461f9187e20906
(cherry picked from commit 6f6154bf0493cf66628c8f2418827fe54679b1eb)

6 years agoMerge "API updated for ICU4J 61.1"
Treehugger Robot [Fri, 8 Jun 2018 17:19:55 +0000 (17:19 +0000)]
Merge "API updated for ICU4J 61.1"

6 years agoMerge changes from topic "ipsec-sync-with-pi"
nharold [Fri, 8 Jun 2018 17:07:11 +0000 (17:07 +0000)]
Merge changes from topic "ipsec-sync-with-pi"

* changes:
  Disable the AppOp Restriction for IpSec Tunnels
  Rework Exception Handling for IpSecManager
  Update IpSecManager to use InetAddress and prefixLen
  Add AppOps Checks for MANAGE_IPSEC_TUNNELS
  Add MANAGE_IPSEC_TUNNELS Permission