OSDN Git Service
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 [Sat, 16 Dec 2017 00:15:02 +0000 (00:15 +0000)]
Merge "Minimal reformat to match internal master."
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
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
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."
nharold [Thu, 14 Dec 2017 23:28:16 +0000 (23:28 +0000)]
Merge "Fix broken test due to API rename" am:
0abc93177f
am:
ee898c81a7
Change-Id: I7e99991cd2c71c66e1acb3aa3957efb28c9a426a
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:20:11 +0000 (23:20 +0000)]
Merge "Fix broken test due to API rename"
am:
0abc93177f
Change-Id: I75a3f96e0d6d7cf05bbd8eb0dae03d114ac76f3e
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:46:29 +0000 (22:46 +0000)]
Merge "Confirmation code second try." am:
df0f5e9791
am:
cdc3c3ec77
Change-Id: I4c0de71e0c488551f6d0fa5e1f73ca2971e4a5f6
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:37:58 +0000 (22:37 +0000)]
Merge "Confirmation code second try."
am:
df0f5e9791
Change-Id: I426c5fcb2610cd1740fb9d6cd0a98a7bacfcb58a
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:25:37 +0000 (22:25 +0000)]
Merge "Confirmation code second try."
nharold [Thu, 14 Dec 2017 21:36:32 +0000 (21:36 +0000)]
Merge "Use consistent naming for allocating SPI." am:
bf48afea49
am:
4753ed4b1b
Change-Id: Ib5d89044313341790b1ee9271642072ddce181af
nharold [Thu, 14 Dec 2017 21:21:06 +0000 (21:21 +0000)]
Merge "Use consistent naming for allocating SPI."
am:
bf48afea49
Change-Id: I9adb5c14e91b33f09707c85c865cf2fc454f80ba
nharold [Thu, 14 Dec 2017 21:10:16 +0000 (21:10 +0000)]
Merge "Use consistent naming for allocating SPI."
Mathieu Chartier [Thu, 14 Dec 2017 19:57:14 +0000 (19:57 +0000)]
Merge "Remove compiled classes list" am:
3adfec2de3
am:
3a3fc7a43b
Change-Id: Ia40246372d156d308c4e3930c3789dfe0a1010f8
Mathieu Chartier [Thu, 14 Dec 2017 19:44:50 +0000 (19:44 +0000)]
Merge "Remove compiled classes list"
am:
3adfec2de3
Change-Id: I98d29b9f3aeeaf78ba93b631b0746cc37ac9e7e5
Treehugger Robot [Thu, 14 Dec 2017 19:16:47 +0000 (19:16 +0000)]
Merge "Remove compiled classes list"
Jeff Davidson [Thu, 14 Dec 2017 18:26:04 +0000 (18:26 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc." am:
6e41b2c5c8
am:
67c9a43605
Change-Id: If333cd7cee4785779cdd4acc8421059c4a947dd2
Jeff Davidson [Thu, 14 Dec 2017 18:11:26 +0000 (18:11 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc."
am:
6e41b2c5c8
Change-Id: I9fd9ab01b770fc8a1c5998d3a4c3e824123e2076
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
gaoshang [Thu, 14 Dec 2017 16:37:08 +0000 (16:37 +0000)]
Merge "input cmds: fix keyevent not support sources parameter" am:
11ec2eb118
am:
4f697fe574
Change-Id: Ice43c79858930ccc48b9470152e0af2d99e966ae
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
gaoshang [Thu, 14 Dec 2017 16:26:46 +0000 (16:26 +0000)]
Merge "input cmds: fix keyevent not support sources parameter"
am:
11ec2eb118
Change-Id: I7e527a58332a4453fe104538e55a60a444602159
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
Hugo Benichi [Thu, 14 Dec 2017 03:25:36 +0000 (03:25 +0000)]
Merge "Extend connectivity OWNERS" am:
64c2488056
am:
3304263594
Change-Id: I816a15beedcfc9f200d00da7282e54992a096555
Hugo Benichi [Thu, 14 Dec 2017 03:15:04 +0000 (03:15 +0000)]
Merge "Extend connectivity OWNERS"
am:
64c2488056
Change-Id: I07622a82cac394a52f5e17a9f33e6bbbe68b61ea
Treehugger Robot [Thu, 14 Dec 2017 02:56:40 +0000 (02:56 +0000)]
Merge "Extend connectivity OWNERS"
Benedict Wong [Thu, 14 Dec 2017 02:20:20 +0000 (02:20 +0000)]
Merge "Convert IpSecService resources to use refcounting" am:
b6ba8fd49d
am:
8698b33cc2
Change-Id: I9645df5304d7f11068d190cbdaccfe83ca0580bc
Felipe Leme [Thu, 14 Dec 2017 02:12:06 +0000 (02:12 +0000)]
Proper autofill fix to let phone process autofill Settings activity. am:
2f58b03ea1 am:
4a8d9b628f -s ours
am:
f4c26d98a6 -s ours
Change-Id: I568f64d403ef03dfec91b99dd4e0e224631b38b7
Benedict Wong [Thu, 14 Dec 2017 02:00:41 +0000 (02:00 +0000)]
Merge "Convert IpSecService resources to use refcounting"
am:
b6ba8fd49d
Change-Id: I88a67008ea88f40aff918422c085fa9add3aeba3
Felipe Leme [Thu, 14 Dec 2017 02:00:35 +0000 (02:00 +0000)]
Proper autofill fix to let phone process autofill Settings activity. am:
2f58b03ea1
am:
4a8d9b628f -s ours
Change-Id: Idecee1722d2f0cb504fb591caa0dc1609361e392
Felipe Leme [Thu, 14 Dec 2017 01:49:36 +0000 (01:49 +0000)]
Proper autofill fix to let phone process autofill Settings activity.
am:
2f58b03ea1
Change-Id: Ia167badcdb5fee60a62c9cf0932150b54180ba0b
Benedict Wong [Thu, 14 Dec 2017 01:45:15 +0000 (01:45 +0000)]
Merge "Convert IpSecService resources to use refcounting"
Felipe Leme [Thu, 14 Dec 2017 01:43:23 +0000 (01:43 +0000)]
Merge "Proper autofill fix to let phone process autofill Settings activity." into oc-mr1-dev
am:
f2eddf8df9
Change-Id: I7603e96214ca4e97985b6678cb0e75b7e36d0880
TreeHugger Robot [Thu, 14 Dec 2017 01:15:51 +0000 (01:15 +0000)]
Merge "Proper autofill fix to let phone process autofill Settings activity." into oc-mr1-dev
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
Ta-wei Yen [Wed, 13 Dec 2017 22:17:45 +0000 (22:17 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled" am:
8244ebfc4e
am:
a02bbdb8d8
Change-Id: Ife2c39388ab647b0e4f5677d920da780b6eb39ca
Ta-wei Yen [Wed, 13 Dec 2017 22:07:17 +0000 (22:07 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled"
am:
8244ebfc4e
Change-Id: Iea3c38056e17abc09af7f7d933cbb9627575d8ee
Benedict Wong [Wed, 13 Dec 2017 22:00:26 +0000 (22:00 +0000)]
Merge "Add reference counted resources to IpSecService" am:
e11366f38a
am:
adb6437fea
Change-Id: I927ac534570b3836510e0fb4feda8cf544f5a9e4
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:50:19 +0000 (21:50 +0000)]
Merge "Add reference counted resources to IpSecService"
am:
e11366f38a
Change-Id: If218f4c241199e22e3295a5bcb049980d7949f4e
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:43:20 +0000 (20:43 +0000)]
Merge "Make services.core the final priorityboosted jar" am:
a0c1780d3c
am:
93de069ec9
Change-Id: Ib1a626060f2e2d617ca0b51e016cc7e06cae27d8
Colin Cross [Wed, 13 Dec 2017 20:33:28 +0000 (20:33 +0000)]
Merge "Make services.core the final priorityboosted jar"
am:
a0c1780d3c
Change-Id: I4969cd15085ab460a112547e63362bf8c2bc1602
Colin Cross [Wed, 13 Dec 2017 20:16:19 +0000 (20:16 +0000)]
Merge "Make services.core the final priorityboosted jar"
Dan Albert [Wed, 13 Dec 2017 20:07:04 +0000 (20:07 +0000)]
Merge "Include what we use." am:
b0efcc1f68
am:
afa15b0846
Change-Id: I1f4ba5196d1118cfcd68821fa8ac0fbd17d8b5fc
Dan Albert [Wed, 13 Dec 2017 19:52:11 +0000 (19:52 +0000)]
Merge "Include what we use."
am:
b0efcc1f68
Change-Id: Ic75bda75c80be19ee7f0f865ffd9e4f8c70fe785
Treehugger Robot [Wed, 13 Dec 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Include what we use."
Dmitry Shmidt [Wed, 13 Dec 2017 18:16:43 +0000 (18:16 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs" am:
50666fa217
am:
c1ad3c5f29
Change-Id: I81a582d7ad20f062803963a3dc43ddcec288c8ec
Dmitry Shmidt [Wed, 13 Dec 2017 18:04:19 +0000 (18:04 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
am:
50666fa217
Change-Id: Ic97b3742278bcdb2b5ec7b0540a7f7252c5472a4
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>
Jack Yu [Wed, 13 Dec 2017 09:51:27 +0000 (09:51 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write" am:
125d736bbe
am:
06bf4f618c
Change-Id: I0fb9abd42aa9b995c76969a12b52eb6795acafb2
Jack Yu [Wed, 13 Dec 2017 09:42:49 +0000 (09:42 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write"
am:
125d736bbe
Change-Id: I9b2bd725ddaa40513747e368553c918899987d2f
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
Eric Erfanian [Wed, 13 Dec 2017 02:21:36 +0000 (02:21 +0000)]
Merge "Add assisted dialing properties to the framework." am:
f5bec0d781
am:
1d9fc9a490
Change-Id: I176ce86a83406d2eecd33cf439085fcc13703a27