OSDN Git Service
Andrew Solovay [Thu, 21 Dec 2017 17:42:46 +0000 (17:42 +0000)]
Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev
am:
7835c650b2
Change-Id: I662ac186b079d88fc503fa546b52b1297b98a036
Andrew Solovay [Wed, 20 Dec 2017 21:34:26 +0000 (21:34 +0000)]
Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev
Bill Yi [Wed, 20 Dec 2017 19:30:50 +0000 (19:30 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours am:
daa1d87e50 -s ours am:
0e62ea2f4c -s ours
am:
c5dff435b0 -s ours
Change-Id: I1ad653cc62c3cbdbffb486f1fa02013be8e953b1
Philip P. Moltmann [Wed, 20 Dec 2017 19:18:45 +0000 (19:18 +0000)]
Merge "Don't include mockito in frameworks-base-testutils" am:
f924642729
am:
cf7aa7c09e
Change-Id: I6b2486c69af1a05f8282a0d648403522adf2b471
Bill Yi [Wed, 20 Dec 2017 19:17:58 +0000 (19:17 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours am:
daa1d87e50 -s ours
am:
0e62ea2f4c -s ours
Change-Id: Ia89c48363a381a246f132a2d8619d7b650ed19ab
Bill Yi [Wed, 20 Dec 2017 19:12:00 +0000 (19:12 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours
am:
daa1d87e50 -s ours
Change-Id: Ieeaf1281b3ef3256264850f8910c7075e07eabe6
Philip P. Moltmann [Wed, 20 Dec 2017 19:09:03 +0000 (19:09 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"
am:
f924642729
Change-Id: I4470f63baac7bc33dff0dac94da3a0d93c322dc7
Bill Yi [Wed, 20 Dec 2017 19:07:26 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours
am:
1fccf167ff -s ours
Change-Id: I295d71779c2361915f61c3b1f76ca90103b716ea
Bill Yi [Wed, 20 Dec 2017 19:03:39 +0000 (19:03 +0000)]
Import translations. DO NOT MERGE
am:
406659b709 -s ours
Change-Id: Ida0956b8a3ba81a7a5f78753236c0cac001c2b1a
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:42:26 +0000 (18:42 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am:
4edb4c8ec4
am:
5949912523
Change-Id: I9036fc2768dd9664ab7407b359f3c689c7ce700e
Benedict Wong [Wed, 20 Dec 2017 18:35:45 +0000 (18:35 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
am:
4edb4c8ec4
Change-Id: I75a3cb9e9d9d7d3b6c0ede86074a00ddcd86028e
Benedict Wong [Wed, 20 Dec 2017 18:25:32 +0000 (18:25 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
Andrew Solovay [Tue, 19 Dec 2017 01:23:35 +0000 (17:23 -0800)]
doc: Fixing Javadoc formatting problems.
No code changes, just fixing typos in the doc comments.
Doc is staged to:
http://go/dac-stage/reference/android/service/autofill/AutofillService.html
http://go/dac-stage/reference/android/service/autofill/FillRequest.html
Test: make ds-docs
Bug:
70812346
Merged-In: Ia76121c60197275c6be1717c8003fe1c4baf5f97
Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f
Sanket Padawe [Wed, 20 Dec 2017 17:48:58 +0000 (17:48 +0000)]
Merge "Implement Call handover initiation side APIs." am:
e2d080481a
am:
9053309827
Change-Id: I98828fd1ef99d42ffbfb8650731c1d2b848bc062
Sanket Padawe [Wed, 20 Dec 2017 17:41:13 +0000 (17:41 +0000)]
Merge "Implement Call handover initiation side APIs."
am:
e2d080481a
Change-Id: Ib9840c4ce4abf64f36e21cbc3256050e4216314b
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:21:59 +0000 (15:21 +0000)]
Merge "Add support for selecting alternate JDWP implementations" am:
cbeea23861
am:
f5ec7f2e26
Change-Id: I95d3064791d497986d0ece010be05749904d1ed3
Alex Light [Wed, 20 Dec 2017 15:13:34 +0000 (15:13 +0000)]
Merge "Add support for selecting alternate JDWP implementations"
am:
cbeea23861
Change-Id: Ifa4ffb6610152f1e919bc10fc7c8697c4bb99a0d
Alex Light [Wed, 20 Dec 2017 15:04:10 +0000 (15:04 +0000)]
Merge "Add support for selecting alternate JDWP implementations"
Bill Yi [Wed, 20 Dec 2017 11:38:01 +0000 (03:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I200b939582ec1b2a016f83f62ebb586da842bfae
Auto-generated-cl: translation import
Holly Jiuyu Sun [Wed, 20 Dec 2017 03:06:37 +0000 (03:06 +0000)]
Merge "Use getter instead of member for IEuiccController stub." am:
6991266aa6
am:
fe8ee59db5
Change-Id: I96f4cca6ca0f1f75e2fd32123e6cc3d8769ce348
Holly Jiuyu Sun [Wed, 20 Dec 2017 02:59:14 +0000 (02:59 +0000)]
Merge "Use getter instead of member for IEuiccController stub."
am:
6991266aa6
Change-Id: I253f3bceb0f3c1855fada016c792bf29876e4aa1
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 18:35:40 +0000 (18:35 +0000)]
Merge "API updated for ICU4J 60.1" am:
71b25c06a7
am:
68f1995d19
Change-Id: I572007ea58f4011d24004c90730b14e154cfae92
vichang [Tue, 19 Dec 2017 18:24:59 +0000 (18:24 +0000)]
Merge "API updated for ICU4J 60.1"
am:
71b25c06a7
Change-Id: I3968eda2e73fe3641abd45684f6ae992d6e780d3
vichang [Tue, 19 Dec 2017 13:13:13 +0000 (13:13 +0000)]
Merge "API updated for ICU4J 60.1"
Steve Paik [Tue, 19 Dec 2017 00:40:59 +0000 (00:40 +0000)]
Merge "Rename set_wakeup_callback" am:
7e3de17f3d
am:
5611305abe
Change-Id: I3434d6657ca905b12fb73beca65473f3149202bb
Elliott Hughes [Tue, 19 Dec 2017 00:35:58 +0000 (00:35 +0000)]
Merge "Private API became public..." am:
eb44ebbfcd
am:
85fc4d6dd6
Change-Id: I9ccfc88dc7d86462e323e32ce2b13726e05ec1c3
Steve Paik [Tue, 19 Dec 2017 00:29:22 +0000 (00:29 +0000)]
Merge "Rename set_wakeup_callback"
am:
7e3de17f3d
Change-Id: Ic4a3d630d76e333e71a746a237d45a5fb3414994
Benedict Wong [Tue, 19 Dec 2017 00:27:57 +0000 (00:27 +0000)]
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am:
d0ac50bcad
am:
8caa274ade
Change-Id: I2f27c76a1f493ff4f0bd423c06f159e629866d4d
Elliott Hughes [Tue, 19 Dec 2017 00:24:28 +0000 (00:24 +0000)]
Merge "Private API became public..."
am:
eb44ebbfcd
Change-Id: I9ec4e8bb8609a29ed48d2862913c007d8f4e83c6
Benedict Wong [Tue, 19 Dec 2017 00:16:29 +0000 (00:16 +0000)]
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets"
am:
d0ac50bcad
Change-Id: If2f71108d0c3d5742ee39b041f5fa886aac820cb
Treehugger Robot [Tue, 19 Dec 2017 00:06:15 +0000 (00:06 +0000)]
Merge "Rename set_wakeup_callback"
Hugo Benichi [Tue, 19 Dec 2017 00:06:00 +0000 (00:06 +0000)]
Merge changes I798d8fec,I4a2d5866 am:
c5212b6654
am:
99be302c71
Change-Id: I41b507c4e4bf9b8b9082f5e7eaab8985b5bbef41
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..."
Hugo Benichi [Mon, 18 Dec 2017 23:57:15 +0000 (23:57 +0000)]
Merge changes I798d8fec,I4a2d5866
am:
c5212b6654
Change-Id: Idf04186ece2738c113e2e33c5e7a5133aa437933
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:42:03 +0000 (23:42 +0000)]
Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL" am:
7be7d422a2
am:
784a690ec7
Change-Id: I0e4098cfd0fe0d78e2d5de33a193da1095974ea6
Ying Xu [Mon, 18 Dec 2017 23:34:51 +0000 (23:34 +0000)]
Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL"
am:
7be7d422a2
Change-Id: I9d71fb9956f2300d683893da8dd3a78ca8320bc8
Ying Xu [Mon, 18 Dec 2017 23:26:25 +0000 (23:26 +0000)]
Merge "Add new key KEY_CARRIER_CONFIG_OVERRIDE_BOOL"
Android Build Merger (Role) [Mon, 18 Dec 2017 21:57:05 +0000 (21:57 +0000)]
Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am:
bef8c59634 am:
826657a9c2" into oc-mr1-dev-plus-aosp
Benedict Wong [Mon, 18 Dec 2017 21:56:41 +0000 (21:56 +0000)]
Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am:
bef8c59634
am:
826657a9c2
Change-Id: Ia06653e6c1cccddcd2de17dd88a9ef47263f5c79
Kevin Hufnagle [Mon, 18 Dec 2017 21:55:02 +0000 (21:55 +0000)]
docs: Touch-up edits to ShortcutManager class reference.
am:
4777f37f78
Change-Id: Ibc90a8a2771a3e9fe5e59398be986b75490c60c2
Benedict Wong [Mon, 18 Dec 2017 21:46:18 +0000 (21:46 +0000)]
Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID."
am:
bef8c59634
Change-Id: I38da928c8484eb0bbb5d9cbc473d6d36de35e1e8
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)
Kevin Hufnagle [Mon, 18 Dec 2017 17:57:39 +0000 (09:57 -0800)]
docs: Touch-up edits to ShortcutManager class reference.
Test: make ds-docs -j16
Bug:
64727234
Change-Id: Ieb2c2f6ee6706f206e2cc0d5be8bc3a5cdd9f345
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
Hansong Zhang [Mon, 18 Dec 2017 18:06:19 +0000 (18:06 +0000)]
Merge "Publish Bluetooth HID Device Profile Service API" am:
fbd4ea125f
am:
6047c90e9b
Change-Id: Icd57d9a0d70bd4bc0dfe1396335254ccef9528b4
Hansong Zhang [Mon, 18 Dec 2017 17:59:44 +0000 (17:59 +0000)]
Merge "Publish Bluetooth HID Device Profile Service API"
am:
fbd4ea125f
Change-Id: I97a3b9f865af9d50d52674702c6706729f9ab419
Kevin Hufnagle [Mon, 18 Dec 2017 17:52:36 +0000 (17:52 +0000)]
Merge "docs: Revised wording, section order for ShortcutManager API ref." into oc-mr1-dev
am:
d642148c84
Change-Id: Iabb204baf3772b44b6852ec9d7135db0baf228bc
Treehugger Robot [Mon, 18 Dec 2017 17:47:35 +0000 (17:47 +0000)]
Merge "Publish Bluetooth HID Device Profile Service API"
Kevin Hufnagle [Mon, 18 Dec 2017 17:42:48 +0000 (17:42 +0000)]
Merge "docs: Revised wording, section order for ShortcutManager API ref." into oc-mr1-dev
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 [Sat, 16 Dec 2017 00:40:08 +0000 (00:40 +0000)]
Merge "Minimal reformat to match internal " am:
0d75603ea7
am:
5df94f6c14
Change-Id: I33cc16e2a9ecd91e97b0824834760f88b13cac2e
Elliott Hughes [Sat, 16 Dec 2017 00:32:22 +0000 (00:32 +0000)]
Merge "Minimal reformat to match internal master."
am:
0d75603ea7
Change-Id: I0447a57265c8a73f40dc6f75964516d31f175165
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)
Kevin Hufnagle [Sat, 2 Dec 2017 00:01:36 +0000 (16:01 -0800)]
docs: Revised wording, section order for ShortcutManager API ref.
Provided more thorough description of static shortcut options,
integrated shortcut limits section with the "updating shortcuts"
example, added more links to narrative documentation.
Test: make ds-docs -j8
Bug:
64727234
Change-Id: I70c16082e3e85a31b501c8e313d93200d827c7f4
susanta.patra [Fri, 15 Dec 2017 22:16:02 +0000 (22:16 +0000)]
Merge "Fixed create app shortcut text and icon alignment in RTL Language" am:
29f61c21f4
am:
c1a2cd2175
Change-Id: Id0fc2be3255620089a632236af2997213a9d6003
susanta.patra [Fri, 15 Dec 2017 22:10:00 +0000 (22:10 +0000)]
Merge "Fixed create app shortcut text and icon alignment in RTL Language"
am:
29f61c21f4
Change-Id: Iaa0829e9844278731e403e13b2cc8a3400969bb4
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"
Ricardo Loo Foronda [Fri, 15 Dec 2017 20:31:18 +0000 (20:31 +0000)]
docs: Added code tag to meta-data name and fixed some @see tags
am:
f2a8aea735
Change-Id: If5601165a816e0dadc672008f8d5049563ee577f
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 18:12:49 +0000 (18:12 +0000)]
Merge "Adds MMTel APIs in temporary namespace" am:
4e54d6092b
am:
ac0d27659a
Change-Id: I815f2ea36c951f71c7b8feb85a42546eeea47000
Brad Ebinger [Fri, 15 Dec 2017 18:05:43 +0000 (18:05 +0000)]
Merge "Adds MMTel APIs in temporary namespace"
am:
4e54d6092b
Change-Id: I95ad16f1e08ff11f9af8f626f6a8827308e806dd
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:34:12 +0000 (16:34 +0000)]
Merge "Export aidl files for framework" am:
f5e37d18de
am:
28064dd526
Change-Id: Iae7bdf79e68160c3ff7392cb0ff5c3f28996c910
Colin Cross [Fri, 15 Dec 2017 16:26:19 +0000 (16:26 +0000)]
Merge "Export aidl files for framework"
am:
f5e37d18de
Change-Id: If2e9391da213b064e1b55fa0da56e78ac144c89b
Neil Fuller [Fri, 15 Dec 2017 16:22:14 +0000 (16:22 +0000)]
Merge "Track API changes in libcore" am:
63ae028ae0
am:
96211469a6
Change-Id: Ia6739db882bbc585ad7aa142795b59b4cba87fdb
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:14:08 +0000 (16:14 +0000)]
Merge "Track API changes in libcore"
am:
63ae028ae0
Change-Id: I0163f365395c262b2a1402f674bdb7d0cc1b0e74
Neil Fuller [Fri, 15 Dec 2017 16:03:45 +0000 (16:03 +0000)]
Merge "Track API changes in libcore"
Ricardo Loo Foronda [Fri, 27 Oct 2017 00:02:31 +0000 (17:02 -0700)]
docs: Added code tag to meta-data name and fixed some @see tags
Status: Ready for review.
Changes:
* Surrounded android.service.carrier.LONG_LIVED_BINDING with code tags
in CarrierService class.
* Prefixed @see tags with # in CarrierConfigManager#KEY_FORCE_HOME_NETWORK_BOOL.
* Prefixed @see tag with class name in
CarrierConfigManager#notifyConfigChangedForSubId.
Test: make ds-docs
Staged content:
*
https://android-dot-devsite.googleplex.com/reference/android/service/carrier/CarrierService.html
*
https://android-dot-devsite.googleplex.com/reference/android/telephony/CarrierConfigManager.html#KEY_FORCE_HOME_NETWORK_BOOL
*
https://android-dot-devsite.googleplex.com/reference/android/telephony/CarrierConfigManager.html#notifyConfigChangedForSubId(int)
Bug:
23289716
Change-Id: I3b5be3ecc45bfb83e3fe0ae9bc76dc7761557e08
Tobias Thierer [Fri, 15 Dec 2017 14:12:41 +0000 (14:12 +0000)]
Merge "Move Mutable{Int,Long} from libcore to framework." am:
ba9db527ec
am:
cac71f08e4
Change-Id: Iea66238ac89df2f7b8e71f6df8dc7cadb2396d24
Tobias Thierer [Fri, 15 Dec 2017 14:05:11 +0000 (14:05 +0000)]
Merge "Track removal of android.system.Os.{sendfile,waitpid}." am:
833aa452a8
am:
0712266bd4
Change-Id: Idb94dd6559afb1cc72f3d84698306ee4e69c35dd
Tobias Thierer [Fri, 15 Dec 2017 14:02:28 +0000 (14:02 +0000)]
Merge "Move Mutable{Int,Long} from libcore to framework."
am:
ba9db527ec
Change-Id: I5c0ef040b00a9482cd3ae3500e4cdce2a9490072
Tobias Thierer [Fri, 15 Dec 2017 13:56:00 +0000 (13:56 +0000)]
Merge "Track removal of android.system.Os.{sendfile,waitpid}."
am:
833aa452a8
Change-Id: Ieed0816cddba7d05bbebceae9ca6f5bc1f55bd08
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
Philip P. Moltmann [Fri, 15 Dec 2017 11:03:51 +0000 (11:03 +0000)]
Merge "Switch to modern ArgumentMatchers" am:
343c512834
am:
3f5a8e019e
Change-Id: I7103c06cf8c397a5ec2d536a4b7b16258f686244
Philip P. Moltmann [Fri, 15 Dec 2017 10:47:38 +0000 (10:47 +0000)]
Merge "Switch to modern ArgumentMatchers"
am:
343c512834
Change-Id: I25f39cefde34f5a27a9abf5d97fe94dcbcfee3cd
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:29:10 +0000 (07:29 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState."" am:
e8a4cb13e9
am:
bb8c1a501a
Change-Id: I78bd3c062e9ae89f43dda93ff0d8785cd2cbff70
Erik Kline [Fri, 15 Dec 2017 07:20:33 +0000 (07:20 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
am:
e8a4cb13e9
Change-Id: Ib8b889f0c80f90eff4d079ee7e0686ebd2812885
Erik Kline [Fri, 15 Dec 2017 07:09:24 +0000 (07:09 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
Erik Kline [Fri, 15 Dec 2017 06:49:11 +0000 (06:49 +0000)]
Merge "Send empty LinkProperties when entering StoppedState." am:
5557fe3e2d
am:
de336f18f9
Change-Id: Ida8252c45d7e4680282b49f995fc564cb7227adf
Erik Kline [Fri, 15 Dec 2017 06:39:22 +0000 (06:39 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
am:
5557fe3e2d
Change-Id: I5b343fdd2da7f64284b4c4b357516320c8c81594