OSDN Git Service
Chalard Jean [Thu, 11 Oct 2018 13:36:29 +0000 (06:36 -0700)]
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker"
am:
a3b3b6468e
Change-Id: I91e1a230864f0d5d826c01f91918a35461e2a433
Treehugger Robot [Thu, 11 Oct 2018 12:50:17 +0000 (12:50 +0000)]
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker"
Neil Fuller [Thu, 11 Oct 2018 08:24:27 +0000 (01:24 -0700)]
Merge "Remove unused import"
am:
ab81538d6b
Change-Id: Ia8bf5f99ccc30540041e004224ce7cd456ec0faa
Neil Fuller [Thu, 11 Oct 2018 08:06:48 +0000 (08:06 +0000)]
Merge "Remove unused import"
Luke Huang [Thu, 11 Oct 2018 06:10:10 +0000 (23:10 -0700)]
Merge "Refactor tetherGetStats by using stable aidl structure"
am:
335253df0f
Change-Id: Ibaefeee3e115cc04163f1b07cdba148f9e9ab3b5
Luke Huang [Thu, 11 Oct 2018 05:58:22 +0000 (05:58 +0000)]
Merge "Refactor tetherGetStats by using stable aidl structure"
Jack He [Thu, 11 Oct 2018 03:59:31 +0000 (20:59 -0700)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
am:
cf1176073d
Change-Id: I1715c848fac8adfd41c7371a7103ea31bf4488ac
Treehugger Robot [Thu, 11 Oct 2018 03:32:10 +0000 (03:32 +0000)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
Lorenzo Colitti [Thu, 11 Oct 2018 03:14:03 +0000 (20:14 -0700)]
Merge "Make setAirplaneMode @SystemApi for SetupWizard."
am:
772b75c26d
Change-Id: Ib418ca0a9f8d9be9c4bdc419c9d2ed05aa47a49d
Treehugger Robot [Thu, 11 Oct 2018 02:44:21 +0000 (02:44 +0000)]
Merge "Make setAirplaneMode @SystemApi for SetupWizard."
Jack He [Thu, 11 Oct 2018 00:42:48 +0000 (17:42 -0700)]
Remove BluetoothDevice.ACTION_DISAPPEARED
This intent was never sent by the Bluetooth stack
Bug:
112115770
Test: make
Change-Id: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
Merged-In: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
(cherry picked from commit
dd1c592fcd11e2bee25db0077da0ef3f59071d5d)
Tor Norbye [Wed, 10 Oct 2018 23:39:36 +0000 (16:39 -0700)]
Merge "Fix incorrect javadoc links"
am:
0d954557a1
Change-Id: Id358aab44d8e77561a9b5cb27c363d2325a79086
Treehugger Robot [Wed, 10 Oct 2018 23:23:53 +0000 (23:23 +0000)]
Merge "Fix incorrect javadoc links"
Colin Cross [Wed, 10 Oct 2018 23:13:26 +0000 (16:13 -0700)]
Merge changes from topic "aapt2-manifest-elements"
am:
e75f2f504e
Change-Id: I2cf054f942109e539c2439887078a6e182603456
Ryan Mitchell [Wed, 10 Oct 2018 23:06:48 +0000 (16:06 -0700)]
AAPT2: Add the rest of supported manifest elements
am:
00d5548355
Change-Id: I9c8002d2891d762e579d0d987bb52856fb20df17
Ryan Mitchell [Wed, 10 Oct 2018 23:00:02 +0000 (16:00 -0700)]
AAPT2: Add supported manifest elements
am:
48d009ad32
Change-Id: Ib620e6c3a5ee6b4a33f4d64a9afa44302de67d7a
Neil Fuller [Wed, 10 Oct 2018 22:51:10 +0000 (15:51 -0700)]
Merge "Avoid hidden DataFormat.is24Hour field access"
am:
4d9823f3eb
Change-Id: If06ff869b5363867287cb37c86b1bf558bfa55db
Treehugger Robot [Wed, 10 Oct 2018 22:29:57 +0000 (22:29 +0000)]
Merge changes from topic "aapt2-manifest-elements"
* changes:
Remove workarounds for b/
79755007
AAPT2: Add the rest of supported manifest elements
AAPT2: Add supported manifest elements
Yangster [Wed, 10 Oct 2018 22:24:17 +0000 (15:24 -0700)]
Merge "Phone service state change atom."
am:
419fc89b52
Change-Id: Iae02f9eee2616affb810c54f1af62693d29b5822
Android Build Merger (Role) [Wed, 10 Oct 2018 22:19:43 +0000 (22:19 +0000)]
Merge "Merge "dex/TEST_MAPPING: referenced non-test modules" am:
81f32238ea" into stage-aosp-master
Simran Basi [Wed, 10 Oct 2018 22:18:57 +0000 (15:18 -0700)]
Merge "dex/TEST_MAPPING: referenced non-test modules"
am:
81f32238ea
Change-Id: Ief1b1646f7ed2d22e70aa2346eb7ac5c17880640
Neil Fuller [Wed, 10 Oct 2018 22:12:56 +0000 (22:12 +0000)]
Merge "Avoid hidden DataFormat.is24Hour field access"
Simran Basi [Wed, 10 Oct 2018 22:10:27 +0000 (15:10 -0700)]
Merge "dex/TEST_MAPPING: referenced non-test modules"
am:
81f32238ea
Change-Id: Ib5d5a4dc6002d530d8fedbac8e8de9b06cb73ec9
Scott Kennedy [Wed, 10 Oct 2018 21:57:22 +0000 (14:57 -0700)]
Merge "Mark getInstallerPackageName @Nullable"
am:
c41a5d6bc0
Change-Id: I9500bd37c872fac143074d9a79402d07b0c0419d
Neil Fuller [Wed, 10 Oct 2018 21:40:02 +0000 (14:40 -0700)]
Merge "Remove usage of StringFactory"
am:
8a79748b0c
Change-Id: Ifebd392e5fec43089a3cd7722fbf6e3d6637f935
Neil Fuller [Wed, 10 Oct 2018 21:14:19 +0000 (14:14 -0700)]
Merge "Remove dependency on internal libcore method"
am:
c7ae7ca343
Change-Id: Ice43bea3362a2a983f050d199514b485ce00f976
Neil Fuller [Wed, 10 Oct 2018 21:02:42 +0000 (14:02 -0700)]
Merge "Switch test to TestIoUtils from IoUtils"
am:
709cb7ca9f
Change-Id: I757367421f4ec93b512fc3bd7a77869a4b9def96
Chih-Yu Huang [Wed, 10 Oct 2018 20:54:52 +0000 (13:54 -0700)]
Merge "Remove ArcVideoBridge service from framework/base."
am:
a788eabd72
Change-Id: Ifd4fb89efaf8168473250eb9d8939ae97f25e53d
Treehugger Robot [Wed, 10 Oct 2018 19:51:36 +0000 (19:51 +0000)]
Merge "Phone service state change atom."
Yangster [Wed, 10 Oct 2018 00:09:02 +0000 (17:09 -0700)]
Phone service state change atom.
Background: BatteryStatsService tracks the phone scanning time metric. In Q,
we are migrating the dumpsys-based collection to the new infra. This CL is to
instrument the new logging mechanism.
Test: statsd test
FIX: b/
116748990
Change-Id: I3cf5e0026bfc6f594c5f7b524f14b3a43b702afb
Treehugger Robot [Wed, 10 Oct 2018 18:40:13 +0000 (18:40 +0000)]
Merge "dex/TEST_MAPPING: referenced non-test modules"
Treehugger Robot [Wed, 10 Oct 2018 18:13:28 +0000 (18:13 +0000)]
Merge "Mark getInstallerPackageName @Nullable"
Neil Fuller [Wed, 10 Oct 2018 18:13:19 +0000 (19:13 +0100)]
Avoid hidden DataFormat.is24Hour field access
DateFormat.is24Hour is not part of the CorePlatformApi but
DateFormat.set24HourTimePref(Boolean) is. Switch over.
Bug:
113148576
Test: build
Change-Id: I27103890f94cfe3679f386ea33b0450b453a7625
Neil Fuller [Wed, 10 Oct 2018 16:05:12 +0000 (17:05 +0100)]
Remove unused import
StructGroupReq is imported but not used.
The import can be removed.
Bug:
113148576
Test: build only
Change-Id: I6b2ec5eb3f6c6e298fcde8e47dfd0979f889ca1d
Treehugger Robot [Wed, 10 Oct 2018 16:05:20 +0000 (16:05 +0000)]
Merge "Remove usage of StringFactory"
Neil Fuller [Wed, 10 Oct 2018 15:12:21 +0000 (15:12 +0000)]
Merge "Remove dependency on internal libcore method"
Neil Fuller [Wed, 10 Oct 2018 14:49:31 +0000 (15:49 +0100)]
Remove usage of StringFactory
Code outside of the runtime should not use StringFactory.
The java.lang.String API works fine.
Bug:
113148576
Test: build only
Change-Id: I2912e02265306dcd5c5923de019b2c376349ea29
Neil Fuller [Wed, 10 Oct 2018 13:57:36 +0000 (13:57 +0000)]
Merge "Switch test to TestIoUtils from IoUtils"
Neil Fuller [Wed, 10 Oct 2018 13:49:24 +0000 (14:49 +0100)]
Remove dependency on internal libcore method
The test already uses FileUtils.deleteContents() in several
places so the one usage of IoUtils.deleteContents() which is
functionally equivalent can be switched over to that instead.
Bug:
113148576
Test: build only
Change-Id: Ic5569c82701e89ae9178c1438caf1e8885861a76
Lorenzo Colitti [Tue, 9 Oct 2018 09:50:32 +0000 (18:50 +0900)]
Make setAirplaneMode @SystemApi for SetupWizard.
Expose ConnectivityManager#setAirplaneMode and the
NETWORK_SETUP_WIZARD permission so that SetupWizard can call
setAirplaneMode.
Delete setAirplaneMode from the greylist because the permissions
checks on it, since at least 2013, have been for a privileged
permission (CONNECTIVITY_INTERNAL) that normal apps don't have.
Test: m
Bug:
115302596
Change-Id: I28f24d32c4b4b386407e9e0e3514ea9f8854f4a8
Treehugger Robot [Wed, 10 Oct 2018 03:06:40 +0000 (03:06 +0000)]
Merge "Remove ArcVideoBridge service from framework/base."
Jack Yu [Wed, 10 Oct 2018 01:23:08 +0000 (18:23 -0700)]
Merge "Fixed the indentation"
am:
b7b19312f0
Change-Id: Ib9b5928a405caa3847cada9c23f9b8ebfe66161f
Treehugger Robot [Wed, 10 Oct 2018 01:05:26 +0000 (01:05 +0000)]
Merge "Fixed the indentation"
Xiangyu/Malcolm Chen [Wed, 10 Oct 2018 01:00:03 +0000 (18:00 -0700)]
Merge "Add VisibleForTesting to create TelephonyRegistryTest."
am:
fb96aac216
Change-Id: Ib18e4d3a2caf16f5523ec7413e892cdce18e6a06
Scott Kennedy [Wed, 10 Oct 2018 00:26:19 +0000 (17:26 -0700)]
Mark getInstallerPackageName @Nullable
Test: Just an annotation
Change-Id: Ida4f40e77abec2bbf3791a6b38fdb729f6083811
Xiangyu/Malcolm Chen [Wed, 10 Oct 2018 00:36:39 +0000 (00:36 +0000)]
Merge "Add VisibleForTesting to create TelephonyRegistryTest."
Simran Basi [Tue, 9 Oct 2018 18:12:36 +0000 (11:12 -0700)]
dex/TEST_MAPPING: referenced non-test modules
TreeHugger can only dereference test modules from test mapping.
This change fixes this particular TEST_MAPPING file to target
FrameworksServicesTest for package com.android.server.pm.dex
Bug:
117497435
Test: atest local run & TreeHugger run, verify the right tests runs.
Change-Id: If8731275b492c7788329de08ac09a9f6437de54a
Michael Groover [Tue, 9 Oct 2018 23:37:23 +0000 (16:37 -0700)]
Merge "Add READ_PRIVILEGED_PHONE_STATE to used permissions"
am:
403813782f
Change-Id: Id778252cc548c20ed05dc59c4a3da85b40cc0b7c
Jack Yu [Tue, 9 Oct 2018 23:24:23 +0000 (16:24 -0700)]
Fixed the indentation
Test: Build
Change-Id: Id8a30734c1e4607b0396e0a985ab46502d8723b9
Colin Cross [Tue, 9 Oct 2018 23:12:44 +0000 (16:12 -0700)]
Merge "Convert PrintSpooler to Android.bp"
am:
d05c9bc51c
Change-Id: I3128882467bc21e7f9fb20734dd78c3f1f2a399b
Mårten Kongstad [Tue, 9 Oct 2018 23:08:34 +0000 (16:08 -0700)]
Merge "libandroidfw: introduce ExecuteBinary (POSIX only)"
am:
120b7fba93
Change-Id: I6e0b320e8887e32b8ea3fd1cfcf0804714fe1eb3
Michael Groover [Tue, 9 Oct 2018 23:07:13 +0000 (23:07 +0000)]
Merge "Add READ_PRIVILEGED_PHONE_STATE to used permissions"
Mårten Kongstad [Tue, 9 Oct 2018 23:04:34 +0000 (16:04 -0700)]
Merge "libandroidfw: move ConfigDescription from aapt2 to libandroidfw"
am:
b14c887974
Change-Id: I14be80a2d2c3620919a78da5a42ed56ec1d1737f
Mårten Kongstad [Tue, 9 Oct 2018 23:00:31 +0000 (16:00 -0700)]
Merge changes from topic "idmap2-prerequisites"
am:
62a5d4249f
Change-Id: I8db3f5ba0de6510c3327273c56e9fcc75c836694
Treehugger Robot [Tue, 9 Oct 2018 21:50:40 +0000 (21:50 +0000)]
Merge "Convert PrintSpooler to Android.bp"
Malcolm Chen [Tue, 28 Aug 2018 03:38:29 +0000 (20:38 -0700)]
Add VisibleForTesting to create TelephonyRegistryTest.
Bug:
113305153
Test: unittest
Change-Id: Ie59b2da76fbc813ce011d4d0ab3ff533a6006e14
Merged-In: Ie59b2da76fbc813ce011d4d0ab3ff533a6006e14
Treehugger Robot [Tue, 9 Oct 2018 21:43:38 +0000 (21:43 +0000)]
Merge "libandroidfw: introduce ExecuteBinary (POSIX only)"
Treehugger Robot [Tue, 9 Oct 2018 21:43:38 +0000 (21:43 +0000)]
Merge "libandroidfw: move ConfigDescription from aapt2 to libandroidfw"
Treehugger Robot [Tue, 9 Oct 2018 21:43:38 +0000 (21:43 +0000)]
Merge changes from topic "idmap2-prerequisites"
* changes:
AssetManager2: optionally keep non-matching configs
AAPT2: optionally keep resources without default value
libandroidfw: add resource ID iterator
Mårten Kongstad [Mon, 11 Jun 2018 12:11:33 +0000 (14:11 +0200)]
AssetManager2: optionally keep non-matching configs
AssetManager2 maintains a set of configurations [as specified in the
resource blob] compatible with the currently set configuration [as
specified via SetConfiguration]. This helps optimize future resource
lookups by limiting the set of configurations to iterate over.
However, when creating idmaps, all configurations must be considered,
including those not compatible with the currently set configuration. Add
an optional flag to SetApkAssets to disable the optimization described
above.
Test: manual (will be tested by upcoming idmap2 implementation)
Change-Id: I7526a323ddf90e2f2f49c36e8c110a2cec25357e
Xiangyu/Malcolm Chen [Tue, 9 Oct 2018 18:40:35 +0000 (11:40 -0700)]
Merge "More descriptions on SubscriptionController#setPreferredData"
am:
16fcd3dcff
Change-Id: I33f2ee636be99c3cfba706dc581415881b5f11c3
sqian [Tue, 9 Oct 2018 18:36:25 +0000 (11:36 -0700)]
Merge "Add Call Redirection Default Application in Settings"
am:
b7c0727c15
Change-Id: Iae885868a4e985822eac0e4134b16224ee8237f6
Xiangyu/Malcolm Chen [Tue, 9 Oct 2018 18:18:11 +0000 (18:18 +0000)]
Merge "More descriptions on SubscriptionController#setPreferredData"
Treehugger Robot [Tue, 9 Oct 2018 18:06:05 +0000 (18:06 +0000)]
Merge "Add Call Redirection Default Application in Settings"
Ryan Mitchell [Tue, 9 Oct 2018 17:31:54 +0000 (10:31 -0700)]
Merge "Add rtmitchell to AAPT2 OWNERS"
am:
0d3f4e61c9
Change-Id: I5285ed50123ed2fd219c6b9daa5e460c0cbdaa36
Treehugger Robot [Tue, 9 Oct 2018 17:06:50 +0000 (17:06 +0000)]
Merge "Add rtmitchell to AAPT2 OWNERS"
Yangster [Tue, 9 Oct 2018 17:02:21 +0000 (10:02 -0700)]
Merge "Add yanglu@ and yaochen@ to the proto owner list."
am:
e546a26394
Change-Id: Ia4cb799b12593f03bd8a111ce1acdd2c7a470055
Treehugger Robot [Tue, 9 Oct 2018 16:37:25 +0000 (16:37 +0000)]
Merge "Add yanglu@ and yaochen@ to the proto owner list."
Mårten Kongstad [Mon, 11 Jun 2018 12:13:37 +0000 (14:13 +0200)]
AAPT2: optionally keep resources without default value
Teach "aapt2 link" about a new flag --no-resource-removal. When given,
aapt2 will not filter out resources that lack default values. This is
useful mostly when building overlay packages that define resources for
non-default configurations, such as only for values-sv.
Test: manual: build package with resource only in values-vs, verify apk with aapt2 dump
Change-Id: Idc513bcb3f43bbff7f073163562c3dfccdb9bc9b
Merged-In: Idc513bcb3f43bbff7f073163562c3dfccdb9bc9b
Malcolm Chen [Tue, 25 Sep 2018 03:00:08 +0000 (20:00 -0700)]
More descriptions on SubscriptionController#setPreferredData
Bug:
115550764
Test: build
Change-Id: I25c3f89a3c3f8e8e6475221885d995bcb5684da4
Merged-In: I25c3f89a3c3f8e8e6475221885d995bcb5684da4
sqian [Mon, 8 Oct 2018 22:15:41 +0000 (15:15 -0700)]
Add Call Redirection Default Application in Settings
Bug:
64959558
Test: compile
Change-Id: Iddac4d5b202db5a88aa82fd9ea4df89544b94b71
Pengquan Meng [Mon, 8 Oct 2018 23:08:26 +0000 (16:08 -0700)]
Merge "Add isManualNetworkSelectionAllowed api to telephonyManager"
am:
0af8c5c73c
Change-Id: Ib4eeafabe49c785143cbfc48eabd039f535e11a5
Pengquan Meng [Mon, 8 Oct 2018 22:16:52 +0000 (22:16 +0000)]
Merge "Add isManualNetworkSelectionAllowed api to telephonyManager"
Shuo Qian [Mon, 8 Oct 2018 21:06:55 +0000 (14:06 -0700)]
Merge "Make isUsableSubIdValue public"
am:
37064062bb
Change-Id: I5b5bdd8ab047edfa82e0c04e48fc3ec16e3317b0
Shuo Qian [Mon, 8 Oct 2018 20:42:00 +0000 (20:42 +0000)]
Merge "Make isUsableSubIdValue public"
Igor Murashkin [Mon, 8 Oct 2018 20:23:39 +0000 (13:23 -0700)]
Merge "statsd: Add AID mappings for iorapd"
am:
34bd3dfb39
Change-Id: I2e6145ba4bec7481c7100017df79c67806925867
Treehugger Robot [Mon, 8 Oct 2018 20:12:59 +0000 (20:12 +0000)]
Merge "statsd: Add AID mappings for iorapd"
Tor Norbye [Wed, 3 Oct 2018 07:28:21 +0000 (09:28 +0200)]
Fix incorrect javadoc links
Test: make offline-sdk-docs
Bug: b/
116163454
Change-Id: I55de1f71d443713b033ee63fd191bd34b3a52fd2
Pengquan Meng [Wed, 3 Oct 2018 19:22:10 +0000 (12:22 -0700)]
Add isManualNetworkSelectionAllowed api to telephonyManager
Bug:
111453847
Test: build
Merged-In: Icdd60ab03fee4b2e7a08dda3c5c127a19ecac7ce
Change-Id: Icdd60ab03fee4b2e7a08dda3c5c127a19ecac7ce
Michael Groover [Mon, 8 Oct 2018 16:39:24 +0000 (09:39 -0700)]
Add READ_PRIVILEGED_PHONE_STATE to used permissions
Bug:
110099294
Test: cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.TelephonyManagerTest
Change-Id: I13fec3d397c200ce92883883c96c07007e823efe
Mårten Kongstad [Wed, 20 Jun 2018 06:46:41 +0000 (08:46 +0200)]
libandroidfw: move ConfigDescription from aapt2 to libandroidfw
This is to allow idmap2 to access ConfigDescription.
Test: libandroidfw_tests
Test: aapt2_tests
Change-Id: I54210bbbd8dad5903cb7100807df977efa394ad5
Merged-In: I54210bbbd8dad5903cb7100807df977efa394ad5
Yangster [Mon, 8 Oct 2018 16:24:43 +0000 (09:24 -0700)]
Add yanglu@ and yaochen@ to the proto owner list.
Test: cts
Change-Id: I6ad0ced33ec8f0a8fa6e832fbae30828e20fb609
Dimitry Ivanov [Mon, 8 Oct 2018 15:05:41 +0000 (08:05 -0700)]
Merge "Respect extractNativeLibs in natively bridged environments"
am:
61b9b6c9eb
Change-Id: I6072e16c1cdf9543d38ec8763931abf095bd2313
Dimitry Ivanov [Mon, 8 Oct 2018 14:50:08 +0000 (14:50 +0000)]
Merge "Respect extractNativeLibs in natively bridged environments"
Eddie Hung [Mon, 8 Oct 2018 08:10:46 +0000 (01:10 -0700)]
Merge "Fix UsbDeviceManager null object reference"
am:
9b1db24f6e
Change-Id: I70cb3a014eb19ee6214f4590d50e705ab4b9130f
Treehugger Robot [Mon, 8 Oct 2018 07:44:48 +0000 (07:44 +0000)]
Merge "Fix UsbDeviceManager null object reference"
Hall Liu [Sat, 6 Oct 2018 01:08:28 +0000 (18:08 -0700)]
Merge "Wire up the stopRtt API"
am:
2d82493ded
Change-Id: I720ec95129c7da6b0fbd802522f6b85f54de2f7b
Hall Liu [Sat, 6 Oct 2018 00:49:14 +0000 (00:49 +0000)]
Merge "Wire up the stopRtt API"
Pengquan Meng [Sat, 6 Oct 2018 00:35:11 +0000 (17:35 -0700)]
Merge "Fix incorrect API comments of getSubId()"
am:
66a0899785
Change-Id: Ia4f100021e33aac65208eb2ef4c15ca0f1b7d5c4
Pengquan Meng [Sat, 6 Oct 2018 00:13:01 +0000 (00:13 +0000)]
Merge "Fix incorrect API comments of getSubId()"
Igor Murashkin [Fri, 5 Oct 2018 23:25:21 +0000 (16:25 -0700)]
statsd: Add AID mappings for iorapd
Bug:
117295673
Change-Id: Ie0c7a7bf823159492259ac1ec6680b45784afb84
Shuo Qian [Fri, 5 Oct 2018 22:51:38 +0000 (15:51 -0700)]
Merge "Add Parcelable EmergencyNumber and APIs"
am:
379ca95c89
Change-Id: I03c07a695d03409e6be4f5a98f37d4191bdc5dd1
Shuo Qian [Fri, 5 Oct 2018 22:29:36 +0000 (22:29 +0000)]
Merge "Add Parcelable EmergencyNumber and APIs"
Pengquan Meng [Fri, 5 Oct 2018 05:42:06 +0000 (22:42 -0700)]
Fix incorrect API comments of getSubId()
getSubid() return the SubscriptionManager#getDefaultSubscriptionId()
when TelephonyManager created without the subId.
Bug:
111453847
Test: Build
Merged-In: I8e38ef43b5f23bbedc4d584df78c12f250b88fcc
Change-Id: I8e38ef43b5f23bbedc4d584df78c12f250b88fcc
Tyler Gunn [Fri, 5 Oct 2018 20:49:31 +0000 (13:49 -0700)]
Merge "Add finer grained call fail reasons."
am:
5d0d0edc22
Change-Id: I06cda0a862459e0c805039f7cc6f1b70337f40de
sqian [Wed, 12 Sep 2018 23:31:17 +0000 (16:31 -0700)]
Make isUsableSubIdValue public
Rename subId to subscriptionId
Bug:
113072551
Test: Treehugger
Change-Id: I54303bab4d40d6168332d0263e9de1603205bb75
Tyler Gunn [Fri, 5 Oct 2018 20:35:55 +0000 (20:35 +0000)]
Merge "Add finer grained call fail reasons."
Yan Yan [Fri, 5 Oct 2018 18:47:12 +0000 (11:47 -0700)]
Merge changes I10c01f2b,Ie05bc535
am:
277d42a035
Change-Id: I2e55a266f65268ca734c028d4da7add14a281d75
Howard Chen [Fri, 5 Oct 2018 17:39:13 +0000 (10:39 -0700)]
Merge "Refine frameworks/base/services/tests/runtest.py"
am:
8bbf0181f6
Change-Id: I04f0e4715c74a079712d3f0192665a2898a9da39
Yan Yan [Fri, 5 Oct 2018 17:38:41 +0000 (17:38 +0000)]
Merge changes I10c01f2b,Ie05bc535
* changes:
Check to ensure UDP-encap is used only for IPv4
Add UDP encapsulation tests for IpSecService.
OSDN Git Service
