OSDN Git Service
abdalkader [Thu, 21 Dec 2017 18:12:07 +0000 (18:12 +0000)]
Merge "SMS over IMS APIs revision"
Treehugger Robot [Thu, 21 Dec 2017 17:54:34 +0000 (17:54 +0000)]
Merge "Add Notification Flag behavior test"
Treehugger Robot [Thu, 21 Dec 2017 15:27:44 +0000 (15:27 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE"
Treehugger Robot [Thu, 21 Dec 2017 15:27:23 +0000 (15:27 +0000)]
Merge "Testables lib should not statically link mockito"
Chrison.chai [Wed, 15 Nov 2017 01:31:26 +0000 (09:31 +0800)]
Fix random systemui crashes during cts test DO NOT MERGE
systemui may crash due
to an uninitialized value of mNavigationBar probably because
of some race condition during initialization caused by emulation
performance issues:
11-01 19:48:58.634 5064 5064 E AndroidRuntime: FATAL EXCEPTION: main
11-01 19:48:58.634 5064 5064 E AndroidRuntime: Process: com.android.systemui, PID: 5064
11-01 19:48:58.634 5064 5064 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'void com.android.systemui.statusbar.phone.LightBarTransitionsController.dump (java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[])' on a null object reference
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.statusbar.phone.LightBarController.dump(LightBarController.java:241)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.statusbar.phone.StatusBar.dump(StatusBar.java:3448)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.SystemBars.dump(SystemBars.java:48)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.SystemUIService.dump(SystemUIService.java:52)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.handleDumpService(ActivityThread.java:3488)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.-wrap9(Unknown Source:0)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.handleMessage(ActivityThread.java:1726)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:105)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.os.Looper.loop(Looper.java:164)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:6541)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.internal.os.Zygote.run(Zygote.java:240)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:767)
This patches adds an explicit checks for (mNavigationBar != null)
everywhere it is used.
Test: cts test.
Change-Id: I8056aef54a10bbb1970bc2ce4913e7a618498fd3
Brad Ebinger [Wed, 29 Nov 2017 03:15:47 +0000 (19:15 -0800)]
SMS over IMS APIs revision
- Move from being a feature to being a capability
- Move format to the constructor and make final
- Initial hooking up of APIs provided by platform for ims providers.
- Add constants for send status result
- Rename SmsListener callbacks.
- Split acknowledgeSms for sms and sms reports.
- Add reason for onSendSmsResult
Bug:
69846044
Test: None
Change-Id: I861664264a117d5483e392d4aabff59bfaf4373e
Philip P. Moltmann [Wed, 20 Dec 2017 23:41:32 +0000 (15:41 -0800)]
Testables lib should not statically link mockito
- All users of the lib already statically link mockito
- We should allow the users to decide what flavor they use
Test: m -j checkbuild
Change-Id: Ibbdb8be8022432a13b872865ade47b92b28976c6
Merged-In: Ibbdb8be8022432a13b872865ade47b92b28976c6
Sanket Padawe [Wed, 20 Dec 2017 21:54:38 +0000 (21:54 +0000)]
Merge "Receiving side Call handover API implementation."
Treehugger Robot [Wed, 20 Dec 2017 20:30:54 +0000 (20:30 +0000)]
Merge "Use NetworkStatsService to get stats for apps"
Treehugger Robot [Wed, 20 Dec 2017 18:55:14 +0000 (18:55 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"
Benedict Wong [Wed, 20 Dec 2017 18:25:32 +0000 (18:25 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
Sanket Padawe [Wed, 20 Dec 2017 18:13:05 +0000 (10:13 -0800)]
Receiving side Call handover API implementation.
Bug:
65415068
Test: Manual
Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#Bug:
Change-Id: Ic0c4af19098252389648007628affc19a44f89dd
Merged-in: Ic0c4af19098252389648007628affc19a44f89dd
Sanket Padawe [Wed, 20 Dec 2017 17:33:45 +0000 (17:33 +0000)]
Merge "Implement Call handover initiation side APIs."
Alex Light [Wed, 20 Dec 2017 15:04:10 +0000 (15:04 +0000)]
Merge "Add support for selecting alternate JDWP implementations"
Chenbo Feng [Wed, 15 Nov 2017 01:54:17 +0000 (17:54 -0800)]
Use NetworkStatsService to get stats for apps
Move the native implementation of TrafficStats to NetworkStatsService
and apps need to get the NetworkStatsService binder interface from
system_server in order to get the network usage stats since boot. This
implementation can hide the detail of retrieving network traffic
information from apps and the NetworkStatsService can choose which
methoed it use to get the data depending on the kernel version of the
device.
Bug:
30950746
Test: CtsNetTestCases -t android.net.cts.TrafficStatsTest
Change-Id: I53bbefd19aa0b783b9b4b42ea4d76db3e9ec07a3
Holly Jiuyu Sun [Wed, 20 Dec 2017 02:49:50 +0000 (02:49 +0000)]
Merge "Use getter instead of member for IEuiccController stub."
Sanket Padawe [Fri, 1 Dec 2017 21:59:27 +0000 (13:59 -0800)]
Implement Call handover initiation side APIs.
Bug:
65415068
Test: Manual
Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#
Change-Id: I692bb14fba66733154378c2dda525aa85c471a38
Merged-in: I692bb14fba66733154378c2dda525aa85c471a38
Philip P. Moltmann [Tue, 19 Dec 2017 21:20:22 +0000 (13:20 -0800)]
Don't include mockito in frameworks-base-testutils
So that each test can pick if they want mockito-inline or not.
Test: m -j checkbuild
Change-Id: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
Merged-In: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
vichang [Tue, 19 Dec 2017 13:13:13 +0000 (13:13 +0000)]
Merge "API updated for ICU4J 60.1"
Treehugger Robot [Tue, 19 Dec 2017 00:06:15 +0000 (00:06 +0000)]
Merge "Rename set_wakeup_callback"
Benedict Wong [Thu, 7 Dec 2017 05:56:35 +0000 (21:56 -0800)]
[ipsec-doze] Add fchown to IpSecService to support doze
Encap sockets are currently created as the system server, and should be
fchown'd to the user for whom it was created on behalf of.
Bug:
62994731
Test: New tests added and run to IpSecService
Change-Id: Icc49e709ae588981e69765fdb77537d7ffbac5fe
Elliott Hughes [Mon, 18 Dec 2017 23:58:15 +0000 (23:58 +0000)]
Merge "Private API became public..."
Benedict Wong [Mon, 18 Dec 2017 23:50:52 +0000 (23:50 +0000)]
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets"
Hugo Benichi [Mon, 18 Dec 2017 23:43:06 +0000 (23:43 +0000)]
Merge changes I798d8fec,I4a2d5866
* changes:
MacAddress: address api review comments
Expose the MacAddress class in the api
Ying Xu [Mon, 18 Dec 2017 23:26:25 +0000 (23:26 +0000)]
Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL"
Benedict Wong [Mon, 18 Dec 2017 21:32:10 +0000 (21:32 +0000)]
Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID."
Benedict Wong [Mon, 4 Dec 2017 03:42:36 +0000 (19:42 -0800)]
[ipsec-qtaguid] Tag sockets upon creation of encap sockets
Added calls to tag encap sockets to that of the UID for which the encap
socket is being created on behalf of. This ensures that all data
accounting generated for the UDP-encap-ESP socket is correctly billed to
the right UID.
Bug:
62994731
Test: New tests added to IpSecServiceTest.java, passing
Change-Id: I15365ea9c982fd7b4e3cdeff314ddfba2289c86e
Jeff Sharkey [Wed, 29 Nov 2017 18:18:23 +0000 (11:18 -0700)]
[CHERRY-PICK] API for apps to tag sockets with their own UID.
This enables app A to create a socket, pass it to app B, and have
app B accept blame for the traffic performed on that socket.
Also adds helpful public APIs for tagging raw FileDescriptor sockets
instead of making developers go through shady SocketImpl wrappers.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests#testAppFailAccessPrivateData
Bug:
63932076
Change-Id: I08925c843974675fc82e4080cec2eaab9ab7cd41
Merged-In: I08925c843974675fc82e4080cec2eaab9ab7cd41
(cherry picked from commit
70dc4f4d16082c598cd1774d366c1e60c2016126)
Steve Paik [Mon, 18 Dec 2017 18:23:31 +0000 (10:23 -0800)]
Rename set_wakeup_callback
Part of refactoring libsuspend. Renamed set_wakeup_callback
to be consistent with rest of autosuspend_* interfaces.
Bug:
70669809
Test: Compiles
Change-Id: I15fc8757b2343447ed79d1dd1af162afd5401007
Victor Chang [Wed, 13 Dec 2017 19:04:37 +0000 (19:04 +0000)]
API updated for ICU4J 60.1
API details:
- New DisplayContext value for initializing LocaleDisplayNames
It's an option to set whether locale display name should fallback to
use default value when lang data is not available in attribtues, e.g. separator
See CTS test ULocaleTest.TestDisplayNames for its usage
Upstream ticket: http://bugs.icu-project.org/trac/ticket/12700
- New method MeasureFormat.getUnitDisplayName to to get unit display names
CTS: MeasureUnitTest.testDisplayNames
Upstream ticket: http://bugs.icu-project.org/trac/ticket/12029
- New getters and setters in String type for DecimalFormatSymbols
Useful when the symbol can't be presented by one 2-byte java char
Upstream ticket: http://bugs.icu-project.org/trac/ticket/10368
- Expose TimeZone.SystemTimeZoneType values b/
65475899
Existing method TimeZone.getAvailableIDs takes the enum type
but there was no such value exposed in the Android SDK
- New constants for Unicode 10.0
Details: http://unicode.org/versions/Unicode10.0.0/
UScript, UCharacter, UProperty
- New contants in MeasureUnit
Bug:
68208236
Bug:
65475899
Test: m
Test: m update-api
Merged-In: I116b0e6f5a3ffb0820ed3802f7e063f9c052dd53
Change-Id: I1ee96619856098177513f5aaf564787dc3c34cc8
Treehugger Robot [Mon, 18 Dec 2017 17:47:35 +0000 (17:47 +0000)]
Merge "Publish Bluetooth HID Device Profile Service API"
Hugo Benichi [Fri, 15 Dec 2017 01:07:35 +0000 (10:07 +0900)]
MacAddress: address api review comments
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
of the mac address.
Bug:
70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1
Hugo Benichi [Tue, 5 Dec 2017 01:30:31 +0000 (10:30 +0900)]
Expose the MacAddress class in the api
Test: built, flashed, $ runtest frameworks-net
Bug:
69390696
Change-Id: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d
Merged-In: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d
(cherry picked from commit
d411cf61ed5b948aaf6f6234217d6c6999c35159)
Elliott Hughes [Thu, 14 Dec 2017 06:06:56 +0000 (22:06 -0800)]
Private API became public...
...but is now automatically called by the Context constructor.
Bug: N/A
Test: builds
Change-Id: Ic78bc4561adfec5047ed45589b8b936c506bd2b2
Elliott Hughes [Sat, 16 Dec 2017 00:15:02 +0000 (00:15 +0000)]
Merge "Minimal reformat to match internal master."
Hansong Zhang [Thu, 7 Dec 2017 00:20:22 +0000 (16:20 -0800)]
Publish Bluetooth HID Device Profile Service API
Enable the BluetoothHidDevice API in framework.
Bug:
63384609
Test: SL4A HID test; test with apps using BluetoothHidDevice
Merged-In: I52ca4674f11179f865bdff22e0289dfe893c40f5
Change-Id: I52ca4674f11179f865bdff22e0289dfe893c40f5
(cherry picked from commit
7bb587d72b8bb5ba8bd2d7530dbd89b4faac289f)
Treehugger Robot [Fri, 15 Dec 2017 21:58:07 +0000 (21:58 +0000)]
Merge "Fixed create app shortcut text and icon alignment in RTL Language"
yinxu [Wed, 29 Nov 2017 23:02:05 +0000 (15:02 -0800)]
Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL
When user gets the carrier config bundle, the value of this new key in
the bundle will indicate whether this bundle contains the default config
or carrier specific config.
Bug:
70400384
Test: Basic telephony sanity
Change-Id: I3480665398ad2b7517b71e808c3e4242d113ea46
Holly Jiuyu Sun [Thu, 14 Dec 2017 05:02:05 +0000 (21:02 -0800)]
Use getter instead of member for IEuiccController stub.
Make EuiccManager robust to com.android.phone process death.
Bug:
64150969
Test: Tested on two walleye devices. One contains the fix, and the other
one doesn't. Use kill -9 PID. The one with the fix can continue work
(the phone process is up quickly after gets killed), while the other one
doesn't work unless restart LPA.
Change-Id: I67649e31381f1c2b6f187d86684b22a000e6e0b0
Elliott Hughes [Fri, 15 Dec 2017 18:37:01 +0000 (10:37 -0800)]
Minimal reformat to match internal master.
Internal master SHA
1bcacfdcab0eaa0cee92bd7f5a1b5e271dd68e52 reformats
this entire project. To be able to update google-benchmark I need to
make a small change to this file. This is the minimal change that avoids
merge conflicts.
Bug: N/A
Test: builds
Change-Id: If3568a0f59a7c007858435953e127167f5862825
Brad Ebinger [Fri, 15 Dec 2017 17:53:16 +0000 (17:53 +0000)]
Merge "Adds MMTel APIs in temporary namespace"
Colin Cross [Fri, 15 Dec 2017 16:14:33 +0000 (16:14 +0000)]
Merge "Export aidl files for framework"
Neil Fuller [Fri, 15 Dec 2017 16:03:45 +0000 (16:03 +0000)]
Merge "Track API changes in libcore"
Tobias Thierer [Fri, 15 Dec 2017 13:46:52 +0000 (13:46 +0000)]
Merge "Move Mutable{Int,Long} from libcore to framework."
Tobias Thierer [Fri, 15 Dec 2017 13:45:12 +0000 (13:45 +0000)]
Merge "Track removal of android.system.Os.{sendfile,waitpid}."
Neil Fuller [Thu, 30 Nov 2017 15:54:50 +0000 (15:54 +0000)]
Track API changes in libcore
Bug:
35910877
Test: Build
(cherry picked from commit
12a747e656be08e208d44f6313d242436d5973ca)
Merged-In: Ia2e966e55d7a6d4d190e77af3af6a568e2ab5dee
Change-Id: Ia2e966e55d7a6d4d190e77af3af6a568e2ab5dee
Treehugger Robot [Fri, 15 Dec 2017 10:33:14 +0000 (10:33 +0000)]
Merge "Switch to modern ArgumentMatchers"
Erik Kline [Fri, 15 Dec 2017 07:09:24 +0000 (07:09 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
Yan Sun [Tue, 21 Nov 2017 08:36:00 +0000 (16:36 +0800)]
Add Notification Flag behavior test
Verify the behaviors of FLAG_ONGOING_EVENT, FLAG_NO_CLEAR,
FLAG_FOREGROUND_SERVICE after calling the below API.
1. onClearAll
2. cancelAllNotifications
3. cancelAllNotificationsInt
4. cancelNotificationsFromListener with or without keys
Bug:
69646960
Merged-In: I67fef5dbfd61ec9ef6dbee32a0cb80e9c1a2d1b4
Change-Id: I019660efc964a786b54c045dc4309f8a00d4ff01
Erik Kline [Fri, 15 Dec 2017 06:36:50 +0000 (06:36 +0000)]
Revert "Send empty LinkProperties when entering StoppedState."
This reverts commit
94209ab7686b202cfad6e42e07056bb9511006a8.
Reason for revert: should not have auto-submitted prior to more extensive wifi team testing.
Change-Id: Ie81b10473caf34971226948038bc20dc4fa6a1ae
Treehugger Robot [Fri, 15 Dec 2017 06:29:15 +0000 (06:29 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
Colin Cross [Thu, 14 Dec 2017 23:18:42 +0000 (15:18 -0800)]
Export aidl files for framework
Export the aidl files for framework so that anything building
against the framework automatically gets the default aidl
includes.
Test: m checkbuild
Change-Id: I26c599c79babd8ac91340a4e9d2c75d3f211f776
nharold [Thu, 14 Dec 2017 23:07:53 +0000 (23:07 +0000)]
Merge "Fix broken test due to API rename"
Nathan Harold [Thu, 14 Dec 2017 22:46:46 +0000 (14:46 -0800)]
Fix broken test due to API rename
A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.
Bug:
69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173
Brad Ebinger [Wed, 29 Nov 2017 03:15:47 +0000 (19:15 -0800)]
Adds MMTel APIs in temporary namespace
This change adds the new MMTel APIs in a
temporary android.telephony.ims.internal
namespace so that integration work can start
from the ImsService side.
Once the APIs are finalized further and integrated
into the platform, the namespace will be moved
back to android.telephony.ims.
Tests and integration CLs to follow in
separate CLs. Anything that is not implemented
yet has a TODO.
Test: Manual
Bug:
63987047
Change-Id: Iec5e15438f6259c6edd9a308e66bebc92685c578
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:25:37 +0000 (22:25 +0000)]
Merge "Confirmation code second try."
Alex Light [Mon, 20 Nov 2017 21:01:01 +0000 (13:01 -0800)]
Add support for selecting alternate JDWP implementations
Change the '-Xagentlib:jdwp=...' option to instead use the new
'-XjdwpOptions:...' syntax and remove the explicit transport-lib.
Add a '-XjdwpProvider:...' option. Set it to 'default' by default and
get its value from the 'dalvik.vm.jdwp-provider' property.
Test: Boots. Can debug apps
Test: Set dalvik.vm.jdwp-provider=adbconnection, stop, start, debug
Bug:
62821960
Change-Id: I1605030b94b38676c18885fcf2fa3490bccd3e0d
nharold [Thu, 14 Dec 2017 21:10:16 +0000 (21:10 +0000)]
Merge "Use consistent naming for allocating SPI."
Treehugger Robot [Thu, 14 Dec 2017 19:16:47 +0000 (19:16 +0000)]
Merge "Remove compiled classes list"
Treehugger Robot [Thu, 14 Dec 2017 17:52:27 +0000 (17:52 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc."
Philip P. Moltmann [Mon, 27 Nov 2017 20:29:20 +0000 (12:29 -0800)]
Switch to modern ArgumentMatchers
Test: - adb shell am instrument -w -e class com.android.mediaframeworktest.unit.MediaInserterTest com.android.mediaframeworktest/android.support.test.runner.AndroidJUnitRunner
- atest com.android.settingslib.users.AppRestrictionsHelperTest
- atest com.android.server.NetworkScorerAppManagerTest com.android.server.accessibility.MotionEventInjectorTest com.android.server.webkit.WebViewUpdateServiceTest
Change-Id: I6d4c543541d3bebcd65e5aa9e3f4d9a0152d5583
Mathieu Chartier [Tue, 12 Dec 2017 19:17:01 +0000 (11:17 -0800)]
Remove compiled classes list
No longer used.
(cherry-picked from commit
c87f8124bc1b79969f512f67d5d7f837b4cf28f7)
Bug:
37966211
Test: make
Merged-In: I5a1ef82ed6d8cf771513b86960c3d1d8cf7418f9
Change-Id: I5a1ef82ed6d8cf771513b86960c3d1d8cf7418f9
Jeff Davidson [Fri, 10 Nov 2017 23:58:20 +0000 (15:58 -0800)]
Update PhoneStateListener#onCallStateChanged Javadoc.
While the doc suggested that the phone number was "incoming" (e.g.
only populated for incoming calls), it should also be populated for
outgoing calls.
Bug:
67748129
Test: Verified expected behavior on Taimen running OC-MR1, added CTS
test (see other CL in this topic)
Change-Id: I1ddd9c042f287953358a794b91b2af5ed6f5b597
Merged-In: I1ddd9c042f287953358a794b91b2af5ed6f5b597
Treehugger Robot [Thu, 14 Dec 2017 16:14:34 +0000 (16:14 +0000)]
Merge "input cmds: fix keyevent not support sources parameter"
gaoshang [Thu, 14 Dec 2017 09:52:23 +0000 (17:52 +0800)]
input cmds: fix keyevent not support sources parameter
reused args.length repalce length.
https://issuetracker.google.com/issues/
70654695
Test: input cmds
Change-Id: Ifd8600d66d1647ae677add6b9d95b1d6831d6edb
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
Holly Jiuyu Sun [Fri, 10 Nov 2017 03:28:49 +0000 (19:28 -0800)]
Confirmation code second try.
Bug:
69050703
Test: test on phone
Merged-In: I3e3671bf83715ce55a9d0662f518ef837ac8f22f
Change-Id: I3e3671bf83715ce55a9d0662f518ef837ac8f22f
Treehugger Robot [Thu, 14 Dec 2017 02:56:40 +0000 (02:56 +0000)]
Merge "Extend connectivity OWNERS"
Benedict Wong [Thu, 14 Dec 2017 01:45:15 +0000 (01:45 +0000)]
Merge "Convert IpSecService resources to use refcounting"
Hugo Benichi [Sat, 9 Dec 2017 03:57:41 +0000 (12:57 +0900)]
Extend connectivity OWNERS
Also remove 'build.master@android.com' which is deprecated, not
declared by anybody else, and makes the linter unhappy.
Bug:
70394432
Test: built
Merged-In: I9c0ba41386129379f82259fcc5e745562b014fae
(cherry pick from commit
626eed2ac826a34b3ac9b1d4ddb9a783222187ec)
Change-Id: Ie802113d61f693d73f7234b44ac2a9bd462b3fbf
Benedict Wong [Thu, 16 Nov 2017 23:27:22 +0000 (15:27 -0800)]
Convert IpSecService resources to use refcounting
This is part 2 of 2 of the refcounting refactor for IpSecService
resources.
Switched ManagedResources to use RefcountedResource structure for
managing reference counts and eventual cleanup. Further, resource arrays
and quota management have been aggregated into a UserRecord for better
isolation. UID access checking has been similarly moved into the
UserRecordTracker, and resourceId checking has been rolled into
RefcountedResourceArray's accessor methods.
Bug:
63409385
Test: CTS, all unit tests run on aosp_marlin-eng, new tests added
Change-Id: Iee52dd1c9d2583bb6bfaf65be87569e9d50a5b63
Treehugger Robot [Wed, 13 Dec 2017 21:56:12 +0000 (21:56 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled"
Benedict Wong [Wed, 13 Dec 2017 21:33:38 +0000 (21:33 +0000)]
Merge "Add reference counted resources to IpSecService"
Colin Cross [Wed, 13 Dec 2017 20:16:19 +0000 (20:16 +0000)]
Merge "Make services.core the final priorityboosted jar"
Treehugger Robot [Wed, 13 Dec 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Include what we use."
Dmitry Shmidt [Wed, 13 Dec 2017 17:51:47 +0000 (17:51 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
Rob Herring [Wed, 29 Nov 2017 15:26:31 +0000 (09:26 -0600)]
renderthread: relax error handling for wide gamut EGL configs
It is valid to advertise EGL_EXT_pixel_format_float, but not have a
the requested EGL config. Instead of aborting, fallback to the default
behavior.
Change-Id: I6c602233b627dc2070364434fece57d3d0aab435
Cc: Romain Guy <romainguy@google.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Treehugger Robot [Wed, 13 Dec 2017 09:29:25 +0000 (09:29 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write"
Jack Yu [Thu, 7 Dec 2017 23:49:09 +0000 (15:49 -0800)]
Added test cases for DataCallResponse parcel read/write
bug:
64132030
Test: Unit tests
Merged-In: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
Change-Id: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
(cherry picked from commit
14c2aaa0a276807bdf922a3e7ce64bae880e0c68)
Benedict Wong [Fri, 27 Oct 2017 02:41:43 +0000 (19:41 -0700)]
Add reference counted resources to IpSecService
This patch adds (but does not enable the usage of) RefcountedResource
objects to IpSecService, with tests to ensure correct function. This is
patch 1 of a series of patches to refactor the resource management
systems in IpSecService.
RefcountedResource objects allow for management of acyclical dependency
trees, ensuring eventual cleanup when resources are no longer used. This
cleanup may be triggered by binder death or by explicit user action.
Bug:
63409385
Test: New tests written in IpSecServiceRefcountedResourceTest,
explicitly testing the RefcountedResource class
Change-Id: Ib5be7482b2ef5f1c8dec9be68f15e90d8b3aba6d
Tobias Thierer [Tue, 24 Oct 2017 23:58:05 +0000 (00:58 +0100)]
Move Mutable{Int,Long} from libcore to framework.
No libcore dependencies on these classes remain, so they
can now move to framework which already has all of the
other classes from android.util.
After this CL topic, libcore and framework no longer have
any classes from the same package.
Bug:
67901714
Test: make droid
Test: Treehugger
(cherry picked from commit
232f1eb387649e65008b88f86b81e5667321a735)
Change-Id: I65871516b762d8a53ebe01697e4d92f94903bfd3
Merged-In: I65871516b762d8a53ebe01697e4d92f94903bfd3
Tobias Thierer [Mon, 13 Nov 2017 15:58:07 +0000 (15:58 +0000)]
Track removal of android.system.Os.{sendfile,waitpid}.
Bug:
63986449
Bug:
67901714
Test: Treehugger
Change-Id: I9572023f30fc6481444c8951c17b661c652eca8d
Merged-In: I9572023f30fc6481444c8951c17b661c652eca8d
Colin Cross [Wed, 13 Dec 2017 03:43:04 +0000 (19:43 -0800)]
Make services.core the final priorityboosted jar
Other module besides services depend on services.core, and after
I417409281c928ea667d937090d2a0d9d72a449a2 they were getting
the non-priorityboosted version of the jar. Make services.core
a java_library that contains the output of the priorityboosting
java_genrule.
Test: m services
Change-Id: Ic9ca1b8f43f87b0d7d36b53bbc5136a331490c3e
Erik Kline [Mon, 11 Dec 2017 05:24:08 +0000 (14:24 +0900)]
Send empty LinkProperties when entering StoppedState.
Additionally, no longer try to transition from within a State's
enter() method (this can encounter Log.wtf()s). Introduce some
CMD_JUMP_* commands and use deferMessage().
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes (except for IpConnectivityMetricsTest failures)
- manual changing from DHCP to static configurations works:
2017-12-11T19:06:19.082 - INVOKE onLinkPropertiesChange({{InterfaceName: wlan0 LinkAddresses: [] Routes: [] DnsAddresses: [] Domains: null MTU: 0}})
Bug:
69800563
Bug:
70394432
Change-Id: Ice249a48b66806c0270ec3f11dd2e8e387d4e29b
Treehugger Robot [Wed, 13 Dec 2017 00:38:42 +0000 (00:38 +0000)]
Merge "Add assisted dialing properties to the framework."
Treehugger Robot [Wed, 13 Dec 2017 00:30:42 +0000 (00:30 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
Dan Albert [Wed, 13 Dec 2017 00:08:11 +0000 (16:08 -0800)]
Include what we use.
Test: mma
Bug: None
Change-Id: I9458aedad9a84f1660d3a2b08717b111dc8e3b74
Exempt-From-Owner-Approval: trivial cleanup
Colin Cross [Tue, 12 Dec 2017 23:27:15 +0000 (23:27 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp"
Colin Cross [Tue, 12 Dec 2017 23:26:41 +0000 (23:26 +0000)]
Merge "Remove unused target android.test.mock.sdk"
Colin Cross [Tue, 12 Dec 2017 23:25:48 +0000 (23:25 +0000)]
Merge "Separate android.test.mock from test-runner source"
Colin Cross [Tue, 12 Dec 2017 23:25:09 +0000 (23:25 +0000)]
Merge "Convert services to Android.bp"
Colin Cross [Thu, 7 Dec 2017 21:11:06 +0000 (13:11 -0800)]
Convert legacy-test, test-runner, and test-mock to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I110f752d2fa94c44581f20d4f308d9d429da0517
Merged-In: I110f752d2fa94c44581f20d4f308d9d429da0517
(cherry-picked from commit
2b7d71c7f8028741c2200bfeba8913b7f4f55cde)
Paul Duffin [Thu, 16 Nov 2017 13:02:37 +0000 (13:02 +0000)]
Remove unused target android.test.mock.sdk
Bug:
30188076
Test: make checkbuild
Change-Id: I9b613969425e6c4d8700f6275484d6452a3cc3af
Merged-In: I9b613969425e6c4d8700f6275484d6452a3cc3af
(cherry picked from commit
10d0658bf020197c16264a1da4637e0d20ee6445)
Paul Duffin [Wed, 15 Nov 2017 11:39:14 +0000 (11:39 +0000)]
Separate android.test.mock from test-runner source
Extracts the source for the android.test.mock library from the
frameworks/base/test-runner directory into its own
frameworks/base/test-mock directory. They are already treated separately
at runtime and compile time so this just makes the separation complete.
Bug:
30188076
Test: make checkbuild
Change-Id: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
Merged-In: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
(cherry picked from commit
e254526f0fe5d22681555bd4a00b7ee96fee1dc1)
Colin Cross [Tue, 5 Dec 2017 17:46:29 +0000 (09:46 -0800)]
Convert services to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I417409281c928ea667d937090d2a0d9d72a449a2
Merged-In: I417409281c928ea667d937090d2a0d9d72a449a2
Exempt-From-Owner-Approval: trivial conversion
(cherry-picked from commit
e0b2ee52d2f274a2d46b2e6695e42d2764c39fa7)
Treehugger Robot [Tue, 12 Dec 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"
Jonathan Basseri [Thu, 16 Nov 2017 18:58:01 +0000 (10:58 -0800)]
Use consistent naming for allocating SPI.
Throughout the IPsec code (API, system server, netd) we use "reserve"
SPI and "allocate" SPI interchangeably. This renames to use "allocate"
everywhere for self-consistency and consistency with the kernel
(ALLOCSPI).
In javadoc, I am leaving the word "reserve" in several places because it
is still an accurate description of how the method behaves.
Bug:
69128142
Test: TreeHugger should be enough
Change-Id: I8ea603b4612303b0393beef04032671fa53d2106
Ta-wei Yen [Mon, 4 Dec 2017 23:54:37 +0000 (15:54 -0800)]
Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled
Due to notification channel changes in O these settings are no longer
applicable.
Change-Id: Iaac6fda37bc989e09e7e4b1c20f2434be3feee92
Fixes:
38205149
Test: Doc change.
Treehugger Robot [Tue, 12 Dec 2017 19:02:25 +0000 (19:02 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"
Treehugger Robot [Tue, 12 Dec 2017 18:04:10 +0000 (18:04 +0000)]
Merge "Moved data connection response into system api."
Eric Erfanian [Thu, 7 Dec 2017 00:27:53 +0000 (16:27 -0800)]
Add assisted dialing properties to the framework.
These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.
Test: no existing unit tests found. could use some pointers
Bug:
35963245
Change-Id: I3ed8ac5ad7300c44f87e2573d9409b3a92b98ab6
Merged-In: I84343fb0cda16514c01997fd71d1e819b5b7eebb