322899 Commits

Author SHA1 Message Date
Amit Mahajan
854edcff16 Merge "Get isim card data use subId." 2017-08-10 15:57:38 +00:00
Brad Ebinger
9cf842c531 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
2017-08-09 16:56:42 -07:00
Erik Kline
6ff0730158 Merge "Add future consideration for USB rndis notification handling"
am: 4263a5ed58

Change-Id: I7dd347447434214ecf3e5f9f8e2a603cd097f6c6
2017-08-09 22:23:24 +00:00
Treehugger Robot
4263a5ed58 Merge "Add future consideration for USB rndis notification handling" 2017-08-09 22:10:19 +00:00
Erik Kline
7111c9145b 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)
2017-08-09 13:57:14 -07:00
Jakub Pawlowski
3ee6eed62f Merge "Bluetooth: AdvertiseData parceling simplification"
am: c7da241b3e

Change-Id: Iaf58ace037810d11fcb29c2696c79664d601e87c
2017-08-09 19:15:08 +00:00
Erik Kline
47f2cf5144 Merge "Always note the state of RNDIS from USB broadcasts."
am: d27af8af62

Change-Id: I33633e064a329b9094b0d279622febab6266e5cb
2017-08-09 19:12:23 +00:00
Tyler Gunn
8adf430f30 Merge "Enforce call log length limit on a per PhoneAccount basis."
am: 647b520a00

Change-Id: I8962fc326d0e2888656c2764e94131c6eebd1471
2017-08-09 19:03:32 +00:00
Jakub Pawlowski
c7da241b3e Merge "Bluetooth: AdvertiseData parceling simplification" 2017-08-09 18:56:57 +00:00
Treehugger Robot
d27af8af62 Merge "Always note the state of RNDIS from USB broadcasts." 2017-08-09 18:54:32 +00:00
Treehugger Robot
647b520a00 Merge "Enforce call log length limit on a per PhoneAccount basis." 2017-08-09 18:44:08 +00:00
nharold
3546a5ef92 Merge "Add UserQuotaTracker to IpSecService"
am: a0c97b3ddb

Change-Id: I43a9617b077ecd5fc2b445a1ade8b76c00562640
2017-08-09 17:49:42 +00:00
Jason Monk
abff77e4aa Merge "Prevent data usage dialog from being displayed again"
am: 48e8091eda

Change-Id: Iaf17879b3a708585a2ae4cc7460527a3f998bce4
2017-08-09 17:47:52 +00:00
Lorenzo Colitti
25e0f60f54 Merge "Minor fixes for netd restarts and StrictController."
am: 2f5ca257b5

Change-Id: If9a156c516f35c48055012ec6ab7ed5ccaa6b259
2017-08-09 17:45:22 +00:00
Erik Kline
4f31c21787 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)
2017-08-09 10:45:08 -07:00
Chen Xu
0c2b4d7308 Merge "initial value for data_roaming based on carrier"
am: 973ddd55eb

Change-Id: I374dd9e18f9e3bc5e9fe1ea945923f81df90fa15
2017-08-09 17:42:29 +00:00
Jakub Pawlowski
e8c3b91dc3 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
2017-08-09 17:26:14 +00:00
nharold
a0c97b3ddb Merge "Add UserQuotaTracker to IpSecService" 2017-08-09 17:05:49 +00:00
Tyler Gunn
c971bf1760 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
2017-08-09 09:53:00 -07:00
Fredrik Roubert
8f2436b3dc API updated for ICU4J 59.1
Bug: 62410016
Test: make
Change-Id: Ieeee55e7fec1022ef62e792f83ba5c2c177b77af
2017-08-09 18:17:58 +02:00
Jason Monk
48e8091eda Merge "Prevent data usage dialog from being displayed again" 2017-08-09 13:41:54 +00:00
Jakub Pawlowski
3b38eaa3c2 resolve merge conflicts of 15658662fdde to stage-aosp-master
Test: this fixes merge conflict that I skipped
Change-Id: I2e993d1f021b1bb671b07440cdc611853d6c3f08
2017-08-09 13:03:35 +00:00
Treehugger Robot
2f5ca257b5 Merge "Minor fixes for netd restarts and StrictController." 2017-08-09 10:26:14 +00:00
Chen Xu
825345628c Merge "Handle invalid destination address gracefully"
am: a753dfd2e8

Change-Id: I103f925d8008748b5cc5e15a48f0773c092e293a
2017-08-09 07:24:05 +00:00
Jordan Liu
ab1d052155 Merge "Fix error message strings"
am: 67862237e9

Change-Id: I5dc11be348893ed61b1aee8777059967ac7b910e
2017-08-09 07:21:22 +00:00
Hampus Wessman
f22a6f7c60 Merge "Fix graphical artifact in the fisheye effect"
am: 0b885b8096

Change-Id: I07a41a6a7e7cb7f145b3624bf58e4addeeb24547
2017-08-09 07:19:11 +00:00
Jack Yu
54ccaa0e99 Merge "Moved channels settings from carrier config to resources"
am: 79eddf8c0a

Change-Id: If2c2e6e1d260fae50a15c8a3aa8fba4460884ec1
2017-08-09 07:16:37 +00:00
Jakub Pawlowski
2bcb9ec481 Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)"
am: 15658662fd  -s ours

