Commit Graph

4871 Commits

Author SHA1 Message Date
Shuo Qian
bf1a674ed7 Merge "Add new error code in SmsManager" into oc-mr1-dev am: 1dafcc89a5
am: a43b382766

Change-Id: Ic1a8824e1f1d2e3a7655484d23ff658d3d5fd40d
2017-08-24 22:02:47 +00:00
Shuo Qian
a43b382766 Merge "Add new error code in SmsManager" into oc-mr1-dev
am: 1dafcc89a5

Change-Id: I938ddabfe0d98ee1eee850ba9d6aeb857ebb748f
2017-08-24 21:44:54 +00:00
Shuo Qian
1dafcc89a5 Merge "Add new error code in SmsManager" into oc-mr1-dev 2017-08-24 21:22:31 +00:00
Tyler Gunn
394f28af6c Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev am: ac3c798ab5
am: 6cca8ade9e

Change-Id: I913b1e2986d91d523442679f3e724dafb309b128
2017-08-24 15:18:01 +00:00
Tyler Gunn
6cca8ade9e Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev
am: ac3c798ab5

Change-Id: I80a22e7fdb0272313c8d9f98b6360c6d235e37ac
2017-08-24 15:06:22 +00:00
Hall Liu
660d06aaa4 Merge "Embms adjustments for 7/28" am: 3f6a95e8b0 am: aeb64f7f98 am: 070508ea7a
am: e599803180

Change-Id: I88446f4080582fcfea1428c57166c1d8c9f822cd
2017-08-23 22:52:08 +00:00
Hall Liu
e599803180 Merge "Embms adjustments for 7/28" am: 3f6a95e8b0 am: aeb64f7f98
am: 070508ea7a

Change-Id: I51a886a6d30bc4a13fd25fd5d96819353257b5f5
2017-08-23 22:34:22 +00:00
Hall Liu
aeb64f7f98 Merge "Embms adjustments for 7/28"
am: 3f6a95e8b0

Change-Id: I925a0a894098071a3d092d953e4d545a58531a69
2017-08-23 22:10:09 +00:00
Hall Liu
8e47fe35c8 Embms adjustments for 7/28
* Move some vendor intents and extras into a VendorIntents class
* Add a download result RESULT_IO_ERROR
* Add documentation noting that repeated calls to
setTempFileRootDirectory will not throw an error if the parameter is the
same.
* Add getTempFileRootDirectory method for app
* Hide AIDL classes from the public/system API surfaces for download
* Remove size and md5hash from FileInfo

Change-Id: I8c968a7d68db2588ee550167ed2693fe89c5925a
2017-08-23 10:56:09 -07:00
Hall Liu
4c154ed2c9 Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786 am: 7754e25694 am: a7bb0ffc7d
am: c04df54cfc

Change-Id: Ie23fae4840c7d944d43a6040d3bb09aa3ccd5b76
2017-08-23 17:28:36 +00:00
Hall Liu
c04df54cfc Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786 am: 7754e25694
am: a7bb0ffc7d

Change-Id: Iab7c397dba3fb446e0c03cd1bab0e82de8172577
2017-08-23 17:16:04 +00:00
Hall Liu
a7bb0ffc7d Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786
am: 7754e25694

Change-Id: I2724aab757b94957dd9174e4b86c48952a59ebdc
2017-08-23 17:05:57 +00:00
Hall Liu
489dcb7cca Merge "Embms API adjustments for 7/21" 2017-08-23 16:37:50 +00:00
Hall Liu
d5c955fcdc Embms API adjustments for 7/21
* Enforce that only one instance of each manager can be active.
* Add a death receipient for both managers to notify the app of binder
death
* Add documentation informing the app that it may not call create()
multiple times
* Fix a collision in streaming state reason codes
* Add documentation in DownloadRequest to indicate which methods should
be called by the middleware.

Change-Id: Ie15283b5c34fee736e8023dbd4f889c2ca95299e
2017-08-22 17:07:48 -07:00
sqian
724f621daa Add new error code in SmsManager
Design doc: https://docs.google.com/a/google.com/document/d
/1YPTNoM2Atjz8oISGAsRYlFVSA1NcYP8MbqYQIzLcJ9E/edit?usp=sharing

