Commit Graph

4675 Commits

Author SHA1 Message Date
Hall Liu
3c1d4d6ef4 Merge "Implement cancelDownload and remove appName" am: 9b43ffcf2f am: 4b1acf4421 am: 4c751c865a
am: 949b625c57

Change-Id: Iafa6c3b23ba2957e8a303f6190b32e801f6c047f
2017-06-29 22:06:23 +00:00
Hall Liu
949b625c57 Merge "Implement cancelDownload and remove appName" am: 9b43ffcf2f am: 4b1acf4421
am: 4c751c865a

Change-Id: I05814ffe8fb4ca2f334d6c0ecd772295bc2c7c63
2017-06-29 21:58:22 +00:00
Hall Liu
4b1acf4421 Merge "Implement cancelDownload and remove appName"
am: 9b43ffcf2f

Change-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735
2017-06-29 21:45:47 +00:00
Hall Liu
9b43ffcf2f Merge "Implement cancelDownload and remove appName" 2017-06-29 21:33:11 +00:00
yinxu
5311da134a Merge "Use Bundle for inter-process message"
am: db8e4efd5b

Change-Id: Ib93e91969063a5d2276c99b8b0fee4dd1a398771
2017-06-29 02:05:53 +00:00
Treehugger Robot
db8e4efd5b Merge "Use Bundle for inter-process message" 2017-06-29 01:51:04 +00:00
Hall Liu
9f116ef480 Implement cancelDownload and remove appName
Implements the cancelDownload call
Removes appName as an argument from all EMBMS-related apis
Implements the cross-filesystem move method in MbmsDownloadReceiver

Change-Id: Ie8ebfccca4fbb3d69289beb2ed77101fe2c7727f
2017-06-28 15:00:56 -07:00
Hall Liu
9011975ce1 Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am: c2f33f18eb am: 761bad1c53 am: 8f42a3a281
am: 5f48b1bc02

Change-Id: I12300a1e96b97cfa47e7ff82e2ac50e7e9932eab
2017-06-28 20:59:45 +00:00
Hall Liu
fa177aca74 Add download request tokens and enforce destination clear am: 2043f70acb am: 8763c625a3 am: fc156f357a
am: b70e48b33b

Change-Id: I8e9dbb203bb91c5ef32c38e0cb7de6f854e05ce8
2017-06-28 20:58:37 +00:00
Hall Liu
5f48b1bc02 Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am: c2f33f18eb am: 761bad1c53
am: 8f42a3a281

Change-Id: Ib6c8e17b0d6664ded17ce8eb4314124eb676713c
2017-06-28 20:53:00 +00:00
Hall Liu
b70e48b33b Add download request tokens and enforce destination clear am: 2043f70acb am: 8763c625a3
am: fc156f357a

Change-Id: I929fd3306a7bb8bbc2eeb31eb1732c99ec0fb743
2017-06-28 20:51:57 +00:00
Hall Liu
761bad1c53 Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
am: c2f33f18eb

Change-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81
2017-06-28 20:36:49 +00:00
Hall Liu
8763c625a3 Add download request tokens and enforce destination clear
am: 2043f70acb

Change-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f
2017-06-28 20:35:54 +00:00
Hall Liu
c2f33f18eb Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
* changes:
  Implement the cleanup action in MbmsDownloadReceiver
  Add download request tokens and enforce destination clear
2017-06-28 20:26:15 +00:00
yinxu
77e6f9909a Use Bundle for inter-process message
The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.

Cherry-picked cleanly from:
https://googleplex-android-review.googlesource.com/#/c/2467157/

Test: Telephony sanity tests
Bug: 30954762

Merged-in: I77945b247530b85c0b82876d528549498a711550
Changg-Id: I77945b247530b85c0b82876d528549498a711550
(cherry picked from commit 5604943709)

Change-Id: Iec4043e611a8f58733a361ec9a52fc74e1c974d5
2017-06-28 10:58:31 -07:00
Jeff Davidson
ad60b37575 Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev am: f28843dd3f
am: 53ad2499f1

Change-Id: I538f0405811b0df28960acdb6f275689f19185dc
2017-06-28 17:41:26 +00:00
Jeff Davidson
53ad2499f1 Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
am: f28843dd3f

