Commit Graph

4841 Commits

Author SHA1 Message Date
Lorenzo Colitti
203c935d74 Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev am: 21bc3a39a4
am: 1af850fdfe

Change-Id: I2b586b84c44126e1d3b9097950a41decaa5216cc
2017-08-19 01:12:35 +00:00
Lorenzo Colitti
1af850fdfe Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev
am: 21bc3a39a4

Change-Id: I4e8e923d68dce1a4a68608dbd6c75a91165aa4ee
2017-08-19 01:02:33 +00:00
Lorenzo Colitti
21bc3a39a4 Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev 2017-08-19 00:54:59 +00:00
Pankaj Kanwar
13fe27bf76 Merge "Building IMSI encryption support." into oc-mr1-dev am: 94fa7ee972
am: 99512fd446

Change-Id: I703024e2d6b0bc193b89a1e0d76c15868cdc38ce
2017-08-18 20:46:02 +00:00
Pankaj Kanwar
99512fd446 Merge "Building IMSI encryption support." into oc-mr1-dev
am: 94fa7ee972

Change-Id: Ie3f8787de3cdb0db08724f99ee0b52a2ba228d5b
2017-08-18 20:30:15 +00:00
Pankaj Kanwar
94fa7ee972 Merge "Building IMSI encryption support." into oc-mr1-dev 2017-08-18 20:23:08 +00:00
pkanwar
becc8696a8 Building IMSI encryption support.
Added additional error checks while returning the key.
Create config parameter:
1. IMSI_KEY_AVAILABILITY_INT.
BUG: 35606429
Test: manual

Change-Id: Iaa5fed3b51719679051626081d82b85a04128896
2017-08-18 09:41:08 -07:00
Lorenzo Colitti
5356a35c3b Add tether offload traffic to interface stats as well.
Currently, we only count add tethering traffic to per-UID
stats, but not to total data usage (i.e., dev and XT stats). This
is correct for software tethering, because all software forwarded
packets are already included in interface counters, but it is
incorrect for hardware offload, because such packets do not
increment interface counters.

To fix this:
1. Add an argument to ITetheringStatsProvider#getTetherStats to
   indicate whether per-UID stats are requested. For clarity,
   define integer constants STATS_PER_IFACE and STATS_PER_UID
   to represent these operations.
2. Make NetdTetheringStatsProvider return stats only if per-UID
   stats are requested. (Otherwise tethering traffic would be
   double-counted).
3. Make OffloadController's stats provider return the same
   stats regardless of whether per-UID stats were requested or
   not.
4. Make NetworkStatsService add non-per-UID tethering stats to
   the dev and XT snapshots. The per-UID snapshots were already
   correctly adding in per-UID stats.

Bug: 29337859
Bug: 32163131
Test: runtest frameworks-net
Test: runtest frameworks-telephony
Change-Id: I7a4d04ab47694d754874136179f8edad71099638
2017-08-19 00:21:56 +09:00
Nathan Harold
2a9da68e39 Merge "Cleanup ServiceState.toString()" into oc-mr1-dev 2017-08-18 01:59:06 +00:00
Jack Yu
9ba75e153e Merge "Reduced the retry after disconnect delay" into oc-mr1-dev am: b70a55a7b5
am: f6b28f0b06

Change-Id: I79a4126a0ccc7d80029d133180afce2ea9ad8b88
2017-08-17 18:35:22 +00:00
Jack Yu
f6b28f0b06 Merge "Reduced the retry after disconnect delay" into oc-mr1-dev
am: b70a55a7b5

Change-Id: Ib4906735405a633b8b3905761b51a28d39cf830d
2017-08-17 18:16:53 +00:00
TreeHugger Robot
b70a55a7b5 Merge "Reduced the retry after disconnect delay" into oc-mr1-dev 2017-08-17 18:04:40 +00:00
Jeff Davidson
96d9986d03 Merge "Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev am: f2a70fc116" into oc-mr1-dev-plus-aosp
am: f98abfaf81

Change-Id: Id24288e3810c045babbc7397edf655f59a4642dd
2017-08-17 06:00:10 +00:00
Hall Liu
22b09c973d Merge "Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37 am: cb63a47d41 am: c7ac478f51 am: e2f5f4b110" into oc-mr1-dev-plus-aosp
am: 701f31e343

