OSDN Git Service
Jakub Pawlowski [Thu, 17 Aug 2017 23:06:14 +0000 (23:06 +0000)]
Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails"
am:
b7cbb2fe49
Change-Id: I5ccf67621134fe1ba9204e2a8f3502ffacef0315
Treehugger Robot [Thu, 17 Aug 2017 22:51:23 +0000 (22:51 +0000)]
Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails"
Jakub Pawlowski [Thu, 17 Aug 2017 22:47:38 +0000 (22:47 +0000)]
Merge "Bluetooth: Fix startAdvertisingSet error handling"
am:
ed12213b59
Change-Id: I093e849e910428c521e73072121dfdfdceb28e0d
Treehugger Robot [Thu, 17 Aug 2017 22:33:27 +0000 (22:33 +0000)]
Merge "Bluetooth: Fix startAdvertisingSet error handling"
Jakub Pawlowski [Thu, 17 Aug 2017 13:15:43 +0000 (06:15 -0700)]
Bluetooth: Don't throw exception when stopAdvertisingSet fails
When advertising is stopped while Bluetooth is disabled, we should not
throw any exceptions, just log the failure.
This was the default behaviour before the AdvertisingSet was introduced.
Bug:
63819108
Test: manual
Change-Id: I518e071b77b127973aee6f24fa6ced4f28bc9531
Jakub Pawlowski [Thu, 17 Aug 2017 14:19:12 +0000 (07:19 -0700)]
Bluetooth: Fix startAdvertisingSet error handling
Calls to old advertising API (startAdvertising), should never throw
exceptions. Instead, it used to post failure callback. This behaviour
was accidentally modified when implementing new API. Right now, instead
of posting error callback, we throw IllegalArgumentException if we fail
to obtain BluetoothGatt object, or the call to startAdvertisingSet
fails.
This patch brings back the old behaviour to the API. It also makes new
API post callback instead of throwing exception in this error case.
Bug:
63819108
Test: manual
Change-Id: I897b99839f899ca3f3dc609918d665c8c327b777
Hall Liu [Thu, 17 Aug 2017 01:30:56 +0000 (01:30 +0000)]
Merge "Revert "Fix lint errors in the streaming API""
am:
42d3eadb37
Change-Id: I4229c1eb42edba2c2c7df08f87bfded5402c01c7
Hall Liu [Thu, 17 Aug 2017 01:22:19 +0000 (01:22 +0000)]
Merge "Revert "Fix lint errors in the streaming API""
Hall Liu [Thu, 17 Aug 2017 00:46:24 +0000 (00:46 +0000)]
Revert "Fix lint errors in the streaming API"
This reverts commit
e1f10cbd7ff6128171b6ab37b3afbfdc3d9f9f33.
Change-Id: Id3666b27b0d07b0a1d4f3179f2073aa75440f2ee
Andreas Huber [Wed, 16 Aug 2017 23:40:07 +0000 (23:40 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder."
am:
2c4dfa0412
Change-Id: I20348e98597bf8de57b19ef25aec6fb0912da25f
Andreas Huber [Wed, 16 Aug 2017 23:17:49 +0000 (23:17 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder."
Hall Liu [Wed, 16 Aug 2017 23:16:30 +0000 (23:16 +0000)]
Merge "Fix lint errors in the streaming API"
am:
b0f5d57489
Change-Id: Ic12810c6a3c795419ff7440218ffa23bad7d8401
Hall Liu [Wed, 16 Aug 2017 22:51:13 +0000 (22:51 +0000)]
Merge "Fix lint errors in the streaming API"
Luis Hector Chavez [Wed, 16 Aug 2017 21:32:13 +0000 (21:32 +0000)]
Merge "Improve container capability bounding in containers"
am:
586fd52b34
Change-Id: I7c67b571164e67b3e4a8ae9c9a2701e338693a4b
Treehugger Robot [Wed, 16 Aug 2017 21:16:50 +0000 (21:16 +0000)]
Merge "Improve container capability bounding in containers"
Hall Liu [Fri, 4 Aug 2017 01:26:39 +0000 (18:26 -0700)]
Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.
Bug:
30981736
Test: manual, with testapps
Change-Id: I94e1bcccea4b9f50dae4c93f247ab78058d15bb5
Di Lu [Wed, 16 Aug 2017 16:33:18 +0000 (16:33 +0000)]
Merge "Add user quota information into the IpSecService dump"
am:
fedd856546
Change-Id: I1f64ab03918ece154fe31a07b698825315d39c0f
Andreas Huber [Wed, 16 Aug 2017 16:02:02 +0000 (09:02 -0700)]
Remove unused global references in JNI code supporting HwBinder.
Bug:
63814586
Change-Id: Ia149cc055d6e105df8e109ae1b959a9fbf669b8a
Test: hidl_test_java
Di Lu [Wed, 16 Aug 2017 16:20:18 +0000 (16:20 +0000)]
Merge "Add user quota information into the IpSecService dump"
Luis Hector Chavez [Wed, 12 Jul 2017 17:03:30 +0000 (10:03 -0700)]
Improve container capability bounding in containers
This change stops relying on the ro.boot.container property for dropping
a subset of capabilities and instead relies on the effective capability
mask of the Zygote process, prior to forking.
When Android is running in a pid/mount/net/user namespace, even if a
particular capability is present, some operations that require that
capability check whether it is allowed in the init namespace (instead of
in the current namespace), so they would fail even with the capability
granted within the namespace. So, explicitly dropping the capabilities
from the beginning allows for clearer signalling of which operations can
be expected to work instead of failing silently for mysterious reasons.
Bug:
63579953
Test: aosp_bullhead-eng still boots
Test: Running Zygote without CAP_SYS_MODULE makes it such that
system_server does not request it.
Change-Id: I1d18d13341bcc04e701fd14092e7e94961728620
Hugo Benichi [Wed, 16 Aug 2017 14:49:27 +0000 (14:49 +0000)]
Merge "Add convenience methods to IpPrefix and LinkAddress"
am:
2ad60c88f1
Change-Id: I6d3f3c50eaec44e3a0787e849ab28e89f6f4a72d
Treehugger Robot [Wed, 16 Aug 2017 14:38:29 +0000 (14:38 +0000)]
Merge "Add convenience methods to IpPrefix and LinkAddress"
Hugo Benichi [Tue, 8 Aug 2017 04:06:04 +0000 (13:06 +0900)]
Add convenience methods to IpPrefix and LinkAddress
Also moving relevant test files into tests/net as part of runtest
framworks-net.
Also removes testHashCode in LinkAddress() because this test relies on
the assumption that hashCode() is stable across releases or jdk
versions, which is absolutely not true.
This creates maintenance work for little benefit since hashCode is
already tested as part of the equality test.
For instance this test is now broken because hashing for InetAddress
changed.
Bug:
62988545
Bug:
62918393
Test: runtest frameworks-net, added coverage in tests
Change-Id: I695bc3f0e801bf13bc4fc0706565758f12b775b4
Hugo Benichi [Wed, 16 Aug 2017 11:57:50 +0000 (11:57 +0000)]
Merge "More OWNERS file for core networking team"
am:
2827f21740
Change-Id: Icae3bc4dbb2cd094c728d98aea02d4009aaa0e0b
Hugo Benichi [Wed, 16 Aug 2017 11:50:55 +0000 (11:50 +0000)]
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
am:
b35719a057
Change-Id: I0ab76de59e87c46a6961229399ff7200bce49838
Treehugger Robot [Wed, 16 Aug 2017 11:37:11 +0000 (11:37 +0000)]
Merge "More OWNERS file for core networking team"
Treehugger Robot [Wed, 16 Aug 2017 11:34:24 +0000 (11:34 +0000)]
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
Hugo Benichi [Wed, 16 Aug 2017 06:43:14 +0000 (15:43 +0900)]
More OWNERS file for core networking team
Test: build
Change-Id: I7cef188e29f487025aee04ab0c1a003bb32a7048
Hugo Benichi [Wed, 16 Aug 2017 04:19:04 +0000 (13:19 +0900)]
Allow NetworkAgent "immutable updates" to NetworkCapabilities
This patch loosens the validation checks when a NetworkAgent updates it
NetworkCapabilities: instead of checking that capabilities labeled as
"immutable" stay identical across updates, it is now accepted to change
immutable capabilities in a way that the new NetworkCapabilities
satisfies the old NetworkCapabilities.
This allows a NetworkAgent to update itself in order to match more
requests, but will still catch NetworkAgents that sends degradation
updates causing potentially requests to not match anymore.
Bug:
64125969
Test: runtest frameworks-net
Change-Id: I2a1b3f9c0be6415e40edc989d0c1b03b5631f7b1
Brad Ebinger [Tue, 15 Aug 2017 18:04:18 +0000 (18:04 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
am:
53e82a9cd0
Change-Id: I3bafca03e20ef114588145982985411882d2c8f5
Brad Ebinger [Tue, 15 Aug 2017 17:41:27 +0000 (17:41 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
Lorenzo Colitti [Tue, 15 Aug 2017 02:07:36 +0000 (02:07 +0000)]
Merge changes I82d3bee0,I9c9413d7
am:
deb4eb5d05
Change-Id: Iaa6aecf3ec3a91dc04f4533c0ea5b649bdfeb83d
Lorenzo Colitti [Tue, 15 Aug 2017 01:57:28 +0000 (01:57 +0000)]
Merge changes I82d3bee0,I9c9413d7
* changes:
Pass data usage limits to tethering offload code.
Don't time out when fetching tether offload stats.
nharold [Tue, 15 Aug 2017 01:29:00 +0000 (01:29 +0000)]
Merge "Cleanup ServiceState.toString()"
am:
ee6e43c033
Change-Id: Ida4fc7c5cce8c763a5b8baf544d8244934e7c193
nharold [Tue, 15 Aug 2017 01:12:28 +0000 (01:12 +0000)]
Merge "Cleanup ServiceState.toString()"
Tyler Gunn [Tue, 15 Aug 2017 00:14:36 +0000 (00:14 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete."
am:
58b77aa4aa
Change-Id: I62e0700b9a94d3b17b2d32d16adb488519f6ff66
huiwan [Mon, 14 Aug 2017 23:59:13 +0000 (23:59 +0000)]
Merge "PrintSpooler: fix monkey crash if height&width small than 0"
am:
4a41744919
Change-Id: I3b704d0f3e27bb26e00c60cd22145767d6c08335
Tyler Gunn [Mon, 14 Aug 2017 23:54:12 +0000 (23:54 +0000)]
Merge "Add config option to enable/disable pause workaround."
am:
9282d725f0 -s ours
Change-Id: I6e54ff11618e8a49cb20391f10f8f79adc61463d
ludi [Thu, 10 Aug 2017 22:44:40 +0000 (15:44 -0700)]
Add user quota information into the IpSecService dump
Bug:
64093788
Test: runtest frameworks-net
Change-Id: I6c5fc9e2db4ba57e0db4f6380a1251c4e444951b
Tyler Gunn [Mon, 14 Aug 2017 21:24:18 +0000 (21:24 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete."
Nathan Harold [Wed, 2 Aug 2017 17:51:47 +0000 (10:51 -0700)]
Cleanup ServiceState.toString()
Updating the formatting of the toString() method to
name the fields that it's printing, and to use one of
the more common formats for object dumping.
Bug:
64300932
Test: compilation, dumpsys
Change-Id: I56c4679d2a4a184f659870481e2ce0699fe38613
Treehugger Robot [Mon, 14 Aug 2017 19:57:26 +0000 (19:57 +0000)]
Merge "PrintSpooler: fix monkey crash if height&width small than 0"
Tyler Gunn [Fri, 12 May 2017 17:04:49 +0000 (10:04 -0700)]
Add ConnectionService callback invoked when connection creation complete.
Adding a new @hide callback in ConnectionService which a CS implementation
can implement. A callback from Telecom is responsible for invoking this
method.
Test: Manual
Bug:
33272455
Change-Id: Id17cf0fd8fd491b7677f9b7a7b52c76270b1c8c9
Brad Ebinger [Fri, 30 Jun 2017 22:34:32 +0000 (15:34 -0700)]
Adds a new string definition for IMS Access blocked reason
When a call is disconnected with the Telephony DisconnectCause
IMS_ACCESS_BLOCKED, DisconnectCause#getReason will now return
the reason REASON_IMS_ACCESS_BLOCKED.
Bug:
33821263
Test: manual tests
Merged-In: Ic8b76e83aa8eb20074862f0e67734d2c5389ba12
Change-Id: Ic17cefa35a51f739c893923a2db7f3dca8ada202
Treehugger Robot [Mon, 14 Aug 2017 16:29:04 +0000 (16:29 +0000)]
Merge "Add config option to enable/disable pause workaround."
Lorenzo Colitti [Fri, 11 Aug 2017 04:47:49 +0000 (13:47 +0900)]
Pass data usage limits to tethering offload code.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I82d3bee030bafa8fe85855885b5fc3893e699181
Lorenzo Colitti [Mon, 14 Aug 2017 04:07:42 +0000 (13:07 +0900)]
Don't time out when fetching tether offload stats.
Currently, fetching tethering offload stats has a 1000ms timeout,
after which we return stats of zero. However, returning zero is
invalid and will cause various parts of the network stats
accounting code to complain that statistics are moving backwards,
causing at least a log.wtf, and possibly a crash.
This CL removes the timeout entirely.
An alternative would have been to keep the timeout and return
null if the stats fetch failed. However, this complicates the
code, and if the HAL is persistently slow, could cause no stats
to be counted, ever. Given the impact of such behaviour on users'
data plans it is likely better to block until the stats are
collected.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I9c9413d757f44e87a51ea7ca82b657cc6aa0d4ba
Tyler Gunn [Mon, 15 May 2017 18:43:25 +0000 (11:43 -0700)]
Add config option to enable/disable pause workaround.
Test: Manual/unit
Bug:
35304446
Merged-In: I9a0c73ce62812a87e30d9759a0d205ffa282caf2
Change-Id: I9a0c73ce62812a87e30d9759a0d205ffa282caf2
Joachim Sauer [Mon, 14 Aug 2017 12:28:51 +0000 (12:28 +0000)]
Merge "API updated for ICU4J 59.1"
am:
365178394d
Change-Id: I74a98d63f9f170f6401a87c559fd0eccf06cb8f2
Joachim Sauer [Mon, 14 Aug 2017 12:19:39 +0000 (12:19 +0000)]
Merge "API updated for ICU4J 59.1"
huiwan [Tue, 1 Aug 2017 05:21:13 +0000 (13:21 +0800)]
PrintSpooler: fix monkey crash if height&width small than 0
During the monkey test, should add check height & width before
create the bitmap, to avoid the monkey test fail.
Change-Id: I5619c30af63afa3d74d0417e37c67c4920e099ba
Test: build & run
Steven Moreland [Fri, 11 Aug 2017 21:41:00 +0000 (21:41 +0000)]
Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master
Steven Moreland [Fri, 11 Aug 2017 21:38:39 +0000 (21:38 +0000)]
Revert "aapt2_jni: use proper nativehelper headers"
This reverts commit
8eebd694e59fb01c13267c509ea98179f149e69b.
Reason for revert: TH skipped PS run
Change-Id: Iab0e71d985819880146476ba3648e8b94201a839
TreeHugger Robot [Fri, 11 Aug 2017 21:35:31 +0000 (21:35 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master
Steven Moreland [Fri, 11 Aug 2017 21:07:06 +0000 (21:07 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
am:
75c9e4d594
Change-Id: I170b5846981683eacee1081587c7149bab454d91
Treehugger Robot [Fri, 11 Aug 2017 20:40:35 +0000 (20:40 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
TreeHugger Robot [Fri, 11 Aug 2017 19:53:32 +0000 (19:53 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
Tyler Gunn [Fri, 11 Aug 2017 18:33:44 +0000 (18:33 +0000)]
Merge changes from topic 'call-session-may'
am:
21e4dbb6ed
Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8
Tyler Gunn [Fri, 11 Aug 2017 18:14:02 +0000 (18:14 +0000)]
Merge changes from topic 'call-session-may'
* changes:
Add callSessionMayHandover API to ImsCallSession.
IMS: Support for Possible Call Session Handover
Steven Moreland [Fri, 11 Aug 2017 18:01:23 +0000 (11:01 -0700)]
aapt2_jni: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using aapt2_jni find headers
Bug:
63762847
Change-Id: Id51354d533bfef66ecd71f5d89599b8adc688c1f
Steven Moreland [Fri, 11 Aug 2017 17:52:35 +0000 (10:52 -0700)]
Reference ScopedUtfChar header correctly.
Bug:
63762847
Test: finds header in proper location
Change-Id: I4963ab3133c405a90564112f0d9af602ace0eab5
Steven Moreland [Fri, 11 Aug 2017 01:08:37 +0000 (18:08 -0700)]
ScopedUtfChars: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using ScopedUtfChars find headers
Bug:
63762847
Merged-In: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Brad Ebinger [Fri, 11 Aug 2017 00:42:30 +0000 (00:42 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
am:
a46600e0e7
Change-Id: If849e9ed61271bf233f4e149ef766e2e7b0d7851
Treehugger Robot [Fri, 11 Aug 2017 00:31:41 +0000 (00:31 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
Brad Ebinger [Thu, 27 Jul 2017 19:57:03 +0000 (12:57 -0700)]
Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.
This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.
Bug:
63137625
Test: Manual
Merged-In: I0e049166ddf3604d312748b63a94fa6ebe77c29d
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
Brad Ebinger [Thu, 10 Aug 2017 23:02:56 +0000 (23:02 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
am:
6ffc855e8d
Change-Id: Ifa04b6260d51c17dc323fab918db0bdbf2bdea64
Brad Ebinger [Thu, 10 Aug 2017 22:50:45 +0000 (22:50 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
Amit Mahajan [Thu, 10 Aug 2017 16:12:19 +0000 (16:12 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
am:
cd03d0db9d
Change-Id: I386f5e4de89c4ac758e1702b2efdc16a43c12c33
Amit Mahajan [Thu, 10 Aug 2017 16:06:36 +0000 (16:06 +0000)]
Merge "Get isim card data use subId."
am:
854edcff16
Change-Id: I0a562f9966838cc6746c170b3bba9a250fd2633b
Amit Mahajan [Thu, 10 Aug 2017 15:59:43 +0000 (15:59 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
Amit Mahajan [Thu, 10 Aug 2017 15:57:38 +0000 (15:57 +0000)]
Merge "Get isim card data use subId."
Brad Ebinger [Thu, 22 Jun 2017 18:39:11 +0000 (11:39 -0700)]
Add method that checks the Binder status of ImsConfig
Adds a method to check whether or not the ImsConfig
binder has died.
Bug:
62723694
Test: maual, follow bug procedure
Merged-In: I0ecd6a43d4375d3ac4d7d54b3d437832c0221f05
Change-Id: I9df6533e7e7dc69487cea50fada6c89599b031a3
Erik Kline [Wed, 9 Aug 2017 22:23:24 +0000 (22:23 +0000)]
Merge "Add future consideration for USB rndis notification handling"
am:
4263a5ed58
Change-Id: I7dd347447434214ecf3e5f9f8e2a603cd097f6c6
Treehugger Robot [Wed, 9 Aug 2017 22:10:19 +0000 (22:10 +0000)]
Merge "Add future consideration for USB rndis notification handling"
Erik Kline [Wed, 9 Aug 2017 03:53:46 +0000 (20:53 -0700)]
Add future consideration for USB rndis notification handling
Test: builds
Bug:
63970368
Merged-In: If6afe1cdce9995251ba53fbf30acf9d6e31f9433
Merged-In: I78e280c2299ec3f4d97138ca648f9629ba82e87f
Merged-In: I891cd82b0e8af1049fa3ab9b0a95a2a9ab2e0b26
Change-Id: Ic9ca133a44123f281bd4cfeac57d426346c2b76d
(cherry picked from commit
1290568110405fd45f13824e67beeb98c30400a4)
Jakub Pawlowski [Wed, 9 Aug 2017 19:15:08 +0000 (19:15 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification"
am:
c7da241b3e
Change-Id: Iaf58ace037810d11fcb29c2696c79664d601e87c
Erik Kline [Wed, 9 Aug 2017 19:12:23 +0000 (19:12 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts."
am:
d27af8af62
Change-Id: I33633e064a329b9094b0d279622febab6266e5cb
Tyler Gunn [Wed, 9 Aug 2017 19:03:32 +0000 (19:03 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis."
am:
647b520a00
Change-Id: I8962fc326d0e2888656c2764e94131c6eebd1471
Jakub Pawlowski [Wed, 9 Aug 2017 18:56:57 +0000 (18:56 +0000)]
Merge "Bluetooth: AdvertiseData parceling simplification"
Treehugger Robot [Wed, 9 Aug 2017 18:54:32 +0000 (18:54 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts."
Treehugger Robot [Wed, 9 Aug 2017 18:44:08 +0000 (18:44 +0000)]
Merge "Enforce call log length limit on a per PhoneAccount basis."
nharold [Wed, 9 Aug 2017 17:49:42 +0000 (17:49 +0000)]
Merge "Add UserQuotaTracker to IpSecService"
am:
a0c97b3ddb
Change-Id: I43a9617b077ecd5fc2b445a1ade8b76c00562640
Jason Monk [Wed, 9 Aug 2017 17:47:52 +0000 (17:47 +0000)]
Merge "Prevent data usage dialog from being displayed again"
am:
48e8091eda
Change-Id: Iaf17879b3a708585a2ae4cc7460527a3f998bce4
Lorenzo Colitti [Wed, 9 Aug 2017 17:45:22 +0000 (17:45 +0000)]
Merge "Minor fixes for netd restarts and StrictController."
am:
2f5ca257b5
Change-Id: If9a156c516f35c48055012ec6ab7ed5ccaa6b259
Erik Kline [Tue, 8 Aug 2017 01:11:22 +0000 (18:11 -0700)]
Always note the state of RNDIS from USB broadcasts.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
63970368
Merged-In: I53115deda25ca83a00bd9de12891a72028647d12
Merged-In: I317b694c3a8c76077c031c4410d5b97ed79c1bbc
Merged-In: Ie226534011d6439c24cfe1957c5cf47ba171b0c0
Change-Id: I273edbe21fea586f1353ff378515401efc6bb15e
(cherry picked from commit
3897dc179f23dfbaf10f0139160aa29a232144f5)
Chen Xu [Wed, 9 Aug 2017 17:42:29 +0000 (17:42 +0000)]
Merge "initial value for data_roaming based on carrier"
am:
973ddd55eb
Change-Id: I374dd9e18f9e3bc5e9fe1ea945923f81df90fa15
Jakub Pawlowski [Tue, 8 Aug 2017 22:47:57 +0000 (15:47 -0700)]
Bluetooth: AdvertiseData parceling simplification
Use writeTypedArray instead of writeList - this will not serialize
string with type name, which is unnecessary
Use createByteArray instead of readByteArra - it takes care of null and
empty array handling
Test: sl4a FilteringTest, BleAdvertiseApiTest
Change-Id: I6a22674a0bf9933e39691de7f2b2b52a060ae368
nharold [Wed, 9 Aug 2017 17:05:49 +0000 (17:05 +0000)]
Merge "Add UserQuotaTracker to IpSecService"
Tyler Gunn [Thu, 1 Jun 2017 21:12:54 +0000 (14:12 -0700)]
Enforce call log length limit on a per PhoneAccount basis.
Performing the auto delete based on the PhoneAccount of the new entry.
This ensures no one CS can cause the removal of entries by another.
Test: Manual
Bug:
38196259
Merged-In: I382cb62a1b2b7e482c49ece05f90fc982b797add
Change-Id: I382cb62a1b2b7e482c49ece05f90fc982b797add
Fredrik Roubert [Thu, 6 Apr 2017 23:21:12 +0000 (01:21 +0200)]
API updated for ICU4J 59.1
Bug:
62410016
Test: make
Change-Id: Ieeee55e7fec1022ef62e792f83ba5c2c177b77af
Jason Monk [Wed, 9 Aug 2017 13:41:54 +0000 (13:41 +0000)]
Merge "Prevent data usage dialog from being displayed again"
Jakub Pawlowski [Wed, 9 Aug 2017 07:45:34 +0000 (00:45 -0700)]
resolve merge conflicts of
15658662fdde to stage-aosp-master
Test: this fixes merge conflict that I skipped
Change-Id: I2e993d1f021b1bb671b07440cdc611853d6c3f08
Treehugger Robot [Wed, 9 Aug 2017 10:26:14 +0000 (10:26 +0000)]
Merge "Minor fixes for netd restarts and StrictController."
Chen Xu [Wed, 9 Aug 2017 07:24:05 +0000 (07:24 +0000)]
Merge "Handle invalid destination address gracefully"
am:
a753dfd2e8
Change-Id: I103f925d8008748b5cc5e15a48f0773c092e293a
Jordan Liu [Wed, 9 Aug 2017 07:21:22 +0000 (07:21 +0000)]
Merge "Fix error message strings"
am:
67862237e9
Change-Id: I5dc11be348893ed61b1aee8777059967ac7b910e
Hampus Wessman [Wed, 9 Aug 2017 07:19:11 +0000 (07:19 +0000)]
Merge "Fix graphical artifact in the fisheye effect"
am:
0b885b8096
Change-Id: I07a41a6a7e7cb7f145b3624bf58e4addeeb24547
Jack Yu [Wed, 9 Aug 2017 07:16:37 +0000 (07:16 +0000)]
Merge "Moved channels settings from carrier config to resources"
am:
79eddf8c0a
Change-Id: If2c2e6e1d260fae50a15c8a3aa8fba4460884ec1
Jakub Pawlowski [Wed, 9 Aug 2017 07:13:32 +0000 (07:13 +0000)]
Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)"
am:
15658662fd -s ours
Change-Id: I3af0324d3a2029b5b4c27625c1c0b6f74363fc59
yanxue.xu [Thu, 13 Jul 2017 08:40:55 +0000 (16:40 +0800)]
Get isim card data use subId.
Get isim card data is obtained the default card data instead of the corresponding card data.
It is necessary to obtain the card data according to the subid.
Test: Get isim card data use subId.
Change-Id: I9ad90f8180f35449879507b6f086c4be01aacc9d
Nathan Harold [Mon, 24 Apr 2017 23:16:34 +0000 (16:16 -0700)]
Add UserQuotaTracker to IpSecService
Add a small tracking object to enforce maximum
quotas for SPIs, Transforms, and Encap sockets. The
current quota limits are intentionally conservative
with the expectation that we can relax them more
easily than we can shrink them.
Bug:
37688603
Test: tbd
Change-Id: Iee59ac59ef9f4a7ab75a2e04f9ca72da82fc3229