OSDN Git Service
Wale Ogunwale [Wed, 10 Jan 2018 22:44:04 +0000 (22:44 +0000)]
Merge "Set current frame during status bar layout"
TreeHugger Robot [Wed, 10 Jan 2018 22:42:27 +0000 (22:42 +0000)]
Merge "mediaformat: Expose frame reordering to application."
TreeHugger Robot [Wed, 10 Jan 2018 22:39:28 +0000 (22:39 +0000)]
Merge "Rename onException to onPartialImage"
TreeHugger Robot [Wed, 10 Jan 2018 21:31:19 +0000 (21:31 +0000)]
Merge "Avoid unnecessary division in TextView.Marquee.tick."
TreeHugger Robot [Wed, 10 Jan 2018 21:28:41 +0000 (21:28 +0000)]
Merge "Adopt robolectric 3.6.1"
Dianne Hackborn [Wed, 10 Jan 2018 21:14:31 +0000 (21:14 +0000)]
Merge "Swap "foreground service" and "bound foreground service" proc states."
Victor Hsieh [Wed, 10 Jan 2018 21:11:47 +0000 (21:11 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork"" am:
54da93b981 am:
8fffe22ab1
am:
5e1a526cf4 -s ours
Change-Id: I11e888498254518ae3d269bdd0582b3d16fb8959
Jack Yu [Wed, 10 Jan 2018 21:01:52 +0000 (21:01 +0000)]
Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity" am:
5e90553bcf am:
18bd9922fb
am:
d1cd07afe2
Change-Id: I073ef7a8efb94c64d4640c64463f4088025213f2
TreeHugger Robot [Wed, 10 Jan 2018 20:48:43 +0000 (20:48 +0000)]
Merge "Guard against crash on startup"
Chavi Weingarten [Wed, 10 Jan 2018 20:47:53 +0000 (20:47 +0000)]
Merge changes I9bf357f3,Ia83b74fc
* changes:
Revert "Call prepareSurfaces in applySurfacesChangesTransaction"
Revert "Revert "Revert "Avoid setting size/position on Transaction if not needed"""
Dmitry Dementyev [Wed, 10 Jan 2018 20:47:46 +0000 (20:47 +0000)]
Merge "Use correct lock screen type in KeyStoreRecoveryMetadata constructor."
chaviw [Wed, 10 Jan 2018 20:31:21 +0000 (12:31 -0800)]
Revert "Call prepareSurfaces in applySurfacesChangesTransaction"
This reverts commit
6b0f8461cfcd6eafa31e5bad0c46048a76a2d616.
Fixes:
71789344
chaviw [Wed, 10 Jan 2018 20:31:08 +0000 (12:31 -0800)]
Revert "Revert "Revert "Avoid setting size/position on Transaction if not needed"""
This reverts commit
1e8c4c8c0c9111b7ae90e110c73122c7bff1df81.
Fixes:
71789344
Bryce Lee [Wed, 10 Jan 2018 20:23:35 +0000 (20:23 +0000)]
Merge "Make sure correct default values for ActivityStarter."
Victor Hsieh [Wed, 10 Jan 2018 19:57:17 +0000 (19:57 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork"" am:
54da93b981
am:
8fffe22ab1
Change-Id: Ic6b927ab28f75fb46f60dd77d5ae4ccf98c0b329
Jerry Zhang [Wed, 10 Jan 2018 19:51:20 +0000 (19:51 +0000)]
Merge "Revamp USB tethering startup flow." am:
90fddefd5e am:
375c0a55d8
am:
49df4a5d3d
Change-Id: I36cca56eb93767d23f2d08b708208ba8ff1db06d
Jack Yu [Wed, 10 Jan 2018 19:50:34 +0000 (19:50 +0000)]
Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity" am:
5e90553bcf
am:
18bd9922fb
Change-Id: Ic5802a6f39715f042d18bb25dd3481c4c79b508f
Android Build Merger (Role) [Wed, 10 Jan 2018 19:43:01 +0000 (19:43 +0000)]
Merge "Merge "Don't wait for Bluetooth when shutting down" am:
d9b3322e88 am:
9ae00d9d9a am:
51019ab1d5 -s ours"
Myles Watson [Wed, 10 Jan 2018 19:42:16 +0000 (19:42 +0000)]
Merge "Don't wait for Bluetooth when shutting down" am:
d9b3322e88 am:
9ae00d9d9a
am:
51019ab1d5 -s ours
Change-Id: I0f2351759a463de8f59036040c58ef706862b0f8
TreeHugger Robot [Wed, 10 Jan 2018 19:40:27 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Victor Hsieh [Wed, 10 Jan 2018 19:38:49 +0000 (19:38 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork""
am:
54da93b981
Change-Id: Ibdeb9fb6af3525e6329d42c7eef654f14396bcd6
Jerry Zhang [Wed, 10 Jan 2018 19:36:53 +0000 (19:36 +0000)]
Merge "Revamp USB tethering startup flow." am:
90fddefd5e
am:
375c0a55d8
Change-Id: Ied9a69a24126aab0aae131816fb6bf605e704554
Jack Yu [Wed, 10 Jan 2018 19:34:50 +0000 (19:34 +0000)]
Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity"
am:
5e90553bcf
Change-Id: I777781ddf78e08373c1e5d4989374847b03800cd
Myles Watson [Wed, 10 Jan 2018 19:32:21 +0000 (19:32 +0000)]
Merge "Don't wait for Bluetooth when shutting down" am:
d9b3322e88
am:
9ae00d9d9a
Change-Id: I005548cc409547cc6bdb7182c6d9ea52b4a4a46d
Jerry Zhang [Wed, 10 Jan 2018 19:26:48 +0000 (19:26 +0000)]
Merge "Revamp USB tethering startup flow."
am:
90fddefd5e
Change-Id: Ica932756d19c7ac874ae822c9785e856dcf81db3
Myles Watson [Wed, 10 Jan 2018 19:22:23 +0000 (19:22 +0000)]
Merge "Don't wait for Bluetooth when shutting down"
am:
d9b3322e88
Change-Id: I31142d6ac6b04d2cfb7fcfc721d251a956c81c11
TreeHugger Robot [Wed, 10 Jan 2018 18:59:43 +0000 (18:59 +0000)]
Merge "Added new MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS permission."
TreeHugger Robot [Wed, 10 Jan 2018 18:50:55 +0000 (18:50 +0000)]
Merge "Map isolated uid to host uid when processing log event in statsD."
Treehugger Robot [Wed, 10 Jan 2018 18:46:36 +0000 (18:46 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork""
Jack Yu [Wed, 10 Jan 2018 18:39:53 +0000 (18:39 +0000)]
Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity"
Jerry Zhang [Wed, 10 Jan 2018 18:38:44 +0000 (18:38 +0000)]
Merge "Revamp USB tethering startup flow."
Jerry Zhang [Wed, 20 Dec 2017 22:26:39 +0000 (14:26 -0800)]
Revamp USB tethering startup flow.
Modify usb tethering flow to no longer require
mUsbTetherRequested. The new simplified flow is:
1. Usb rndis function is set through UsbManager
2. Usb is configured with rndis enabled
3. We tether the USB interface
4. Usb is disconnected
5. We untether the USB interface
This allows USB tethering to be enabled through
either UsbManager or ConnectivityManager and aligns
the flow to be similar to other usb function services
such as MTP.
Bug:
62876645
Test: Enable and disable tethering through connectivity and with `svc
usb setFunction rndis`
Change-Id: Ica4203a499db177999302e099e28948b06ef2298
Treehugger Robot [Wed, 10 Jan 2018 18:19:03 +0000 (18:19 +0000)]
Merge "Don't wait for Bluetooth when shutting down"
TreeHugger Robot [Wed, 10 Jan 2018 18:16:24 +0000 (18:16 +0000)]
Merge "Remove use of preference-v14 res directory that is removed."
Myles Watson [Sat, 6 Jan 2018 00:12:54 +0000 (16:12 -0800)]
Don't wait for Bluetooth when shutting down
Bluetooth doesn't need to be shut down cleanly; shutting it down just
slows down the shutdown process.
Change-Id: I91fc9b26930a392f0c4462c76626a966051aea7b
Merged-In: Ic2ed89dd618806adc6646066ab0956dea4a94d8e
Bug:
70855323
Test: Boot, shut down, boot, shut down.
TreeHugger Robot [Wed, 10 Jan 2018 17:59:23 +0000 (17:59 +0000)]
Merge "Remove user state in onUserRemoved"
Bryce Lee [Tue, 9 Jan 2018 23:44:24 +0000 (15:44 -0800)]
Make sure correct default values for ActivityStarter.
Request#reset() used different default values for the calling uid
and pid. Since reset is called before use, these the default values
were incorrect.
This changelist corrects this issue.
Change-Id: I1a04ed443fb5d9d6b248bbb1b2031d87f83f9774
Fixes:
70507511
Test: atest OsHostTests#testNonExportedActivities
Vishnu Nair [Wed, 10 Jan 2018 17:50:48 +0000 (17:50 +0000)]
Merge "Add window tracing functions to WindowMangerService"
Sunny Goyal [Wed, 10 Jan 2018 17:46:07 +0000 (17:46 +0000)]
Merge "Adding support for overriding app-awidget properties at runtime"
Jordan Liu [Wed, 10 Jan 2018 17:34:40 +0000 (17:34 +0000)]
Merge "Add precise disconnect cause in DisconnectCause" am:
8098078edf am:
e77087994d
am:
35abe14435
Change-Id: Id1f9fe432c37fb8e34912b428f7b36c8d8c8403d
Jordan Liu [Wed, 10 Jan 2018 17:23:05 +0000 (17:23 +0000)]
Merge "Add precise disconnect cause in DisconnectCause" am:
8098078edf
am:
e77087994d
Change-Id: I1aae0435aa09faaeae396242fcd01cd6c7480527
Victor Hsieh [Wed, 10 Jan 2018 17:22:25 +0000 (17:22 +0000)]
Revert "Move zygote's seccomp setup to post-fork"
This reverts commit
6a4a3398325787f6cb1b93db17a7bf50d353e2a5.
Reason for revert: caused some SELinux error
Bug:
71768585
Change-Id: I0ef270ec6fed1d5d96b4257ec1a2dd6a55a816ed
Merged-In: Ic1b81e146b52b68445ba634de39657f199107da3
Felipe Leme [Wed, 10 Jan 2018 01:29:24 +0000 (17:29 -0800)]
Added new MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS permission.
Test: m update-api
Bug:
63720392
Change-Id: I1c77c94597b98f72e210d3a8e3fe00c12a149b8a
Jordan Liu [Wed, 10 Jan 2018 17:15:17 +0000 (17:15 +0000)]
Merge "Add precise disconnect cause in DisconnectCause"
am:
8098078edf
Change-Id: Idac4f27406b359bf51ae33f483d651e9e8316504
Jordan Liu [Wed, 10 Jan 2018 17:06:14 +0000 (17:06 +0000)]
Merge "Add precise disconnect cause in DisconnectCause"
TreeHugger Robot [Wed, 10 Jan 2018 16:30:19 +0000 (16:30 +0000)]
Merge "ShutdownThread: Don't wait for Bluetooth"
Michael Plass [Wed, 10 Jan 2018 16:23:49 +0000 (16:23 +0000)]
Merge "Deprecate WifiManager EXTRA_BSSID, EXTRA_WIFI_INFO"
Julia Reynolds [Tue, 9 Jan 2018 14:21:44 +0000 (09:21 -0500)]
Guard against crash on startup
Change-Id: I06f4ccba63cef7eb0971d8b0bfa143de2ed5e53a
Fixes:
71636566
Test: manual; boottest
Bill Yi [Wed, 10 Jan 2018 15:28:24 +0000 (07:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id2da745ba565a46818e917d640e59a86eea1afe7
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 10 Jan 2018 14:38:32 +0000 (14:38 +0000)]
Merge "Add ImageDecoder.ImageInfo.getMimeType"
TreeHugger Robot [Wed, 10 Jan 2018 13:01:38 +0000 (13:01 +0000)]
Merge "WorkSource: Fix corner-case in equals method."
Peter Visontay [Wed, 10 Jan 2018 12:54:40 +0000 (12:54 +0000)]
Merge "Mark AppOpsManager.setMode() @TestApi."
TreeHugger Robot [Wed, 10 Jan 2018 12:53:04 +0000 (12:53 +0000)]
Merge "Additions and cleanups for ImageDecoder API"
TreeHugger Robot [Wed, 10 Jan 2018 12:34:17 +0000 (12:34 +0000)]
Merge "Correct synthetic password test assertions."
Victor Chang [Wed, 10 Jan 2018 10:56:45 +0000 (10:56 +0000)]
Merge "Add a new API android.icu.util.LocaleData"
Andrew Scull [Fri, 5 Jan 2018 18:33:58 +0000 (18:33 +0000)]
Correct synthetic password test assertions.
assertNotSame() compares object references not integer values which are
auto-boxed and so are never the same object.
Test: runtest frameworks-services -p com.android.server.locksettings
Change-Id: I70b54474004e7be843a5a0d352fe555f9d81cf75
TreeHugger Robot [Wed, 10 Jan 2018 09:49:25 +0000 (09:49 +0000)]
Merge "YAAFFFCR - Yet Another Android Autofill Framework Field Classification Refactoring."
Jack Yu [Thu, 28 Dec 2017 22:41:12 +0000 (14:41 -0800)]
Added Cell identity for TD-SCDMA and a base class CellIdentity
Added CellIdentityTdscdma for TDS-CDMA cell identity. Also added
a base class for existing CellIdentityXxx so that the network
service can return specific RAT cell identity through the
network service callback API which takes generic cell identity
as the parameter.
This is the preliminary change for IWLAN refactoring since cell
identity is part of the CS/PS network registration.
bug:
64132030
Test: Unit tests
Change-Id: I3ca405d687667b6c43e782339edec26a6f6edfc9
Alan Stokes [Wed, 10 Jan 2018 09:26:06 +0000 (09:26 +0000)]
Merge "More DexLoggerIntegrationTests tweaks."
TreeHugger Robot [Wed, 10 Jan 2018 07:07:37 +0000 (07:07 +0000)]
Merge "[API review] Add ShortcutInfo.DISABLED_REASON_UNKNOWN"
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:58:24 +0000 (05:58 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo." am:
b01bd54b11 am:
6a5dc32ac3
am:
20f35f962e
Change-Id: I8f7cc7e81fc163119ffa15666f054b298d47fff1
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:49:06 +0000 (05:49 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo." am:
b01bd54b11
am:
6a5dc32ac3
Change-Id: I3d6df6f2bce5b6e19ce0ef2c13adc39fa1b9a862
Yangster-mac [Wed, 10 Jan 2018 00:29:22 +0000 (16:29 -0800)]
Map isolated uid to host uid when processing log event in statsD.
Test: added test case for isolated uid in Attribution e2e test.
Change-Id: I63d16ebee3e611b1ef0c910e5154cf27766cb330
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:35:48 +0000 (05:35 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo."
am:
b01bd54b11
Change-Id: I98c726fc7d6fb91e16234773fe6423b7e111126e
Holly Jiuyu Sun [Wed, 10 Jan 2018 05:21:35 +0000 (05:21 +0000)]
Merge "Merge EuiccProfile into EuiccProfileInfo."
yinxu [Wed, 10 Jan 2018 03:38:21 +0000 (03:38 +0000)]
Merge "Check null before calling clone()" am:
e1bdd513d0 am:
1c60aa03fc
am:
910cf3219c
Change-Id: I51ee6e90e464bfa1bae74ff8aacdf12378e15449
yinxu [Wed, 10 Jan 2018 03:28:45 +0000 (03:28 +0000)]
Merge "Check null before calling clone()" am:
e1bdd513d0
am:
1c60aa03fc
Change-Id: Ie06c696c8805e188d1af3121c66f3180a9845c16
yinxu [Wed, 10 Jan 2018 03:18:37 +0000 (03:18 +0000)]
Merge "Check null before calling clone()"
am:
e1bdd513d0
Change-Id: Ifabe6352c950f9d6ead4cbdd4345ef1fb20f065d
Treehugger Robot [Wed, 10 Jan 2018 03:07:26 +0000 (03:07 +0000)]
Merge "Check null before calling clone()"
Dmitry Dementyev [Tue, 9 Jan 2018 23:08:13 +0000 (15:08 -0800)]
Use correct lock screen type in KeyStoreRecoveryMetadata constructor.
Bug:
71738161
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ib06a9fe4c1182bfd3f4eb0d5f3f3b50c0bf71f25
Fyodor Kupolov [Wed, 10 Jan 2018 02:51:59 +0000 (18:51 -0800)]
Remove user state in onUserRemoved
Test: manual
Bug:
67959359
Change-Id: I63b1afea9e32c9a102b5b45c1ca8ba1419a93696
Jack Yu [Wed, 10 Jan 2018 02:49:44 +0000 (02:49 +0000)]
Merge "Exposed CDMA SID/NID get APIs" am:
0cb936a855 am:
46ffa48122
am:
e936a81557
Change-Id: I357f89c8d8ab7032710063e5cd6d2f761c9e1bb4
Jack Yu [Wed, 10 Jan 2018 02:39:54 +0000 (02:39 +0000)]
Merge "Exposed CDMA SID/NID get APIs" am:
0cb936a855
am:
46ffa48122
Change-Id: I4693b44d59a312def9f26ad54badd5533cd36dfd
TreeHugger Robot [Wed, 10 Jan 2018 02:38:11 +0000 (02:38 +0000)]
Merge "Add API EuiccController#startOtaUpdatingIfNecessary"
Jack Yu [Wed, 10 Jan 2018 02:33:16 +0000 (02:33 +0000)]
Merge "Exposed CDMA SID/NID get APIs"
am:
0cb936a855
Change-Id: Iec76a777a126a10c012363247acb4b6a3516c008
TreeHugger Robot [Wed, 10 Jan 2018 02:31:08 +0000 (02:31 +0000)]
Merge "Revert "Move zygote's seccomp setup to post-fork""
TreeHugger Robot [Wed, 10 Jan 2018 02:20:33 +0000 (02:20 +0000)]
Merge "Update recovery snapshot version."
Treehugger Robot [Wed, 10 Jan 2018 02:19:20 +0000 (02:19 +0000)]
Merge "Exposed CDMA SID/NID get APIs"
Elliott Hughes [Wed, 10 Jan 2018 01:55:14 +0000 (01:55 +0000)]
Merge "Remove obsolete workaround." am:
f448371208 am:
365604c300
am:
8ca799e22f
Change-Id: I6afd17cacebc896831f3b6049e850d671c2d7f73
TreeHugger Robot [Wed, 10 Jan 2018 01:47:27 +0000 (01:47 +0000)]
Merge "Avoid binder call on getAlwaysOn()"
Elliott Hughes [Wed, 10 Jan 2018 01:46:14 +0000 (01:46 +0000)]
Merge "Remove obsolete workaround." am:
f448371208
am:
365604c300
Change-Id: Ia153c371b8833b926b3e643bf265e67a438dfd91
Android Build Merger (Role) [Wed, 10 Jan 2018 01:35:37 +0000 (01:35 +0000)]
Merge "Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am:
72acefa6d8 am:
b51df90f28 am:
23274614da"
Elliott Hughes [Wed, 10 Jan 2018 01:35:34 +0000 (01:35 +0000)]
Merge "Remove obsolete workaround."
am:
f448371208
Change-Id: I2bd057c12b9915b9e45b206b9839d1a57b296f26
Cassie Han [Wed, 10 Jan 2018 01:33:29 +0000 (01:33 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am:
72acefa6d8 am:
b51df90f28
am:
23274614da
Change-Id: Id1b1667359a45259aea7d32cf7426f843ba0f33f
Jerry Zhang [Wed, 10 Jan 2018 01:30:03 +0000 (01:30 +0000)]
Merge "Add setScreenUnlockedFunctions method to UsbManager"
Treehugger Robot [Wed, 10 Jan 2018 01:24:41 +0000 (01:24 +0000)]
Merge "Remove obsolete workaround."
Cassie Han [Wed, 10 Jan 2018 01:20:42 +0000 (01:20 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am:
72acefa6d8
am:
b51df90f28
Change-Id: I7045d6b684351e3545d24a52d16cb53d85483f20
Cassie Han [Wed, 10 Jan 2018 01:08:55 +0000 (01:08 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."
am:
72acefa6d8
Change-Id: I25ad45c52cdcb9b4bf3d21f4f3b71c68e8ace362
TreeHugger Robot [Wed, 10 Jan 2018 00:58:06 +0000 (00:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Cassie Han [Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."
Victor Hsieh [Wed, 10 Jan 2018 00:48:54 +0000 (00:48 +0000)]
Revert "Move zygote's seccomp setup to post-fork"
This reverts commit
a188dbc050b9fca41ed92928d68ed00c562de580.
Reason for revert: selinux denials, see b/
71768585
Change-Id: Ic1b81e146b52b68445ba634de39657f199107da3
Android Build Merger (Role) [Wed, 10 Jan 2018 00:38:18 +0000 (00:38 +0000)]
Merge "Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am:
b1065d6995 am:
8dbfc24e5f am:
96a01775ac"
TreeHugger Robot [Wed, 10 Jan 2018 00:37:24 +0000 (00:37 +0000)]
Merge "Rename createSHA256Parameters to createSha256Parameters"
Jack He [Wed, 10 Jan 2018 00:36:06 +0000 (00:36 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am:
b1065d6995 am:
8dbfc24e5f
am:
96a01775ac
Change-Id: I3a6d80fcc6c510ceec1b4f1411344cf644093677
yinxu [Wed, 10 Jan 2018 00:27:10 +0000 (16:27 -0800)]
Check null before calling clone()
Bug:
67748005
Test: Basic telephony sanity
Change-Id: Ia46a82823b2d3c2bf3a6cb77a6fe191a7f7cb5d0
Dmitry Dementyev [Fri, 5 Jan 2018 23:46:00 +0000 (15:46 -0800)]
Update recovery snapshot version.
There is exactly one snapshot per userId - recovery agent uid pair.
Version is incremented when
1) User credential is updated
2) User unlockes phone and list of application keys was changes since
last snapshot creation.
Bug:
66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I6ab98fcbbb05e33958e6def644b40441cb52de6a
Jack He [Wed, 10 Jan 2018 00:26:33 +0000 (00:26 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am:
b1065d6995
am:
8dbfc24e5f
Change-Id: I52fce02e6a0169dff418f4dae89ae54de7fd952d
TreeHugger Robot [Wed, 10 Jan 2018 00:22:45 +0000 (00:22 +0000)]
Merge "E2e test: attribution matching and slicing by attribution."
TreeHugger Robot [Wed, 10 Jan 2018 00:21:18 +0000 (00:21 +0000)]
Merge "WifiManager: startScan throttling"
Malcolm Chen [Wed, 10 Jan 2018 00:18:56 +0000 (00:18 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager." am:
ed7eead23b am:
6b943d5deb
am:
904340088a -s ours
Change-Id: Id32dd08ebec6e0f90a08a360ce1b6488adbeab40
OSDN Git Service