Test: compile/flash code; test locally
Bug: 34773406
Change-Id: I0b227e76048dd46d9c8023d37647db763e1e38e1
2017-08-22 14:51:03 -07:00
Hall Liu
295291872b Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0 am: 0d73e03444 am: 23566e82dd
am: a0936c7b89

Change-Id: Ida377fd6b23e208728895a70fcffca489bc5086e
2017-08-22 19:20:08 +00:00
Hall Liu
a0936c7b89 Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0 am: 0d73e03444
am: 23566e82dd

Change-Id: I5308524da670b829ef8da474bfaee5d60caa6d86
2017-08-22 19:07:06 +00:00
Hall Liu
23566e82dd Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0
am: 0d73e03444

Change-Id: I5c5a8b6247ef844f86880cf4b162527d699e2fc9
2017-08-22 18:53:34 +00:00
Tyler Gunn
c6c78ec18f Add new telephony disconnect causes for low battery scenario.
LOW_BATTERY is for disconnect mid-call due to low battery.
DIAL_LOW_BATTERY is for failure while dialing due to low battery.

Test: Manual.
Change-Id: Ife7a4ca5645b3fb42ab20effb4d8d4a8fef8116b
Fixes: 63936576
2017-08-22 11:13:05 -07:00
Amit Mahajan
fd528886c4 Make dun APNs as read-only by default.
Test: Verified tethering manually for T-Mo and AT&T
Bug: 38186417
Change-Id: Iae2beede0e20810cba4d96f897756896adf77b30
2017-08-22 11:08:31 -07:00
Hall Liu
fa7e99ddf1 Merge "Fix lint errors in the streaming API" 2017-08-22 17:55:06 +00:00
Lorenzo Colitti
b9fc12d1d2 Merge changes I325b13d5,I89719fe7 am: 23868e9c09 am: 9335d2d0b1
am: 4fa0187015

Change-Id: Ib980879b0e50ffe1c8209339df22da4a50d5b74e
2017-08-19 03:38:10 +00:00
Lorenzo Colitti
9335d2d0b1 Merge changes I325b13d5,I89719fe7
am: 23868e9c09

Change-Id: Iaced543ab17ea87c8f701975764d957bc1b17fc7
2017-08-19 03:15:08 +00:00
Treehugger Robot
23868e9c09 Merge changes I325b13d5,I89719fe7
* changes:
  Add tether offload traffic to interface stats as well.
  Tell the system when tethering offload hits a limit.
2017-08-19 03:05:14 +00:00
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
f1912ca49a 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.

(cherry picked from commit 5356a35c3b)

Bug: 29337859
Bug: 32163131
Test: runtest frameworks-net
Test: runtest frameworks-telephony
Change-Id: I325b13d50e88841dfb0db4c35e7e27f163ee72fe
Merged-In: I4e8e923d68dce1a4a68608dbd6c75a91165aa4ee
2017-08-19 10:12:05 +09: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
Hall Liu
ee19cfc386 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: If4a9a5533a235a8cc56762ab7a9e32ec89440f1d
2017-08-18 14:36:06 -07: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
Jack Yu
0cc9d26dff resolve merge conflicts of d5cb58c693 to stage-aosp-master am: f7149eb698
am: d47339389e

Change-Id: I348cf0e33ad101a84d33c6938ddc580f9fe06a27
2017-08-18 07:23:50 +00:00
Jack Yu
f7149eb698 resolve merge conflicts of d5cb58c693 to stage-aosp-master
Test: I solemnly swear I did not test this conflict resolution.

Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: I9494087c5a90bccc4326c173bf6395996da357af
2017-08-17 23:20:59 -07:00
Treehugger Robot
d5cb58c693 Merge "Reduced the retry after disconnect delay" 2017-08-18 05:52:16 +00:00
Jack Yu
950d217406 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
Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: Ifc35306711dde39eb521dc015da931f4d5f2bf06
(cherry picked from commit 5523dc55d8)
2017-08-17 21:30:30 -07: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