OSDN Git Service
Holly Jiuyu Sun [Wed, 24 Jan 2018 02:21:14 +0000 (02:21 +0000)]
Merge "Make getIEuiccContronller() protected and non-static for CTS." am:
2378a2ca0b
am:
24ba89dafe
Change-Id: Ia5313c8daab24242ae4a00bfdc23eb4f23634558
Holly Jiuyu Sun [Wed, 24 Jan 2018 02:14:31 +0000 (02:14 +0000)]
Merge "Make getIEuiccContronller() protected and non-static for CTS."
am:
2378a2ca0b
Change-Id: If8d1bc3db4be3f2d7e79f9c508ea3db3197159e9
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 01:23:32 +0000 (01:23 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java" am:
afd65d9d1c
am:
dae9a8e839
Change-Id: I593635999bdfa290b012313d9967bddfc5e7bfe1
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 01:12:24 +0000 (01:12 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java"
am:
afd65d9d1c
Change-Id: Ie0ef55c0a3e75937a0e68b364bf6e202ad0678bd
Holly Jiuyu Sun [Wed, 24 Jan 2018 01:09:44 +0000 (01:09 +0000)]
Merge "Make getIEuiccContronller() protected and non-static for CTS."
nharold [Wed, 24 Jan 2018 01:08:33 +0000 (01:08 +0000)]
Merge changes from topic "signal-strength-cleanup" am:
fb24180fe0
am:
2621c9f6ad
Change-Id: I30b5deb01ed68dc0e235e9997fa147aadb924749
Nathan Harold [Wed, 24 Jan 2018 01:05:07 +0000 (01:05 +0000)]
Cleanup SignalStrength Parcel am:
9becf4b334
am:
02f4ec2eed
Change-Id: I9e862b15ab4b5871d9d7e00af86ab9049b5b7b50
nharold [Wed, 24 Jan 2018 00:58:38 +0000 (00:58 +0000)]
Merge changes from topic "signal-strength-cleanup"
am:
fb24180fe0
Change-Id: Iad22d4d91032a87877994bfca00c4f80d11f66c0
Nathan Harold [Wed, 24 Jan 2018 00:54:13 +0000 (00:54 +0000)]
Cleanup SignalStrength Parcel
am:
9becf4b334
Change-Id: I44e6b2187bbcb2334adb40be5d438f581d9638bb
Xiangyu/Malcolm Chen [Tue, 23 Jan 2018 23:39:10 +0000 (23:39 +0000)]
Merge "Add TransportType in AccessNetworkConstants.java"
nharold [Tue, 23 Jan 2018 23:23:48 +0000 (23:23 +0000)]
Merge changes from topic "signal-strength-cleanup"
* changes:
Fix getAsuLevel returns "99" in Lte and TdScdma.
Cleanup SignalStrength Parcel
Jack Yu [Tue, 23 Jan 2018 22:00:39 +0000 (22:00 +0000)]
Merge "Combined flags of data service requests into one reason param" am:
7d441c9b27
am:
28f64b869c
Change-Id: I5823943d1e3bed41f4bd26fa1d718d6a2e6acc48
Robert Sesek [Tue, 23 Jan 2018 21:52:04 +0000 (21:52 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID." am:
572f65fb58
am:
cb7119385e
Change-Id: Iaf7a31629d06d87400796899f659926e5186ac41
Felipe Leme [Tue, 23 Jan 2018 21:46:43 +0000 (21:46 +0000)]
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
am:
2eeab61b4c
Change-Id: Idda0d7fbc0f63bcbad44da6a46cef786770a2851
Jack Yu [Tue, 23 Jan 2018 21:46:18 +0000 (21:46 +0000)]
Merge "Combined flags of data service requests into one reason param"
am:
7d441c9b27
Change-Id: I6e8069639e5d7d57fde69747fb78d044e625680e
Robert Sesek [Tue, 23 Jan 2018 21:42:19 +0000 (21:42 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
am:
572f65fb58
Change-Id: I822fdad1c22de97884e389f651230ef31cd65deb
TreeHugger Robot [Tue, 23 Jan 2018 21:39:09 +0000 (21:39 +0000)]
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
Benedict Wong [Tue, 23 Jan 2018 19:55:47 +0000 (19:55 +0000)]
Merge "Add checks to ensure SPIs are not reused" am:
0a1dd194aa
am:
1a2e3f3b54
Change-Id: I8c7243bc600e5f2e9abec03b5a357ed6376aa9bf
Amit Mahajan [Tue, 23 Jan 2018 19:50:57 +0000 (19:50 +0000)]
Merge "Added new slot status related broadcast." am:
cdc0a084d1
am:
40effae0f3
Change-Id: I3a4174eff2dc8ce017aae4c2d31f2facde02dbe5
Treehugger Robot [Tue, 23 Jan 2018 19:43:25 +0000 (19:43 +0000)]
Merge "Combined flags of data service requests into one reason param"
Lorenzo Colitti [Tue, 23 Jan 2018 19:43:13 +0000 (19:43 +0000)]
Merge changes from topic "multipath-datausage-backport" am:
df984fae26
am:
c46c21c702
Change-Id: I45f0c69e3440e9ec69c82e81c41bea682a359389
Lorenzo Colitti [Tue, 23 Jan 2018 19:39:18 +0000 (19:39 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate. am:
0f9bce6883
am:
e383807d7f
Change-Id: I1faf95edec0e836c69016c84ad2a2c8518f8eb53
Lorenzo Colitti [Tue, 23 Jan 2018 19:36:02 +0000 (19:36 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack. am:
f7fab104f9
am:
df4aba36b4
Change-Id: I904ec7dee1f4f565a1db138e45c9e5497fbb2855
Lorenzo Colitti [Tue, 23 Jan 2018 19:33:27 +0000 (19:33 +0000)]
Disable IpConnectivityMetricsTest. am:
b7a479c293
am:
afb4ba1c35
Change-Id: Ic5a24e40ce126bc872281bb353706a245eb345f2
Lorenzo Colitti [Tue, 23 Jan 2018 19:30:57 +0000 (19:30 +0000)]
Add the defaultNetwork element to the netstats.proto. am:
9781f785bc
am:
adcb94472a
Change-Id: I292e903617d3af1867529e68eb20538afb66f665
Lorenzo Colitti [Tue, 23 Jan 2018 19:28:14 +0000 (19:28 +0000)]
Add getDefaultNetwork to the NetworkStats public API. am:
d5876bc438
am:
66eab17abc
Change-Id: If0aa0a4522df0061645d34cb3af8a33f288ed46d
Benedict Wong [Tue, 23 Jan 2018 19:27:51 +0000 (19:27 +0000)]
Merge "Add checks to ensure SPIs are not reused"
am:
0a1dd194aa
Change-Id: I893925014557e5ae13303debc4ee8f50faf9605d
Amit Mahajan [Tue, 23 Jan 2018 19:24:04 +0000 (19:24 +0000)]
Merge "Added new slot status related broadcast."
am:
cdc0a084d1
Change-Id: Ia81c5648a943bf1c13b1434b40dd09c6789a6576
Lorenzo Colitti [Tue, 23 Jan 2018 19:17:54 +0000 (19:17 +0000)]
Merge changes from topic "multipath-datausage-backport"
am:
df984fae26
Change-Id: Ic29d71ade161434b6dea796a887f60b5587ca1d5
Lorenzo Colitti [Tue, 23 Jan 2018 19:13:30 +0000 (19:13 +0000)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
am:
0f9bce6883
Change-Id: I28e7f539fc5e0698cb8ef663aafae7a2cd579d68
Lorenzo Colitti [Tue, 23 Jan 2018 19:09:07 +0000 (19:09 +0000)]
Unbreak frameworks-net tests broken by missing libutilscallstack.
am:
f7fab104f9
Change-Id: I3125e9276da6cbbae5ef490cf98583b31c4ad8d2
Lorenzo Colitti [Tue, 23 Jan 2018 19:04:05 +0000 (19:04 +0000)]
Disable IpConnectivityMetricsTest.
am:
b7a479c293
Change-Id: Iba9dad4001c6aa725285eee6df32f116c846532d
Lorenzo Colitti [Tue, 23 Jan 2018 18:57:44 +0000 (18:57 +0000)]
Add the defaultNetwork element to the netstats.proto.
am:
9781f785bc
Change-Id: I725132a756baacbc42c573274f5687cf58225498
Lorenzo Colitti [Tue, 23 Jan 2018 18:50:20 +0000 (18:50 +0000)]
Add getDefaultNetwork to the NetworkStats public API.
am:
d5876bc438
Change-Id: Ifbe3d8ede39c87d64eee20adcfbdd92479d09e69
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:45:03 +0000 (18:45 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL" am:
bf996dd479 -s ours
am:
5400d4dc4f
Change-Id: I4eab9733b7bf766f559c2423f534bc5d9b1a1066
Badhri Jagan Sridharan [Tue, 23 Jan 2018 18:36:01 +0000 (18:36 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
am:
bf996dd479 -s ours
Change-Id: I174f0a10e4ecb76607ed5e92e60ebf3a9523e6d9
Holly Jiuyu Sun [Fri, 19 Jan 2018 18:27:56 +0000 (10:27 -0800)]
Make getIEuiccContronller() protected and non-static for CTS.
Test: test on phone
Change-Id: I706a0a9e064a0f2f91674cb2ff38a5929eaaf627
yifan.bai [Fri, 20 Oct 2017 02:25:11 +0000 (10:25 +0800)]
Fix getAsuLevel returns "99" in Lte and TdScdma.
GetAsuLevel method judges valid signal by
getLteLevel/getTdScdmaLevel. However, level is
SIGNAL_STRENGTH_NONE_OR_UNKNOWN does not mean not in
Lte/TdScdma.
For example, if mLteRsrp is in (threshRsrp[1],
threshRsrp[0]], getLteLevel would return
SIGNAL_STRENGTH_NONE_OR_UNKNOWN. But this only
means Lte signal is very weak, and ASU should be
(mLteRsrp + 140) not "99" (3GPP 27.007 Sec 8.69).
Bug:
72116430
Test: Build
Change-Id: If930c3e3d23a9af7b2e51e3560cc28607a6328c0
Nathan Harold [Fri, 19 Jan 2018 00:45:40 +0000 (16:45 -0800)]
Cleanup SignalStrength Parcel
Clean up the SignalStrength parcel. This CL
removes redundant constructors, simplifies the
overall initialization process, and stratifies
the components of the parcel into 2 separate
parts: the strength values from RIL, and the
config values provided by the platform.
Bug:
72116430
Test: runtest frameworks-telephony
Change-Id: Id7d2339362270b3911e96094275e1e545d6b581c
Malcolm Chen [Tue, 23 Jan 2018 00:00:29 +0000 (16:00 -0800)]
Add TransportType in AccessNetworkConstants.java
Bug:
64132030
Test: build
Change-Id: I916a0b889110195d23b2a531308171cf4ea74f0c
Treehugger Robot [Tue, 23 Jan 2018 18:14:00 +0000 (18:14 +0000)]
Merge "Use the correct value for Process.WEBVIEW_ZYGOTE_UID."
Benedict Wong [Tue, 23 Jan 2018 18:00:06 +0000 (18:00 +0000)]
Merge "Add checks to ensure SPIs are not reused"
Treehugger Robot [Tue, 23 Jan 2018 18:00:00 +0000 (18:00 +0000)]
Merge "Added new slot status related broadcast."
Lorenzo Colitti [Tue, 23 Jan 2018 15:22:18 +0000 (15:22 +0000)]
Merge changes from topic "multipath-datausage-backport"
* changes:
Support passing a template to NetworkStatsManager queries.
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
Unbreak frameworks-net tests broken by missing libutilscallstack.
Disable IpConnectivityMetricsTest.
Add the defaultNetwork element to the netstats.proto.
Add getDefaultNetwork to the NetworkStats public API.
Lorenzo Colitti [Mon, 22 Jan 2018 02:54:46 +0000 (11:54 +0900)]
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
This will allow data usage clients to query for and receive
callbacks on data usage matching these conditions.
Bug:
35142602
Test: atest FrameworksNetTests
Change-Id: I4d985a2734eeab7ee454c09cc2098b6b3c671c23
Merged-In: I4d985a2734eeab7ee454c09cc2098b6b3c671c23
Lorenzo Colitti [Mon, 22 Jan 2018 03:53:18 +0000 (12:53 +0900)]
Unbreak frameworks-net tests broken by missing libutilscallstack.
Test: atest FrameworksNetTest shows fewer failures
Change-Id: Ic6f2bc18e80d91226d8d49e047e3997ffc45e45a
Merged-In: Ic6f2bc18e80d91226d8d49e047e3997ffc45e45a
Lorenzo Colitti [Mon, 22 Jan 2018 03:50:58 +0000 (12:50 +0900)]
Disable IpConnectivityMetricsTest.
This test has been failing for a while, and we are do not have
bandwidth to fix it during the next week.
Test: make -j64 FrameworksNetTests RUN_ERROR_PRONE=true
Test: atest FrameworksNetTests:IpConnectivityMetricsTest
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
Change-Id: I59d73c1773e160a726996f3ab4ad20312decc127
Merged-In: I59d73c1773e160a726996f3ab4ad20312decc127
Lorenzo Colitti [Fri, 19 Jan 2018 17:02:56 +0000 (02:02 +0900)]
Add the defaultNetwork element to the netstats.proto.
This is in its own commit because AOSP has diverged from internal
master.
Bug:
35142602
Test: builds, boots
Change-Id: I75fc85b961bc919e3d6c2adce6d6861c6f2c8379
Merged-In: I75fc85b961bc919e3d6c2adce6d6861c6f2c8379
Lorenzo Colitti [Mon, 22 Jan 2018 12:00:49 +0000 (21:00 +0900)]
Support passing a template to NetworkStatsManager queries.
Currently, NetworkStatsManager queries and callbacks only allow
selecting network traffic based on network identifiers:
networkType, subscriptionId and networkId. The code ends up
converting these into a template under the hood.
Now that templates can express more fine-grained queries (e.g.,
select only roaming traffic, or select only traffic that's not
on the default network) add a hidden method to pass in a
template. This should have no security implications, as all the
access controls are performed in NetworkStatsService.
Bug:
35142602
Test: android.app.usage.cts.NetworkUsageStatsTest passes
Change-Id: Iab4afa26b34544299d2a9c501c1b0feb470e90a9
Merged-In: Iab4afa26b34544299d2a9c501c1b0feb470e90a9
Lorenzo Colitti [Thu, 18 Jan 2018 16:12:58 +0000 (01:12 +0900)]
Add getDefaultNetwork to the NetworkStats public API.
This allows an app using the public API to know whether the
traffic in a particular bucket was on the default network
(i.e., the network was selected by the system), or not (i.e.,
the network was selected by the app).
Bug:
35142602
Test: builds, boots
Test: added coverage to NetworkUsageStatsTest CTS test, still passes
Change-Id: I9f6669908fa119743b9c0aa0c31a03e5ebafa7db
Merged-In: I9f6669908fa119743b9c0aa0c31a03e5ebafa7db
Benedict Wong [Thu, 14 Dec 2017 02:26:40 +0000 (18:26 -0800)]
Add checks to ensure SPIs are not reused
This change adds an additional check in CheckIpsecConfig to prevent
users from using the same SPI twice. This allows for a more granular
error message.
Bug:
70642141
Test: Tests added in IpSecServiceParameterizedTest
Change-Id: I9621fb05c6b162bd8ae8db4ac1e64feaa9d0ac73
Badhri Jagan Sridharan [Tue, 23 Jan 2018 03:09:27 +0000 (03:09 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
Yin-Chia Yeh [Tue, 23 Jan 2018 02:35:28 +0000 (02:35 +0000)]
Merge "Camera: remove NOT_PRESENT cameras" am:
174df238ac
am:
0e32a62cd4
Change-Id: I5b2d1d756daf1fabd8d42b9161de6a63d8989302
Amit Mahajan [Fri, 19 Jan 2018 01:51:53 +0000 (17:51 -0800)]
Added new slot status related broadcast.
Test: none
Bug:
64131518
Merged-in: I0a5825a1d121dc22f042fd71598f58e064e9e2a2
Change-Id: I0a5825a1d121dc22f042fd71598f58e064e9e2a2
Lorenzo Colitti [Tue, 23 Jan 2018 02:23:32 +0000 (02:23 +0000)]
Merge "Remove obsolete NetworkStats.Entry constructor." am:
1683b6968d
am:
cdeb50aa48
Change-Id: If60b58f95707bab3ae89050234226d54386398e8
Yin-Chia Yeh [Tue, 23 Jan 2018 02:12:57 +0000 (02:12 +0000)]
Merge "Camera: remove NOT_PRESENT cameras"
am:
174df238ac
Change-Id: I2c0dd5ccd8c8a165b568563051ad42dba6082792
Lorenzo Colitti [Tue, 23 Jan 2018 02:08:18 +0000 (02:08 +0000)]
Merge "Remove obsolete NetworkStats.Entry constructor."
am:
1683b6968d
Change-Id: I72fe99d5e662a6a154f7b2d970c5926ee696e541
Qingxi Li [Tue, 23 Jan 2018 01:25:35 +0000 (01:25 +0000)]
Merge "Add broadcast action for carrier setup" am:
b60e42becd
am:
d6d448f68b
Change-Id: I085b0d23182696ba6ec639e1f48ec14ed010fecd
Qingxi Li [Tue, 23 Jan 2018 01:12:50 +0000 (01:12 +0000)]
Merge "Add broadcast action for carrier setup"
am:
b60e42becd
Change-Id: I3bcde10528fc1fa722995e7666ee6faa7db1d0cd
yuemingw [Tue, 23 Jan 2018 01:07:24 +0000 (01:07 +0000)]
Merge "Add NetworkTypeBitmask into public ApnSetting." am:
278dd4ab90
am:
97104cb905
Change-Id: Ibef74c641596dc57d8a525316ba95ff35e07fce2
Chen Xu [Tue, 23 Jan 2018 01:02:36 +0000 (01:02 +0000)]
Merge "address carrier id api review feedback" am:
2f6b2726e6
am:
e6211a5f01
Change-Id: I3e601111b7da73158cf1ce281abd77b6d5cfc68f
Badhri Jagan Sridharan [Fri, 12 Jan 2018 00:56:29 +0000 (16:56 -0800)]
Add support for UsbDeviceManager to talk to USB GADGET HAL
Till now, Init scripts(property tiggers) are used define the
operation that needs to be performed when a certain gadget
composition needs to be enabled. Based on the user preference,
usb service sets the sys.usb.config which triggers the
corresponding property triggers in init scripts and usbservice
polls on sys.usb.state to infer whether the property triggers
have completed executing.
This CL makes UsbHandler class abstract to make init scripts
based legacy implementation and HAL based implementation to
share the common logic. The legacy init script based logic is
implemented by UsbHandlerLegacy and HAL based logic is implemented
by UsbHandlerHal. The decision on which one to initialize is
made depending on whether the device has Gadget HAL impelemented.
Since HIDL supports asynch calbacks, usb state management is moved
to the message queue to avoid polling incase of HAL based
implementation.
To switch to a new configuration:
1. UsbService calls setCurrentUsbFunctions and queues
MSG_SET_FUNCTIONS_TIMEOUT
2. If the setCurrentUsbFunctionsCb arrives on time,
then MSG_SET_FUNCTIONS_TIMEOUT is cancelled and
default functions are retried by queueing
MSG_SET_DEFAULT_FUNCTIONS if SUCCESS is not signalled.
3. If MSG_SET_FUNCTIONS_TIMEOUT gets executed, then,
default functions are retried by calling
setEnabledFunctions(null, false, mUsbDataUnlocked);
Also, for HAL based implementation config_oemUsbModeOverride is no
longer needed as hal can take of enabling oem specific functions.
Bug:
63669128
Test: Tested usb gadget configuration for both cases:
1. When gadget hal is present
2. When gadget hal is not present
Change-Id: Ifcef464a0b97b265872696346a76162f8e84d6c0
Treehugger Robot [Tue, 23 Jan 2018 00:52:00 +0000 (00:52 +0000)]
Merge "Camera: remove NOT_PRESENT cameras"
yuemingw [Tue, 23 Jan 2018 00:47:01 +0000 (00:47 +0000)]
Merge "Add NetworkTypeBitmask into public ApnSetting."
am:
278dd4ab90
Change-Id: I63be092c9f978cf0e0b029e6836d5f0b876831f6
Chen Xu [Tue, 23 Jan 2018 00:42:06 +0000 (00:42 +0000)]
Merge "address carrier id api review feedback"
am:
2f6b2726e6
Change-Id: I40fb765e4c4eb844826ae8e305ddcc7ef1c281f4
Felipe Leme [Mon, 22 Jan 2018 23:33:40 +0000 (15:33 -0800)]
DO NOT MERGE - fix AFM.getComponentNameFromContext()
This method broke on O-MR1 when I3abf999eb6056c1df7982780bae43b58337c0668
was chery-picked from master.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases \
-t android.autofillservice.cts.AttachedContextActivityTest#testAutofill
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Also individually ran tests that failed (due to flakiness) when ran in a suite:
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases \
-t android.autofillservice.cts.OptionalSaveActivityTest#testDontShowSaveUiWhenUserManuallyFilled_oneDatasetAllRequiredFields
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.PreSimpleSaveActivityTest #testTapLink_tapBack_thenStartOverBySayingYesAndManualRequest
Fixes:
71960322
Change-Id: Ia093dcefe6699dc9493c46d671e48c2000214b31
Merged-In: I3abf999eb6056c1df7982780bae43b58337c0668
Lorenzo Colitti [Tue, 23 Jan 2018 00:15:15 +0000 (00:15 +0000)]
Merge "Remove obsolete NetworkStats.Entry constructor."
Benedict Wong [Tue, 23 Jan 2018 00:08:17 +0000 (00:08 +0000)]
Merge "Address comments and final cleanup from refcounting integration" am:
222529d95c
am:
8130c2a718
Change-Id: I7ed4a6bb90f3cf3ed5fd0e6ad20b033e588a4c90
Benedict Wong [Mon, 22 Jan 2018 23:57:28 +0000 (23:57 +0000)]
Merge "Address comments and final cleanup from refcounting integration"
am:
222529d95c
Change-Id: Ie0bc2b81e09ee874ef848905bb486967a857c6d1
Treehugger Robot [Mon, 22 Jan 2018 23:55:49 +0000 (23:55 +0000)]
Merge "Add broadcast action for carrier setup"
Jack Yu [Sun, 21 Jan 2018 03:41:00 +0000 (19:41 -0800)]
Combined flags of data service requests into one reason param
Made the API flexible for future expansion. The two boolean flag
'reasonShutdown' and 'isHandover' are merged into the 'reason'
params.
Test: Manual
bug:
64132030
Change-Id: I29a0ca6a7c3b897910f3bb6076f44315adc91893
Treehugger Robot [Mon, 22 Jan 2018 22:53:38 +0000 (22:53 +0000)]
Merge "Add NetworkTypeBitmask into public ApnSetting."
Chen Xu [Mon, 22 Jan 2018 22:44:02 +0000 (22:44 +0000)]
Merge "address carrier id api review feedback"
Qingxi Li [Fri, 19 Jan 2018 20:24:05 +0000 (12:24 -0800)]
Add broadcast action for carrier setup
This broadcast action is sent by eSIM Manager to let the carrier app
know that the carrier setup is not completed.
Bug:
62639823
Test: TreeHugger
Merged-In: I88ac90cf679d5ec98aa7c0cf7bd9c96010597a1c
Change-Id: I88ac90cf679d5ec98aa7c0cf7bd9c96010597a1c
fionaxu [Fri, 5 Jan 2018 23:38:11 +0000 (15:38 -0800)]
address carrier id api review feedback
1. improve comments
2. change returned carrier name from String to CharSequence
3. change to AndroidCarrierId
Bug:
64131637
Bug:
71584605
Test: Manual
Change-Id: I412d53bb9d4955e1267300692e90ebfffd6818df
Merged-in: I412d53bb9d4955e1267300692e90ebfffd6818df
Benedict Wong [Mon, 22 Jan 2018 20:32:18 +0000 (20:32 +0000)]
Merge "Address comments and final cleanup from refcounting integration"
Andreas Gampe [Mon, 22 Jan 2018 20:01:18 +0000 (20:01 +0000)]
Merge "Debug: Add attachJvmtiAgent with classloader" am:
940c0341f0
am:
878abd8e91
Change-Id: I862a822ef7600030f7b435fe9b9368961cf4694b
Benedict Wong [Mon, 22 Jan 2018 19:53:15 +0000 (19:53 +0000)]
Merge "Rename create/delete transform methods" am:
7ee26e72cf
am:
5b71c4a0a5
Change-Id: I16bfb511ac2d6094e246f79d51fe4520d3e765cd
Andreas Gampe [Mon, 22 Jan 2018 19:48:28 +0000 (19:48 +0000)]
Merge "Debug: Add attachJvmtiAgent with classloader"
am:
940c0341f0
Change-Id: I0c9179b373040e7d4f54a5ad9835d14624012999
Benedict Wong [Mon, 22 Jan 2018 19:44:43 +0000 (19:44 +0000)]
Merge "Rename create/delete transform methods"
am:
7ee26e72cf
Change-Id: I76576d1f3193fcbb3680fb29893cf696ea7a41fe
Treehugger Robot [Mon, 22 Jan 2018 18:22:07 +0000 (18:22 +0000)]
Merge "Debug: Add attachJvmtiAgent with classloader"
Benedict Wong [Mon, 22 Jan 2018 17:57:15 +0000 (17:57 +0000)]
Merge "Rename create/delete transform methods"
yuemingw [Mon, 22 Jan 2018 17:32:09 +0000 (17:32 +0000)]
Add NetworkTypeBitmask into public ApnSetting.
Sync with aosp/556766.
Moved from ag/
3477310.
Bug:
68208293
Test: manual
Change-Id: I04b901c46b7bbce4ed7d52895fcc904fb713fb69
Robert Sesek [Mon, 22 Jan 2018 17:26:39 +0000 (12:26 -0500)]
Use the correct value for Process.WEBVIEW_ZYGOTE_UID.
When the libcutils constant was added there a merge conflict, which
caused the AID_WEBVIEW_ZYGOTE value to land with a different value than
the Java-side Process value. Nothing yet uses the Process constant, so
there were no ill effects.
Test: m
Change-Id: I8cc87bce1ddbdcdaf79d85c828d86837e96cce21
Lorenzo Colitti [Sun, 21 Jan 2018 14:00:55 +0000 (23:00 +0900)]
Remove obsolete NetworkStats.Entry constructor.
The only caller is telephony code, and it's being fixed in this
topic.
Bug:
35142602
Test: builds, boots
Change-Id: Ia77a1c2c297037f311c2355610c206cd8e3192c4
Pavlin Radoslavov [Sun, 21 Jan 2018 00:33:40 +0000 (00:33 +0000)]
Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent" am:
7e3b1832c4
am:
5bd12d0bf4
Change-Id: I52b1adc5ce9f3dea56b0045581d7736cbe62de73
Pavlin Radoslavov [Sun, 21 Jan 2018 00:26:11 +0000 (00:26 +0000)]
Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent"
am:
7e3b1832c4
Change-Id: I4b75e8565dc0b80d6ca3825e87370a72c726bd25
Treehugger Robot [Sat, 20 Jan 2018 23:30:34 +0000 (23:30 +0000)]
Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent"
Pavlin Radoslavov [Sat, 20 Jan 2018 02:20:04 +0000 (18:20 -0800)]
Multi-A2DP support - add a new internal API to suppress Audio Noisy intent
The new API setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent()
is similar to the existing setBluetoothA2dpDeviceConnectionState()
except that it takes one extra argument that indicates whether the
AudioManager.ACTION_AUDIO_BECOMING_NOISY intent will be sent:
setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(
..., boolean suppressNoisyIntent)
This API is needed so the Active A2DP Sink device can be changed
while audio is streaming, and the audio continues playing on the new
Active Device.
Bug:
69269748
Test: Manual: multiple connected A2DP devices, and selecting each as
the Active Device.
Change-Id: I75766a58d9e6b42b3ce68bd9ad3a7a72ca5a1023
(cherry picked from commit
82e06463f2571a06286f9da0bf3ad5a0e58461a2)
David Brazdil [Sat, 20 Jan 2018 11:33:16 +0000 (11:33 +0000)]
Merge "Generate new API signatures from doclava" am:
fa208b4226
am:
72b7f03179
Change-Id: I7dbf94c493bc79f4200afc45e6ed58543359c9ff
David Brazdil [Sat, 20 Jan 2018 11:23:49 +0000 (11:23 +0000)]
Merge "Generate new API signatures from doclava"
am:
fa208b4226
Change-Id: Iae4cc67435b84c868a446dc7ac16a618656bbdbb
David Brazdil [Sat, 20 Jan 2018 10:06:22 +0000 (10:06 +0000)]
Merge "Generate new API signatures from doclava"
yinxu [Sat, 20 Jan 2018 09:56:08 +0000 (09:56 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database" am:
6745e15d17
am:
33de998afe
Change-Id: I63246ba54d112ef75ca6989c16d7ae979bde552a
yinxu [Sat, 20 Jan 2018 09:47:20 +0000 (09:47 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database"
am:
6745e15d17
Change-Id: I3df57fc50d9e928d74c50b2b99fde63e757e7e78
Treehugger Robot [Sat, 20 Jan 2018 08:28:24 +0000 (08:28 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database"
Yin-Chia Yeh [Tue, 2 Jan 2018 19:17:58 +0000 (11:17 -0800)]
Camera: remove NOT_PRESENT cameras
So hot plug cameras won't stay forever in
device status map.
Change-Id: I0290ff2eccb3d48a0f72c48f32a97909d20623ad
Jordan Liu [Fri, 19 Jan 2018 21:36:06 +0000 (21:36 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration" am:
8fb3bdc36f
am:
5d90d0e2b7
Change-Id: Ia3fe7265126023ec8c2ba5aaa6d09cd1ed1e9c43
Jordan Liu [Fri, 19 Jan 2018 21:29:10 +0000 (21:29 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration"
am:
8fb3bdc36f
Change-Id: Icf95b62e2828de2175b2c9767741138c507c0e5b
Jordan Liu [Fri, 19 Jan 2018 20:39:43 +0000 (20:39 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration"
nharold [Fri, 19 Jan 2018 20:16:38 +0000 (20:16 +0000)]
Merge "Add Tunnel Interface APIs to IpSecManager" am:
08d07aec50
am:
696cff166c
Change-Id: I0cd07c51e9512b7e9471e1a09c977fca2bf12e48