Change-Id: I3af0324d3a2029b5b4c27625c1c0b6f74363fc59
2017-08-09 07:13:32 +00:00
yanxue.xu
9957f979e1 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
2017-08-09 14:58:25 +08:00
Nathan Harold
a1afbd8dcc 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
2017-08-08 18:28:47 -07:00
Chen Xu
973ddd55eb Merge "initial value for data_roaming based on carrier" 2017-08-09 01:19:24 +00:00
Chen Xu
a753dfd2e8 Merge "Handle invalid destination address gracefully" 2017-08-09 01:09:42 +00:00
Jordan Liu
67862237e9 Merge "Fix error message strings" 2017-08-09 00:41:57 +00:00
fionaxu
715b812e75 initial value for data_roaming based on carrier
1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.

Bug: 36193933
Test: manual test
Change-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3
2017-08-08 17:08:46 -07:00
Treehugger Robot
0b885b8096 Merge "Fix graphical artifact in the fisheye effect" 2017-08-09 00:00:43 +00:00
Treehugger Robot
79eddf8c0a Merge "Moved channels settings from carrier config to resources" 2017-08-08 23:56:05 +00:00
fionaxu
b50183d2fd Handle invalid destination address gracefully
Bug: 37578305
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java --test-method testSendTextWithInvalidDestAddr
Change-Id: I2e79acb66178586d29dc89ad018f2726ed654a85
2017-08-08 16:41:23 -07:00
Jordan Liu
1185dc50f8 Fix error message strings
mmcc_imsi_unknown_in_hlr and mmcc_illegal_ms are updated to reflect
newly supported requirements.

Fixes: 64194949
Test: manual
Change-Id: I358ba1d562d30e958580003336ace3941bd5e04f
2017-08-08 16:06:17 -07:00
Jakub Pawlowski
15658662fd Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)" 2017-08-08 22:39:31 +00:00
Jack Yu
0fc9492176 Moved channels settings from carrier config to resources
Since CBS channels are more countries specific instead
of carrier specific, moving it to resources makes
more sense.

Test: Manual
bug: 31223529
Merged-In: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Change-Id: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
2017-08-08 15:34:28 -07:00
Tyler Gunn
71c29cfad9 Add callSessionMayHandover API to ImsCallSession.
This matches the new AIDL definition in the API.

Test: Manual
Bug: 62489988
Change-Id: I97ad5b5359f19d533b5b8644fd37008c0c69bf9c
2017-08-08 13:10:48 -07:00
Anju Mathapati
efed6f6bd4 IMS: Support for Possible Call Session Handover
Adding the callSessionMayHandover API that allows
for the lower layers to indicate that the call session
may handover based on actions taken by the user/UI
layer.
The API provides current and target RAT information
pertaining to the possible handover.

Bug: 62489988
Test: Manual
Change-Id: I006462ce5688bb99a94d5135574fb2c17878685a
2017-08-08 12:52:53 -07:00
Jakub Pawlowski
6732625aa0 Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.

Test: compilation test
Change-Id: I9a6db8832c9ec3215c648e325d67278832ef22cc
Merged-In: I9a6db8832c9ec3215c648e325d67278832ef22cc
(cherry picked from commit 06ae9c665b6fce7a748c3d7175359bff8343768c)
2017-08-08 12:38:37 -07:00
Takashi Furukawa
51e24de109 Merge "Add null check for Wi-Fi command"
am: 43ee2ac140

Change-Id: Ideddbcd85dc15012f405138c358f3dd8c516eef5
2017-08-08 18:14:53 +00:00
Treehugger Robot
43ee2ac140 Merge "Add null check for Wi-Fi command" 2017-08-08 18:03:14 +00:00
Calin Juravle
8a9e43f1bf Merge "Update DexLoadReporter to comply with the new reporting API"
am: 89d087886d

Change-Id: If94d3ecb40eef29acb0ab6709de23b37a722119b
2017-08-08 17:13:06 +00:00
Calin Juravle
89d087886d Merge "Update DexLoadReporter to comply with the new reporting API" 2017-08-08 17:03:21 +00:00
Tobias Thierer
69b8b29c7b Network: Use HttpURLConnectionFactory rather than OkHttp APIs
This is a refactoring with no behavior change.

The new class provides an abstraction layer to hide knowledge
about OkHttp-specific APIs. Logic from android.net.Network that
knew about OkHttp is moving into that abstraction layer.

This CL refactors android.net.Network to make use of this
abstraction layer instead of the tight coupling onto OkHttp
APIs. The class no longer imports any classes from okhttp
packages.

The values of mDns and mConnectionPool, which never change after
the initial call to maybeInitHttpClient(), are now set directly on
the AndroidHttpClient instance when it is constructed in that method.

Applications can overwrite getSocketFactory() and might depend on
that method being called (and the result used) every time a
connection is opened; therefore, for maximum app compatibility this
call was kept inside openConnection().

This CL is a prerequisite for introducing an additional frameworks
dependency on a richer API than HttpURLConnection.

Test: Build and install apk for FrameworksCoreTests, then run:
      adb shell am instrument -e class android.net.NetworkTest -w com.android.frameworks.coretests
Bug: 64021405

Change-Id: I2c73d260508ee20c6a40fd6e95e2d058d3ea2330
2017-08-08 13:08:36 +01:00
Hugo Benichi
607f74b317 Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
am: c06dbc114f  -s ours

Change-Id: Idfc34008bf7d9c636ee67fed3f07552be688052d
2017-08-08 08:40:40 +00:00
Treehugger Robot
c06dbc114f Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" 2017-08-08 08:30:03 +00:00