Change-Id: Ice1fc35e804b28a4c9ee28a177164d8c7d415aa5
2017-08-17 05:30:48 +00:00
Hall Liu
76344358dc Merge "Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398 am: 34639cbbab am: e168449b32" into oc-mr1-dev-plus-aosp
am: 839a419bdb

Change-Id: I3606e777fbbb3c2a1080dc71f762241fb0c7f199
2017-08-17 03:48:58 +00:00
Qingxi Li
1dd03d740e Merge "Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION" into oc-mr1-dev am: d339e30c26
am: c26df762c6

Change-Id: I04219acb94fcf4067eb32b843dd85f7711afcea1
2017-08-17 03:38:33 +00:00
Jeff Davidson
c4d573345c Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev
am: f2a70fc116

Change-Id: Ib50f88db345783ac735885880daec890efd31b76
2017-08-17 03:02:42 +00:00
Hall Liu
faeb18da84 Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37 am: cb63a47d41 am: c7ac478f51
am: e2f5f4b110

Change-Id: I00442fe091dab72bb114ac77c20845de0050cb0f
2017-08-17 02:01:40 +00:00
Hall Liu
e2f5f4b110 Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37 am: cb63a47d41
am: c7ac478f51

Change-Id: I55f9d7e583950a5a67de8775b6c0f1640430aac8
2017-08-17 01:53:47 +00:00
Hall Liu
cb63a47d41 Merge "Revert "Fix lint errors in the streaming API""
am: 42d3eadb37

Change-Id: I4229c1eb42edba2c2c7df08f87bfded5402c01c7
2017-08-17 01:30:56 +00:00
Hall Liu
42d3eadb37 Merge "Revert "Fix lint errors in the streaming API"" 2017-08-17 01:22:19 +00:00
Hall Liu
591fea2504 Revert "Fix lint errors in the streaming API"
This reverts commit e1f10cbd7f.

Change-Id: Id3666b27b0d07b0a1d4f3179f2073aa75440f2ee
2017-08-17 00:46:24 +00:00
Hall Liu
ed85bf291a Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398 am: 34639cbbab
am: e168449b32

Change-Id: Idc7b2897dc4a1bda38455d6fade54153770d176f
2017-08-16 23:59:45 +00:00
Qingxi Li
c26df762c6 Merge "Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION" into oc-mr1-dev
am: d339e30c26

Change-Id: Icc84b4157989c892bc04f87625555ae3ed4927d6
2017-08-16 23:48:20 +00:00
Hall Liu
e168449b32 Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398
am: 34639cbbab

Change-Id: I82cb1673fc8a066d5101bde8ae26d97ce781e253
2017-08-16 23:40:02 +00:00
Jeff Davidson
0ac6e0e22c Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public.
There is a reasonable use case for carrier apps to turn off this key
(b/64544341) so it should be visible to apps in the SDK.

Change-Id: I1a06196d4d4c7d6d06026ef74f3f1159c973f8e3
Test: TreeHugger
Fixes: 64721199
2017-08-16 23:30:36 +00:00
Hall Liu
90b923f398 Merge "Fix lint errors in the streaming API"
am: b0f5d57489

Change-Id: Ic12810c6a3c795419ff7440218ffa23bad7d8401
2017-08-16 23:16:30 +00:00
Qingxi Li
d339e30c26 Merge "Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION" into oc-mr1-dev 2017-08-16 23:03:48 +00:00
Hall Liu
b0f5d57489 Merge "Fix lint errors in the streaming API" 2017-08-16 22:51:13 +00:00
Jack Yu
5523dc55d8 Reduced the retry after disconnect delay
Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.

Test: Manual
bug: 63633916
Change-Id: Ifc35306711dde39eb521dc015da931f4d5f2bf06
2017-08-16 14:26:56 -07:00
Hall Liu
e1f10cbd7f 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
2017-08-16 11:33:40 -07:00
Pankaj Kanwar
7a9834a4a8 Merge "Show notification when VoWiFi is active, and user is out of service for voice." into oc-mr1-dev am: 539c15ec84
am: 45d1aadd50

Change-Id: Ie61db69d0fc26d83f34399ac892e0129319bc318
2017-08-16 17:22:48 +00:00
Pankaj Kanwar
45d1aadd50 Merge "Show notification when VoWiFi is active, and user is out of service for voice." into oc-mr1-dev
am: 539c15ec84

