OSDN Git Service
Andreas Gampe [Thu, 15 Feb 2018 23:12:38 +0000 (15:12 -0800)]
Framework: Disable [MissingOverride] for platformprotos
Bug:
72714520
Test: m javac-check-platformprotos RUN_ERROR_PRONE=true
Merged-In: I00f5a588fa74621d4c35dc4e39b54536815ad476
Change-Id: I00f5a588fa74621d4c35dc4e39b54536815ad476
David Brazdil [Thu, 15 Feb 2018 11:55:15 +0000 (11:55 +0000)]
Merge "Update hidden API toast message"
Chalard Jean [Thu, 15 Feb 2018 11:25:36 +0000 (11:25 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119
* changes:
Deprecate CONNECTIVITY_ACTION.
Publish FOREGROUND and add NOT_SUSPENDED capabilities.
Send null UIDs to apps instead of single-uid lists.
Lorenzo Colitti [Thu, 15 Feb 2018 10:03:26 +0000 (10:03 +0000)]
Merge changes Icd56662d,I0ece820f
* changes:
Restrict OWNERS in android.net.*
Add OWNERS to the libandroid_net library.
David Brazdil [Wed, 14 Feb 2018 22:36:34 +0000 (22:36 +0000)]
Update hidden API toast message
Change the toast message shown by an Activity when VMRuntime reports
that the app has used a private API.
(a) fix a typo: compatiblity -> compatibility
(b) change guidance from "please consult log" to "go to <url> for
more info" where devs can learn how to proceed if their app does
have compatibility issues.
Bug:
64382372
Test: make, visual
Change-Id: Idbe32a724438bb7b0826d0b4e11ef505015cb321
Lorenzo Colitti [Thu, 15 Feb 2018 07:43:44 +0000 (16:43 +0900)]
Restrict OWNERS in android.net.*
Test: None
Change-Id: Icd56662dcbc86b49015d094fd8ae2ade235aa475
Lorenzo Colitti [Thu, 15 Feb 2018 06:51:58 +0000 (15:51 +0900)]
Add OWNERS to the libandroid_net library.
Test: None
Change-Id: I0ece820fc0de786a81df9f922135acdf92f1d136
Treehugger Robot [Thu, 15 Feb 2018 04:14:43 +0000 (04:14 +0000)]
Merge "Hearing Aid profile"
Jakub Pawlowski [Wed, 22 Nov 2017 19:02:34 +0000 (11:02 -0800)]
Hearing Aid profile
This is implementation of Hearing Aid Profile that will in future
be connected to Bluetooth Manager - see TODOs in BluetoothHearingAid.java
Bug:
69623109
Test: compilation. Manual test with HA.
Change-Id: I79643ea1e14e9df7f5771169359c964a60c56618
Benedict Wong [Wed, 14 Feb 2018 19:37:53 +0000 (19:37 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created"
Chen Xu [Wed, 14 Feb 2018 18:54:06 +0000 (18:54 +0000)]
Merge "add a current table in CarrierIdProvider"
Treehugger Robot [Wed, 14 Feb 2018 15:02:22 +0000 (15:02 +0000)]
Merge "Fix link-type check warning on PMTest_Java* test apps"
Nicolas Geoffray [Wed, 14 Feb 2018 11:41:02 +0000 (11:41 +0000)]
Merge "Refactor runtime hidden API flag from negative to positive"
David Brazdil [Tue, 13 Feb 2018 17:04:26 +0000 (17:04 +0000)]
Refactor runtime hidden API flag from negative to positive
There are only two situations in which we want to enable hidden API
access flag checks. Turning the flag from DISABLE_ to ENABLE_
simplifies logic in ART and reduces the number places where the flag
had to be passed down to ART.
Bug:
64382372
Test: boot device, install and run apps, check log messages
(cherry picked from commit
f7e31c0a2b69e97662e2bdeb7e5b5c6d0a7f995c)
Change-Id: Ib2f70696d98c6e1500d1d419d6acf0a8d0487213
Martijn Coenen [Wed, 14 Feb 2018 09:17:32 +0000 (09:17 +0000)]
Merge "add swapPss of native process to totalSwapPss"
fionaxu [Mon, 29 Jan 2018 22:08:12 +0000 (14:08 -0800)]
add a current table in CarrierIdProvider
restructure CarrierIdProvider into two tables
1. All - a private table which stores a complete mapping of all carriers
2. Current - a public table only stores the carrier identification of the
current active subs. require no permission to query.
expose the content url to public so that apps could be
notified on carrier identity change either on background or foreground.
Bug:
72571475
Test: runtest --path CarrierIdProviderTest.java
Test: Manual
Change-Id: If2a20288e63d25343f5bb582b35564d769a4e13b
(cherry picked from commit
3d00d698d7d6c10628076cca8df30adb50c52563)
Merged-in: If2a20288e63d25343f5bb582b35564d769a4e13b
Jiyong Park [Wed, 14 Feb 2018 07:26:04 +0000 (16:26 +0900)]
Fix link-type check warning on PMTest_Java* test apps
The test apps are built with SDK, but are using native libraries built
without SDK (libpmtest(32|64|dual)). This has been causing link-type check
warning, which will be errors soon.
Fixing the warning by building the native libraries with SDK.
Bug:
69899800
Test: mma -j under
frameworks/base/core/tests/hosttests/test-apps/SharedUid is successful
and does not show any link-type check warning
Change-Id: I660edb9accd8965ddd471f88f2b47f6b7285b83f
Chalard Jean [Fri, 9 Feb 2018 20:33:50 +0000 (05:33 +0900)]
Deprecate CONNECTIVITY_ACTION.
That was its destiny.
Use NetworkCallbacks instead.
Test: runtest frameworks-net, but this is only doc changes
Change-Id: I3d68dbf817de92c66d899a7cc4519c5639e4c049
Chalard Jean [Tue, 30 Jan 2018 13:41:41 +0000 (22:41 +0900)]
Publish FOREGROUND and add NOT_SUSPENDED capabilities.
NOT_SUSPENDED and FOREGROUND are capabilities that need to
be public so as to reach feature parity with what information
can be gotten through the use of CONNECTIVITY_ACTION and
synchronous calls to ConnectivityManager. This change makes
them public, and wires up the NOT_SUSPENDED capability.
This deprecates in effect the old onSuspended and onResumed
callbacks, but these have never been public.
This also converts the onAvailable path from a multiple
binder call design to a simpler, single binder call. This
is only for internal convenience
Test: runtest frameworks-net
Test: cts
Test: also manual testing
Change-Id: I6ea524bb361ecef0569ea2f9006c1e516378bc25
Chalard Jean [Fri, 26 Jan 2018 10:24:40 +0000 (19:24 +0900)]
Send null UIDs to apps instead of single-uid lists.
Prior to this change ConnectivityManager used to patch in the UID
of the requesting app inside the NetworkCapabilities sent to it.
The rationale was that the app may not know what other apps may
use the network, so the view it should have of the network should
always say the network only applies to that app.
But this has an unfortunate side effect : apps can't match the
received network against a default NetworkCapabilities. Ostensibly
this only applies to the system because all involved calls are
@hide, but still : system code would get some NetworkCapabilities,
for example using networkCapabilitiesForType, and then try to
match the capabilities of an available network using
satisfiedByNetworkCapabilities. Because the passed network is
declared to only apply to one's own UID and the UIDs of the
NetworkCapabilities are set to null meaning "I need this network
to apply to all UIDs", the answer will be "false".
While this is WAI in a sense, it is very counter-intuitive that
code trying to match a network would be required to patch in its
own UIDs.
There are three ways of fixing this :
1. Require all apps to do the above. It's correct, but it's
cumbersome and counterintuitive. Multiple places in existing
code needs to be fixed, Tethering is an example.
2. Write the UIDs of the caller in any NetworkCapabilities object
that is created. This is not very practical, because it imposes
the converse requirement on all NetworkAgents, which would then
have to clear the UIDs before they send the capabilities to
ConnectivityService. All NetworkAgents need to be fixed.
3. Instead of sending an object with a list of one UID to apps,
send a null list. The drawback is that the networks nominally
look to apps like they apply to all apps. I argue this does
not matter ; what matters is that the UID lists do not leak.
Clients just see a null list of UIDs (and third party can't
even access them without using reflection). No other changes
are required besides this two-line patch.
This patch implements 3. I believe it is the saner approach, with
both the most intuitive behavior and the best backward compatibility
characteristics, as well as the easiest change.
This does not encroach on the future plans to make the actual
UID list available to apps with NETWORK_SETTINGS.
Test: runtest frameworks-net
Change-Id: I978d91197668119e051c24e1d04aafe1644a41cf
Treehugger Robot [Wed, 14 Feb 2018 03:35:37 +0000 (03:35 +0000)]
Merge "Refactor ZygoteProcess to deal in LocalSocketAddress."
Treehugger Robot [Tue, 13 Feb 2018 23:27:33 +0000 (23:27 +0000)]
Merge "Rename Conference#setConnectionElapsedTime to clarity."
Benedict Wong [Wed, 7 Feb 2018 04:43:21 +0000 (20:43 -0800)]
Copy IpSecConfig when IpSecTransforms are created
This change prevents IpSecTransforms from being inadvertently modified
by changes to the IpSecConfig. Specifically, once the transform is
created, it takes a copy of the config, rather than a reference.
Bug:
69385347
Test: New tests added, and all test passing
Change-Id: I89b8660c175ca20aa70352dcda893434ff7fd42b
Holly Jiuyu Sun [Tue, 13 Feb 2018 22:56:08 +0000 (22:56 +0000)]
Merge "Public EuiccManager APIs."
Treehugger Robot [Tue, 13 Feb 2018 21:27:39 +0000 (21:27 +0000)]
Merge "Add death recipient to TelephonyRegistry."
Holly Jiuyu Sun [Wed, 13 Dec 2017 04:17:09 +0000 (20:17 -0800)]
Public EuiccManager APIs.
Public EuiccManager and other related necessary files.
Mark EuiccCardManager and other related necessary files as @SystemApi.
Solve lint errors and warnings.
Bug:
35851809
Test: test on phone
Change-Id: I8a2c78804cae56b679d311d613edca5be4bc2522
Merged-In: I68853e134e1e31fa9b91a83af6c491a2a8cca971
Treehugger Robot [Tue, 13 Feb 2018 19:32:01 +0000 (19:32 +0000)]
Merge "Add interfact to get phone ID from UiccSlotInfo"
Qingxi Li [Wed, 31 Jan 2018 21:54:34 +0000 (13:54 -0800)]
Add interfact to get phone ID from UiccSlotInfo
Bug:
72753162
Test: TreeHugger
Merged-In: I7733a5f60cf4535339fe9b44e99178304ccbb2c0
Change-Id: I7733a5f60cf4535339fe9b44e99178304ccbb2c0
Robert Sesek [Fri, 26 Jan 2018 19:26:53 +0000 (14:26 -0500)]
Refactor ZygoteProcess to deal in LocalSocketAddress.
Currently ZygoteProcess only uses String names in the RESERVED socket
namespace. This CL reworks the class to use LocalSocketAddress, so that
other socket namespaces can be used to communicate with zygotes.
Bug:
63749735
Test: m (no functional change)
Merged-In: I4146f684bfcd78b16500829d02ff54590a8b48f5
Change-Id: I0113a7189530c2e57c48058df542057e855bae42
Malcolm Chen [Tue, 13 Feb 2018 03:15:59 +0000 (19:15 -0800)]
Add death recipient to TelephonyRegistry.
Add death recipient to TelephonyRegistry so that all binders that
connect to TelephonyRegistry will be cleaned when they are died.
Test: manual
Bug:
73107019
Change-Id: Ib44f72b769272cef9f36f7b49097091a93bcc70e
hansson [Tue, 13 Feb 2018 14:42:03 +0000 (14:42 +0000)]
Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log"
yuanhuihui [Sat, 18 Mar 2017 11:34:31 +0000 (19:34 +0800)]
fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log
There will be the following situations about mApplicationObject:
1) fork app process will invoke ActivityThread.main(),
then set mApplicationObject.
2) fork system_server, don't set mApplicationObject value.
3) using app_process fork process except zygote, will inovke RuntimeInit,
don't set mApplicationObject value。
For example using command as below:
app_process /system/bin com.android.commands.am.Am "$@",
if this process throw uncaught exception,will output FATAL EXCEPTION IN SYSTEM PROCESS log,
it's not in system process but in normal process。
so should add condition: Process.SYSTEM_UID == Process.myUid()
BUG:
72759350
Test: manual
Change-Id: Ie8d769e4149cd9b938577058de871c4f8db9efe5
Signed-off-by: yuanhuihui <yuanhuihui@xiaomi.com>
Treehugger Robot [Tue, 13 Feb 2018 07:09:36 +0000 (07:09 +0000)]
Merge "Updates to Telecom API docs for clarity."
Tyler Gunn [Thu, 8 Feb 2018 19:28:33 +0000 (11:28 -0800)]
Updates to Telecom API docs for clarity.
- Update Connection onAnswer/onReject docs to make it more clear for
a self-managed connectionservice that these methods could be called by
the framework or by a car mode in call service.
- Update the Connection onShowIncomingCallUI method to take into account
the new concurrent calling capabilities in P.
Test: Docs only change
Bug:
73112552
Change-Id: Icb47aa15d03d4bfc05380948e30686317124301e
Treehugger Robot [Mon, 12 Feb 2018 22:44:39 +0000 (22:44 +0000)]
Merge "Don't put android.os.Parcelable in framework.aidl"
Jack Yu [Mon, 12 Feb 2018 22:39:00 +0000 (22:39 +0000)]
Merge "Added owners"
Tyler Gunn [Thu, 1 Feb 2018 16:58:38 +0000 (08:58 -0800)]
Rename Conference#setConnectionElapsedTime to clarity.
Change name of conference connection elapsed time method to make it more
clear what it is for. Updated documentation of this method and its
companion to make it more clear what they are for.
Test: Compile - this is a docs and naming change only.
Bug:
70639525
Change-Id: I02662cb0331cba0d1fe2d4353438a68f334f9192
Jack Yu [Mon, 12 Feb 2018 20:07:34 +0000 (12:07 -0800)]
Added owners
Test: Build
Change-Id: I95104f646bc054e4ad9a6807d6e3df69f1e00d75
Jordan Liu [Mon, 12 Feb 2018 18:17:24 +0000 (18:17 +0000)]
Merge "Overload setTelephonyProperty without phone ID"
hansson [Mon, 12 Feb 2018 10:48:30 +0000 (10:48 +0000)]
Merge "CtsShim: build tweaks for 64-bit only builds."
Ganesh Mahendran [Mon, 12 Feb 2018 07:36:03 +0000 (15:36 +0800)]
add swapPss of native process to totalSwapPss
Currently swapPss of native process is not counted into totalSwapPss.
This change fixes this.
Change-Id: Ia2d9261f91e969ceef0519ffec8c8ab5dbcb2a5e
Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
Treehugger Robot [Sat, 10 Feb 2018 02:05:12 +0000 (02:05 +0000)]
Merge "Use proper string formatting for the "Active device" string"
Tyler Gunn [Sat, 10 Feb 2018 00:00:04 +0000 (00:00 +0000)]
Merge "Add InCallService docs to state prerequisites for be being a dialer app."
nharold [Fri, 9 Feb 2018 23:36:59 +0000 (23:36 +0000)]
Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode"
Pavlin Radoslavov [Tue, 6 Feb 2018 20:21:34 +0000 (12:21 -0800)]
Use proper string formatting for the "Active device" string
* The hard-coded "active" / "active(media)" / "active(phone)" strings
are removed and replaced with proper XML-based string formatting.
* Added the appropriate strings for Bluetooth Audio Active Device status:
"bluetooth_audio_active_device_summaries". For now those strings are
marked as translatable="false" until the actual UI is finalized.
* Updated all "bluetooth_connected*" strings to include the new
"active_device" component.
* Added unit tests for the new "active" strings.
Also, updated existing unit tests to check the getConnectionSummary()
strings by comparing against strings embedded within the unit tests.
Bug:
72317067
Test: Unit tests added: make RunSettingsLibRoboTests -j40
Manual: two headsets and switching the active device
Change-Id: Ide639b5dfb45c1db8114155240f193249aeaf3be
(cherry picked from commit
e6e080ff5cb9c7c56003695c1b787981e0114599)
Tyler Gunn [Fri, 9 Feb 2018 22:10:50 +0000 (22:10 +0000)]
Merge "Add Connection Event for supplementary service notifications."
Adam Lesinski [Fri, 9 Feb 2018 20:48:28 +0000 (20:48 +0000)]
Merge "Remove redundant final modifiers from api"
Colin Cross [Fri, 9 Feb 2018 19:24:14 +0000 (11:24 -0800)]
Don't put android.os.Parcelable in framework.aidl
Parcelable shouldn't be in the list of parcelables in framework.aidl.
Remove it to fix warning when running aidl:
framework.aidl:287 attempt to redefine built in class android.os.Parcelable
Also make the dependency on sdk_parcelables not be order-only so
framework.aidl gets rebuilt when sdk_parcelables changes.
Bug:
73135791
Test: ParcelableDetectorTest
Test: out/target/common/obj/framework.aidl does not contain android.os.Parcelable
Change-Id: If5222879be9ec1e5fa08810adc624ec526ddc0ec
Tyler Gunn [Fri, 2 Feb 2018 21:18:02 +0000 (13:18 -0800)]
Add InCallService docs to state prerequisites for be being a dialer app.
The InCallService documentation does not clearly state that an app which
wants to become the default dialer app also needs to handle the DIAL
intent. This change updates the documentation to make this clear.
Test: Built documentation and verified its contents.
Bug:
72857373
Change-Id: I738a8475df37035a0a7f4ad1639df76d967f81dc
Treehugger Robot [Fri, 9 Feb 2018 19:24:03 +0000 (19:24 +0000)]
Merge "Watchdog: Print annotated stack trace, if possible"
Tyler Gunn [Fri, 9 Feb 2018 18:49:08 +0000 (18:49 +0000)]
Merge "Pass calling package for invocations of endCall API."
Andreas Gampe [Fri, 26 Jan 2018 19:39:46 +0000 (11:39 -0800)]
Watchdog: Print annotated stack trace, if possible
Use VMStack.getAnnotatedStackTrace() to print an annotated stack.
Aids in diagnostics of watchdog aborts.
Bug:
70538431
Test: m
Test: art/test/testrunner/testrunner.py -b --host -t 168
Test: runtest -c com.android.server.WatchdogDiagnosticsTest frameworks-services
Test: manual - insert a deadlock into ActivityManagerService
Change-Id: I5bd43920edb8b569240432b6f299e56cabf5ef2a
Treehugger Robot [Fri, 9 Feb 2018 03:50:05 +0000 (03:50 +0000)]
Merge "Modify javadoc for onWindowShown"
Tyler Gunn [Wed, 20 Dec 2017 23:59:15 +0000 (15:59 -0800)]
Add Connection Event for supplementary service notifications.
These are passed up to the UI with an optional charsequence message which
the UI can choose to display to the user.
Test: Manual, added new unit tests
Bug:
65534165
Change-Id: Icdf2738ac4dfd3a65e9eacac2caa4d4a44348ab4
Nathan Harold [Sat, 3 Feb 2018 02:34:25 +0000 (18:34 -0800)]
Require NETWORK_STACK Permission for IpSec Tunnel Mode
At least until further permissions are agreed upon,
the NETWORK_STACK permission is sufficient to ensure
that access to the tunnel mode APIs is secure, and
this permission will always be a sufficient condition.
Thus, adding NETWORK_STACK.
Bug:
66955045
Test: compilation
Change-Id: I2dc36896a52d2e71fad55041507d68ca91191ffc
Treehugger Robot [Thu, 8 Feb 2018 21:12:46 +0000 (21:12 +0000)]
Merge "Set the WebViewLoader's targetSdk same with framework's."
Treehugger Robot [Thu, 8 Feb 2018 20:12:02 +0000 (20:12 +0000)]
Merge "VintfObject: add getTargetFcmVersion"
Anton Hansson [Thu, 8 Feb 2018 13:32:40 +0000 (13:32 +0000)]
CtsShim: build tweaks for 64-bit only builds.
It would previously fail to find a matching abi for devices with
TARGET_ARCH=arm64 and no TARGET_2ND_ARCH.
The same apk was used in the 32-bit and 64-bit case anyway.
This package has no code, so it's unclear why it has different
apks for different archs.
Test: lunch sailfish-eng; m -j
Bug:
72810053
Change-Id: I800644ba848118556cd73d28bcf47e279d8eba76
Tyler Gunn [Thu, 8 Feb 2018 00:08:27 +0000 (16:08 -0800)]
Pass calling package for invocations of endCall API.
Pass the calling package for debugging purposes.
Test: Manual
Bug:
73006395
Change-Id: I5ea7f1f0033438de3cdc2c47fc8a03f05d9e4590
Treehugger Robot [Wed, 7 Feb 2018 23:17:18 +0000 (23:17 +0000)]
Merge "Make TelephonyManager#getNai() public"
Yifan Hong [Wed, 7 Feb 2018 22:16:21 +0000 (14:16 -0800)]
VintfObject: add getTargetFcmVersion
Add getTargetFrameworkCompatibilityMatrixVersion that returns
target FCM version in device manifest.
Test: VintfDeviceInfo
Bug:
70993015
Change-Id: Ia6354f85e7fae898444067977fb594febb0112fa
Treehugger Robot [Wed, 7 Feb 2018 22:25:04 +0000 (22:25 +0000)]
Merge "IMS: Add support in frameworks for call deflection feature"
tiansiming [田思明] [Mon, 5 Feb 2018 10:28:28 +0000 (18:28 +0800)]
Modify javadoc for onWindowShown
onWindowShown is more like it should called after mWindow.show()
in InputMethodService. Considering the compatibility problem, just
make its javadoc clearer to the IME developers rather than
change the calling order.
Bug:
72922821
Test: N/A
Change-Id: Ibfe20f40a65475f39c8e79d10e2c494e212cf054
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
Martijn Coenen [Wed, 7 Feb 2018 13:47:45 +0000 (13:47 +0000)]
Merge "Fix gNumProxies double increment."
Martijn Coenen [Wed, 7 Feb 2018 09:25:39 +0000 (10:25 +0100)]
Fix gNumProxies double increment.
Bug:
70217678
Test: proxy counts look reasonable
Change-Id: I6147d6038794eabd6b3446d78cd29af9d40ef7cc
Pooja Jain [Thu, 28 Dec 2017 08:45:31 +0000 (14:15 +0530)]
IMS: Add support in frameworks for call deflection feature
Call deflection feature is useful to deflect MT call to another
number.
Test: Manual
Bug:
62170348
Change-Id: Idfbcc175a856aa0bb9476f8c73d7a614a3af0700
Jong Wook Kim [Wed, 7 Feb 2018 02:06:07 +0000 (02:06 +0000)]
Merge "MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator"
Jong Wook Kim [Thu, 1 Feb 2018 03:03:19 +0000 (19:03 -0800)]
MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator
Use SecureRandom instead of Random since Random is time based and can
increase the chance of generating same MAC address across multiple
devices.
createRandomUnicastAddress should randomize all bits of the address,
except for locally assigned bit and unicast bit. The previous method
that only randomizes NIC and use Google Base OUI is renamed to
createRandomUnicastAddressWithGoogleBase.
Bug:
72450936
Test: runtest frameworks-net
Change-Id: Icda650638c2c1c9fd90d509a87e86347c0e05f2d
Treehugger Robot [Wed, 7 Feb 2018 01:26:09 +0000 (01:26 +0000)]
Merge "Fix ANR due to long wait for synchronization lock"
Treehugger Robot [Wed, 7 Feb 2018 01:24:36 +0000 (01:24 +0000)]
Merge "BootReceiver: changed deprecated Build.RADIO to Build.getRadioVerison to get non-empty radio firmware version in SYSTEM_LAST_KMSG."
Tobias Thierer [Wed, 7 Feb 2018 00:16:04 +0000 (00:16 +0000)]
Merge "Pin jarjar targets to java_version 1.8."
Adam Lesinski [Tue, 6 Feb 2018 22:45:33 +0000 (14:45 -0800)]
Remove redundant final modifiers from api
This change is the result of running
make update-api
with the related doclava change in this topic.
Test: manual
Merged-In: I193781c281fbde13ccdaedeaee30f8d7c3b5f33e
Change-Id: I174874dc0af9deda6d88dced5871aa8add05d5fa
Xiangyu/Malcolm Chen [Tue, 6 Feb 2018 21:32:31 +0000 (21:32 +0000)]
Merge "Update ServiceState to adapt NetworkService change."
Hall Liu [Tue, 6 Feb 2018 21:15:42 +0000 (21:15 +0000)]
Merge "Revert "Check for location access on TelephonyRegistry""
Treehugger Robot [Tue, 6 Feb 2018 20:57:25 +0000 (20:57 +0000)]
Merge "Add strings and carrier config needed network service."
Treehugger Robot [Tue, 6 Feb 2018 20:47:51 +0000 (20:47 +0000)]
Merge "Add missing copyright messages"
Colin Cross [Tue, 6 Feb 2018 19:10:25 +0000 (11:10 -0800)]
Add missing copyright messages
Bug:
72993971
Test: m sdkparcelables
Change-Id: I9fa422160c29ce3054748b2b8d1e26541a697a90
Hall Liu [Tue, 6 Feb 2018 18:13:36 +0000 (18:13 +0000)]
Revert "Check for location access on TelephonyRegistry"
This reverts commit
8d584f0a91b0709b28ebc64abf0a6063429c8d58.
Reason for revert: b/
72967560
Change-Id: I9ca3c4a586e740a7b7d4cc5940ca8d4e4ebf3654
Treehugger Robot [Tue, 6 Feb 2018 15:02:06 +0000 (15:02 +0000)]
Merge changes Ie05a1759,If3b6fc63
* changes:
Modify android.test.runner to use new mock APIs
Add apis needed for android.test.legacy
Paul Duffin [Tue, 6 Feb 2018 13:39:46 +0000 (13:39 +0000)]
Merge "Correct inaccurate comments in build files"
Paul Duffin [Fri, 5 Jan 2018 13:52:17 +0000 (13:52 +0000)]
Modify android.test.runner to use new mock APIs
Previous change added some new public APIs to allow the
android.test.runner classes to be built against the public API stubs
rather than the internal classes. This change updates the
android.test.runner classes to use that new API.
This in turn is preparation for building an android.test.legacy library
that can be safely statically included in APKs.
Bug:
30188076
Test: make checkbuild
(cherry picked from commit
20af1df63f77f6b3ab12fd6221f581fe84182091)
Merged-In: I302626abb7e048ef0c3169e9a5209b85f2f87d34
Change-Id: Ie05a17598fcabc1189cacc912c01a25782ebd29c
Paul Duffin [Wed, 31 Jan 2018 13:30:22 +0000 (13:30 +0000)]
Correct inaccurate comments in build files
Bug:
30188076
Test: make checkbuild
Change-Id: I3881e66a949bfc5fbc34db0a104ef7a6995abe35
Paul Duffin [Fri, 22 Dec 2017 16:13:15 +0000 (16:13 +0000)]
Add apis needed for android.test.legacy
The long term goal of removing junit and dependent android.test classes
from the android.jar is the removal of the runtime libraries that
provide those classes. A key part of the strategy for migrating APKs off
the runtime libraries is the android.test.legacy library which APKs can
statically include in place of the runtime dependencies without having
to change their source code.
The longer term goal is for all tests to migrate from these classes
altogther and to use the Android Test Support Library instead but that
will require significant changes to the test source code.
In order for it to be safe to statically include android.test.legacy in
an APK it cannot use any internal APIs. This change adds the additional
classes and methods needed to the android.test.mock API library. The
additions are all marked as deprecated to try and avoid developers
from using them in new tests.
It also marks the AccountManager constructor used by MockAccountManager
with the android.annotation.MockApi so that it is included in the mock
stubs libraries against which the android.test.mock.stubs[-system]
libraries build.
Bug:
30188076
Test: make checkbuild
(cherry picked from commit
772b6923206a34e97c45bc48e7ad4bebfd3eae29)
Merged-In: I85417cc328cab898ab93b9b726648f4232555324
Change-Id: If3b6fc630df93a44e4c07ef769737a2ac3ebf476
Treehugger Robot [Tue, 6 Feb 2018 06:03:09 +0000 (06:03 +0000)]
Merge "Frameworks: Mark tests"
Stanley Tng [Tue, 6 Feb 2018 01:02:33 +0000 (01:02 +0000)]
Merge "Add function to change LE Tx Data Length"
Malcolm Chen [Tue, 30 Jan 2018 01:09:21 +0000 (17:09 -0800)]
Update ServiceState to adapt NetworkService change.
SST is re-routed to get cellular registration states from
CellularNetworkService. Updating ServiceState to adapt that
change.
Bug:
64132030
Test: unittest
Change-Id: Ifd557ce50a4419ead6125cda29c79d331508448e
Merged-In: Ifd557ce50a4419ead6125cda29c79d331508448e
Malcolm Chen [Mon, 29 Jan 2018 23:10:46 +0000 (15:10 -0800)]
Add strings and carrier config needed network service.
Add resource overlay and carrier config which will determine
which package / network services will be bound to.
Bug:
64132030
Test: regression tests
Change-Id: I5f515ec16b712e7be25f69e0e079d672227542b0
Merged-In: I5f515ec16b712e7be25f69e0e079d672227542b0
Tobias Thierer [Mon, 5 Feb 2018 15:49:52 +0000 (15:49 +0000)]
Pin jarjar targets to java_version 1.8.
This CL pins the following make targets to java_version 1.8,
which is currently the default:
framework-protos
repackaged.android.test.base
repackaged.android.test.mock
repackaged.android.test.runner
For consistency, their dependencies,
android.test.base
android.test.mock
android.test.runner
which contain .java source files, are also pinned to 1.8.
This is so that the two steps:
a) update jarjar to support v53 class files
b) support -target 1.9 in the rest of the toolchain
can be completed in any order, in future CLs. Before this CL,
they would have needed to be completed in order a), b).
Bug:
72703434
Test: EXPERIMENTAL_USE_OPENJDK9=true USE_R8=true make checkbuild docs
(in a client where CL http://r.android.com/596874 was reverted)
Change-Id: If78067294ae7ab78997aa109b0e08be427bdf0b8
Mengjun Leng [Thu, 21 Dec 2017 03:20:58 +0000 (11:20 +0800)]
Overload setTelephonyProperty without phone ID
Some properties are not per-phone.
Test: ServiceStateTrackerTest.java
Fixes:
62048110
Change-Id: I80ffc85b511e6a173a1dee50412b1fc48ef43d90
Brad Ebinger [Mon, 5 Feb 2018 19:09:25 +0000 (19:09 +0000)]
Merge changes from topic "ims_apis"
* changes:
Modify ImsService API to accomodate compat
Make ImsService API @SystemApi
Integrate new MMTel APIs into the framework
Integrate ImsCallSessionListener API changes
goneil [Fri, 8 Dec 2017 00:31:10 +0000 (16:31 -0800)]
Make TelephonyManager#getNai() public
Bug:
67750905
Test: android.telephony.cts.TelephonyManagerTest#testTelephonyManager
Change-Id: I92af07a5ed2abd852ff0f79909c574d78b89f535
Stanley Tng [Tue, 16 Jan 2018 18:39:32 +0000 (10:39 -0800)]
Add function to change LE Tx Data Length
As part of new SL4A tests for LE CoC to measure data throughput, this
commit adds a function to set the LE Tx Data Length parameter to its
maximum.
Test: Ran the new ACTS Tests for LE CoC (BleCocTest and BleCoc2ConnTest)
Bug:
70683224
Change-Id: Iea93f6cb9f4f7cc484f121afa158d7dae18d1ef1
Hugo Benichi [Sun, 4 Feb 2018 23:18:52 +0000 (23:18 +0000)]
Merge "Update OWNER files for connectivity"
Jack Yu [Sat, 3 Feb 2018 04:40:46 +0000 (04:40 +0000)]
Merge "Added data service configuration support"
Treehugger Robot [Sat, 3 Feb 2018 04:40:06 +0000 (04:40 +0000)]
Merge "Added permission for binding data service"
Stanley Tng [Sat, 3 Feb 2018 01:36:03 +0000 (01:36 +0000)]
Merge "Add function to update LE connection parameters"
Treehugger Robot [Sat, 3 Feb 2018 00:03:57 +0000 (00:03 +0000)]
Merge "Add DENSITY_440"
Treehugger Robot [Fri, 2 Feb 2018 23:50:00 +0000 (23:50 +0000)]
Merge "DO NOT MERGE volume shows when status bar is null"
Treehugger Robot [Fri, 2 Feb 2018 23:13:54 +0000 (23:13 +0000)]
Merge "Enable multiple active Ethernet interfaces"
Treehugger Robot [Fri, 2 Feb 2018 22:09:34 +0000 (22:09 +0000)]
Merge "Add missing return statement in setTempFileRootDirectory"