Change-Id: Ibd7c9c673c9272696cd955ddc50d4b55755d5429
2017-06-28 17:33:01 +00:00
Jeff Davidson
f28843dd3f Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev 2017-06-28 17:23:49 +00:00
Ying Xu
ed38bfdc8f Merge "Use Bundle for inter-process message" into oc-dr1-dev am: e5ad3821e3
am: c567b16604

Change-Id: Icc35859aec67db25113cc7cb86fc3af75886c65b
2017-06-28 16:59:26 +00:00
Ying Xu
c567b16604 Merge "Use Bundle for inter-process message" into oc-dr1-dev
am: e5ad3821e3

Change-Id: Ia847e54c387fc145b36313048860aa6b281d4c56
2017-06-28 16:54:19 +00:00
Ying Xu
e5ad3821e3 Merge "Use Bundle for inter-process message" into oc-dr1-dev 2017-06-28 16:47:50 +00:00
Hall Liu
990a573da9 Implement the cleanup action in MbmsDownloadReceiver
Implement ACTION_CLEANUP, add result codes for the ordered broadcasts,
and remove the download request extra for file descriptor requests

Change-Id: I5ee19ad0aefbdceacb636b3d17e197a6fb1bdaa6
2017-06-27 19:15:55 -07:00
pkanwar
db07b66d3a Radio Interface changes to pass the encryption object, including the
key,to the modem.

We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG: 35606429
Test: manual
(cherry picked from commit 6d50fec388)
Merged-In: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
2017-06-28 00:31:58 +00:00
yinxu
5604943709 Use Bundle for inter-process message
The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I77945b247530b85c0b82876d528549498a711550
2017-06-27 14:52:45 -07:00
Jeff Sharkey
55b390b399 Merge "Only require that system UIDs tag their sockets." 2017-06-27 19:11:03 +00:00
Brad Ebinger
69754b07ba Merge "Merge "IMS: Check for binderstate before calling endSession" am: c49534cf09 am: 1de1c2bb66 am: 8f2950b2c4" into oc-dr1-dev-plus-aosp
am: d0b5ca2e26

Change-Id: Ie3b0ba66d5e954a2d2c23c70a0d35ea1b7660670
2017-06-27 19:03:11 +00:00
Jeff Sharkey
5ab0243330 Only require that system UIDs tag their sockets.
Apps with a normal UID are typically isolated enough to not require
socket tagging; we're mostly interested in tracking down internal
UIDs that have lots of code sharing the same UID.

Also fix up everyone doing manual string checks of Build.TYPE, since
we now have first-class fields for those.

Bug: 38126076
Test: builds, boots
Change-Id: I3a40348196bd8459289f2b9355d9783a07f1e7dd
2017-06-27 11:11:06 -06:00
Brad Ebinger
913e11fcdf Merge "IMS: Check for binderstate before calling endSession" am: c49534cf09 am: 1de1c2bb66
am: 8f2950b2c4

Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
2017-06-27 17:08:55 +00:00
Brad Ebinger
1de1c2bb66 Merge "IMS: Check for binderstate before calling endSession"
am: c49534cf09

Change-Id: I9d173693c466b7d8512d11f266af48f5307669d5
2017-06-27 16:57:11 +00:00
Brad Ebinger
c49534cf09 Merge "IMS: Check for binderstate before calling endSession" 2017-06-27 16:46:59 +00:00
Jeff Davidson
7b69a86b02 Add EuiccManager#retainSubscriptionsOnFactoryReset API.
By default, all subscriptions are wiped on first boot after a factory
reset. This ensures that if data is wiped outside of userspace (e.g.
in fastboot/recovery), the profiles are wiped, as there's no way to
offer this option to users in those modes - the radio isn't available
for us to access the eUICC.

This API provides a way to bypass this wipe if the user opts to retain
the policies for a wipe done from userspace (e.g. by unchecking the
"Wipe eUICC" checkbox in platform settings before wiping). We tell the
LPA to note this and skip the wipe on the ensuing factory reset.

Change-Id: I2fe472417497e28b043841a5aa2dc9efa45ebbff
Test: TreeHugger
Fixes: 62681577
2017-06-27 09:23:07 -07:00
Jeff Davidson
5526fa1ce7 Merge "Pass calling package to resolution UI." into oc-dr1-dev am: 776220d029
am: f60773b22d