Change-Id: I63ff9c84bfb5582575f8e2098b02ff7f77a51287
2017-08-16 01:31:31 +00:00
pkanwar
68e3de7214 Show notification when VoWiFi is active, and user is out of service for
voice.

Bug: 62618428
Test: manual
Change-Id: Ic630991da3199584dd313a8bf3138b020ecebd5c
2017-08-15 20:57:08 +00:00
nharold
3ff89cfa5f Merge "Cleanup ServiceState.toString()" am: ee6e43c033 am: 5b30d7b819 am: c04cc3bb7e am: 1f1d124bfe
am: 3ce8557db0

Change-Id: I283bc89a497bf10ab6fad6062f052de8929ddd8d
2017-08-15 02:37:49 +00:00
nharold
3ce8557db0 Merge "Cleanup ServiceState.toString()" am: ee6e43c033 am: 5b30d7b819 am: c04cc3bb7e
am: 1f1d124bfe

Change-Id: I0c9e33c10ce673ed00bfe97b38ae671548d21201
2017-08-15 02:03:26 +00:00
Nathan Harold
0f6f6e261d 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
Merged-In: I56c4679d2a4a184f659870481e2ce0699fe38613
Change-Id: I56c4679d2a4a184f659870481e2ce0699fe38613
(cherry picked from commit 9acfe6f90a)
2017-08-14 18:54:17 -07:00
nharold
1f1d124bfe Merge "Cleanup ServiceState.toString()" am: ee6e43c033 am: 5b30d7b819
am: c04cc3bb7e

Change-Id: Id03de78c19dd4995b4702a238d79ac3e4278f3ec
2017-08-15 01:50:04 +00:00
nharold
5b30d7b819 Merge "Cleanup ServiceState.toString()"
am: ee6e43c033

Change-Id: Ida4fc7c5cce8c763a5b8baf544d8244934e7c193
2017-08-15 01:29:00 +00:00
nharold
ee6e43c033 Merge "Cleanup ServiceState.toString()" 2017-08-15 01:12:28 +00:00
qingxi
cfffe7554f Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION
Add EXTRA_FORCE_PROVISION for intent
ACTION_PROVISION_EMBEDDED_SUBSCRIPTION which will be used by the carrier
app to indentify whether the user chooses to use eUICC to set up the
cellular network in SUW.

Bug: 63869524
Test: E2E
Change-Id: I4d77fcd1ea62b98a885f3e1b78cc96ceed233e1d
2017-08-14 17:39:57 -07:00
Nathan Harold
9acfe6f90a 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
2017-08-14 13:27:44 -07:00
Tyler Gunn
63769af59d Merge changes from topic 'call-session-may'
am: 21e4dbb6ed

Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8
2017-08-11 18:33:44 +00:00
Tyler Gunn
21e4dbb6ed Merge changes from topic 'call-session-may'
* changes:
  Add callSessionMayHandover API to ImsCallSession.
  IMS: Support for Possible Call Session Handover
2017-08-11 18:14:02 +00:00
Brad Ebinger
44da663308 Merge "Change IMS callback AIDLs to be oneway"
am: a46600e0e7

Change-Id: If849e9ed61271bf233f4e149ef766e2e7b0d7851
2017-08-11 00:42:30 +00:00
Treehugger Robot
a46600e0e7 Merge "Change IMS callback AIDLs to be oneway" 2017-08-11 00:31:41 +00:00
Brad Ebinger
0f4db7d193 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
2017-08-10 23:15:41 +00:00
Brad Ebinger
bc13df8ce8 Merge "Add method that checks the Binder status of ImsConfig"
am: 6ffc855e8d

Change-Id: Ifa04b6260d51c17dc323fab918db0bdbf2bdea64
2017-08-10 23:02:56 +00:00
Brad Ebinger
6ffc855e8d Merge "Add method that checks the Binder status of ImsConfig" 2017-08-10 22:50:45 +00:00
Amit Mahajan
9ec7f7985a Merge "Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a am: 1cdd44bd9d am: 793c4be8d4" into oc-mr1-dev-plus-aosp
am: d6fab9dae9

Change-Id: Idde114d46da5c18a9bdf13fb1580a4d3f95c0718
2017-08-10 18:17:45 +00:00