Change-Id: I4d21f823af658701f7ffda1671d22eeee761cb57
2017-06-27 01:00:05 +00:00
Jeff Davidson
f60773b22d Merge "Pass calling package to resolution UI." into oc-dr1-dev
am: 776220d029

Change-Id: I9896d70fea9d69025c1a77d634333d160a71acb6
2017-06-27 00:53:58 +00:00
TreeHugger Robot
776220d029 Merge "Pass calling package to resolution UI." into oc-dr1-dev 2017-06-27 00:48:39 +00:00
Benergy Meenan Ravuri
bed4d19db5 IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.

Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.

Notify Ims state change only for the supported feature state
change to clients.

Test: Manual
Bug: 62816014
Change-Id: I1bb588ce2be9c181355ff744f43dad4e784e4ec5
2017-06-26 23:29:22 +00:00
Ying Xu
231e291b06 Merge "Fix the inconsistency of scan status." into oc-dr1-dev 2017-06-26 23:10:00 +00:00
Jeff Sharkey
a2790a13fd Fix the red build.
Change-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951
(cherry picked from commit 29d670cea1)
Merged-In: If035d6939f5a465b4b579b590f8f2b5b532e0951
2017-06-26 18:03:02 +00:00
Ying Xu
487893dada Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195 am: e30cfbea60
am: 57ad8be7ec

Change-Id: I2ee40a6c22a1bfe58ca107790719c5695aa7c774
2017-06-26 17:45:41 +00:00
Ying Xu
57ad8be7ec Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195
am: e30cfbea60

Change-Id: Iaff6653418289136e24b4a1c16ee4e607d30dca0
2017-06-26 17:36:15 +00:00
Ying Xu
e30cfbea60 Merge "Fix the inconsistency of scan status." am: 41be35a1bd
am: ac2d00a195

Change-Id: Ibcdbe63349031ea95d137dd18465bec5de6efd7a
2017-06-26 17:27:21 +00:00
Ying Xu
ac2d00a195 Merge "Fix the inconsistency of scan status."
am: 41be35a1bd

Change-Id: Ic92aa1aa9ecd91cd072257c93e12cdf030cdeba8
2017-06-26 17:18:42 +00:00
Ying Xu
41be35a1bd Merge "Fix the inconsistency of scan status." 2017-06-26 17:05:59 +00:00
Jeff Sharkey
29d670cea1 Fix the red build.
Change-Id: If035d6939f5a465b4b579b590f8f2b5b532e0951
2017-06-26 11:02:41 -06:00
Pankaj Kanwar
a1b99b1b29 Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9 am: e26191a81c am: 01741762d8
am: 70c1f55927

Change-Id: Ib913d1897154aec9693ced4f8a95fd8fe57bc424
2017-06-26 16:10:40 +00:00
Pankaj Kanwar
70c1f55927 Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9 am: e26191a81c
am: 01741762d8

Change-Id: I385f7ce854a52533251d3777e227aeaf695bb7db
2017-06-26 16:03:06 +00:00
Pankaj Kanwar
01741762d8 Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9
am: e26191a81c

Change-Id: I777010e6fea82f237ddf224525739a5687f13a2c
2017-06-26 15:55:46 +00:00
Pankaj Kanwar
e26191a81c Merge "Carrier Config changes to support IMSI encryption."
am: 1caaa514c9

Change-Id: Ia9c4d93e8ababf87a0d6027a4322e73111651844
2017-06-26 15:48:03 +00:00
pkanwar
766f4615e9 Carrier Config changes to support IMSI encryption.
Adding 2 config parameters to CarrierConfigManager:
1. imsi_key_download_url.
2. imsi_key_expiration_days_time.

BUG: 35606429
Test: manual

Change-Id: I191dd0db5fa84a57faea88cb59c2c0b2604064b2
2017-06-25 19:46:52 -07:00
Jack Yu
429499f813 Merge "Refactored area update info support" into oc-dr1-dev
am: 5af2d63721

Change-Id: I1ab48412baffcbc6ad2b98ea0966cff20c9762aa
2017-06-24 04:47:36 +00:00
Hall Liu
2043f70acb Add download request tokens and enforce destination clear
Start writing tokens for each download request after calling download(),
and check agains them when a completed-file intent is received with a
download request extra.
Also start checking that the download destination is clear.

Change-Id: I533fe2ba49ac56bed5eab44670fe8e9a273b1ffb
2017-06-23 16:45:19 -07:00