Commit Graph

3856 Commits

Author SHA1 Message Date
Pengquan Meng
8f843170a4 Merge "Add geo targeting implementation" am: df2293f68b am: 52cd1fe0f1
am: 13e58d2ed5

Change-Id: I547a85ec8723e1c6b96b51dd09c357d967b20bcc
2019-08-23 03:22:35 -07:00
Pengquan Meng
13e58d2ed5 Merge "Add geo targeting implementation" am: df2293f68b
am: 52cd1fe0f1

Change-Id: I85db283d7a47a8fcaf07256aec783c0f91540e40
2019-08-23 03:02:24 -07:00
Pengquan Meng
52cd1fe0f1 Merge "Add geo targeting implementation"
am: df2293f68b

Change-Id: Iaa8d3d72bff57cbbd36b9f5ed63807fef2a0b119
2019-08-23 02:32:14 -07:00
Pengquan Meng
e7bc13f806 Add geo targeting implementation
This CL adds support for geo targeting, including determining whether a
point is inside a simple polygon and circle.

For the judgment of the point in the polygon, the algorithm implemented
here simply considers the spherical polygon as a 2d plane polygon, which
may be not precisely. However, according to the test of real geographical
coordinates data i.e state/city/stree boundary data, this error is less than
10 meters that within 160 meters requires by the spec.

Bug: 123096618
Test: atest GeoUtils
Change-Id: I51e1fad3b48c1a58fa0510f97d9f5f9335779c30
(cherry picked from commit 7fbc74b66b58dd57deedb7336c5c1e2f0f9e2064)
2019-08-21 20:47:13 +00:00
TreeHugger Robot
c64852517a Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master 2019-08-15 23:02:12 +00:00
satayev
9a5fea62c9 Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8 am: 4a607da02b
am: 6cb0b46b2a

Change-Id: I9ea46ce95161b5560cde7352d8a2464eb45f099d
2019-08-15 14:01:06 -07:00
satayev
6cb0b46b2a Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8
am: 4a607da02b

Change-Id: I1516a6375c546f4af54984a4bff2ab2dcbc1783c
2019-08-15 13:39:04 -07:00
satayev
4a607da02b Merge "Move telephony/cdma/ classes into appropriate package."
am: 46c04b7bb8

Change-Id: I1fb05b0e09c492fa95af92e6b146364492177f61
2019-08-15 13:18:41 -07:00
Xin Li
80860803a4 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
Bug: 134405016
Change-Id: I303c0268e8e454b0f0f460eb286812a50c9add88
2019-08-14 12:04:06 -07:00
Artur Satayev
f772c13f9d Move telephony/cdma/ classes into appropriate package.
Not changing the java packages, but rather moving the source location. This allows running metalava on them.

Test: m
Change-Id: I3b46644361239d85818dd885f461dfc94de49dca
2019-08-14 10:48:10 +01:00
Andrew Sapperstein
c8230fa7b5 Merge "Add a blacklist for preinstalled carrier apps." into qt-dev am: aa3689c4d9
am: 386126a450

Change-Id: Ifef573480a9b53feecb11daac978ab340ca59fa3
2019-08-08 14:40:06 -07:00
Andrew Sapperstein
386126a450 Merge "Add a blacklist for preinstalled carrier apps." into qt-dev
am: aa3689c4d9

Change-Id: I4a9898f5a205b7ff13ef8631870cbe3f8451923b
2019-08-08 14:30:33 -07:00
Andrew Sapperstein
60cc649995 Merge "Add a blacklist for preinstalled carrier apps." into qt-dev
am: aa3689c4d9

Change-Id: I00e9ee3cccfbe56d02e1d23edc35c87ad73ec85d
2019-08-08 14:30:31 -07:00
Andrew Sapperstein
e016781807 Add a blacklist for preinstalled carrier apps.
Allows an OEM to specify that a preinstalled carrier app, even if
TelephonyManager says it should have carrier privileges, does not
get granted the default permissions and does not get enabled when
a compatible SIM is inserted.

Bug: 138150105
Test: verified locally
Change-Id: I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac
Merged-In: I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac
2019-08-08 15:05:06 +00:00
Hunter Knepshield
c3b90ecd40 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev
am: 4c452a6534

Change-Id: Ic5baff7a7530d473e6f78899442f6834df33cb3b
2019-07-12 11:33:37 -07:00
Jordan Liu
7dad5ea750 Merge "Use TM SubId in getDataState and getDataActivity" into qt-r1-dev 2019-07-12 18:29:05 +00:00
TreeHugger Robot
4c452a6534 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev 2019-07-12 18:00:48 +00:00
Xiangyu/Malcolm Chen
dbb897ee22 Merge changes from topic "135105735" into qt-r1-dev
am: 896cdfa547

Change-Id: Ie661fdc8a29645fa1b319cf1db8a896a8d21deae
2019-07-12 10:43:52 -07:00
Jordan Liu
44f9007474 Merge "Use TM SubId in getDataState and getDataActivity" am: 3968a18c27 am: 6ef6ff9ca1
am: 853c565de9

Change-Id: I450f32dbe6ce710afaf81950bcf5b683d2b479a6
2019-07-11 18:50:25 -07:00
Jordan Liu
853c565de9 Merge "Use TM SubId in getDataState and getDataActivity" am: 3968a18c27
am: 6ef6ff9ca1

Change-Id: I547a76c5da5f1ce58ed77853591ec1d4ba8f9318
2019-07-11 18:39:58 -07:00
Jordan Liu
6ef6ff9ca1 Merge "Use TM SubId in getDataState and getDataActivity"
am: 3968a18c27

Change-Id: I69e39b4867b78182217357d14ef96c966e3b7dd3
2019-07-11 18:30:26 -07:00
Malcolm Chen
ac56a4254e Provide @hide API to return merged IMSIs from grouping.
Bug: 135105735
Test: test app. Apply grouping and call the new API, to make sure
it returns correct values.

Change-Id: I99586976d3421d4b35be465201ee33cbb2dfd1d9
2019-07-11 13:19:36 -07:00
Nathan Harold
9d2660041a Use TM SubId in getDataState and getDataActivity
-Update getDataState() API to use the SubId specified
 by the TelephonyManager instance.

-Update the getDataActivity() API to use the SubId
 specified by the TelephonyManager instance.

(This CL is an un-revert of aosp/984377)

Bug: 135205433
Test: manual (automated test is infeasible)
Change-Id: I035f2c44a7955e88608b1c336acb72fb68c3e450
Merged-In: I035f2c44a7955e88608b1c336acb72fb68c3e450
2019-07-11 12:39:31 -07:00
Nathan Harold
af984d0d4e Use TM SubId in getDataState and getDataActivity
-Update getDataState() API to use the SubId specified
 by the TelephonyManager instance.

-Update the getDataActivity() API to use the SubId
 specified by the TelephonyManager instance.

(This CL is an un-revert of aosp/984377)

Bug: 135205433
Test: manual (automated test is infeasible)
Change-Id: I035f2c44a7955e88608b1c336acb72fb68c3e450
2019-07-11 11:52:55 -07:00
Hunter Knepshield
b26cbbd53d Check Carrier Privilege on Hidden Subs
When calling CheckCarrierPrivilegeForAnySubId the
hidden subscriptions were not being taken into account
due to getAllActiveSubscriptionIds being a public method
that intentionally ignores hidden subscriptions.

NOTE: This is identical to ag/8193293, except that the
SubscriptionManager modifications don't make
getActiveSubscriptionIdList() static (it was causing test failures). A
further bug can be pursued to make everything static all at once.

Bug: 135684437
Test: manual
Change-Id: Iad6a3c2635e5eac2d33a16aa460b98394fd817f4
2019-07-10 13:14:44 -07:00
Eugene Susla
6e7bb1e7cf Merge "Fix sms app changed broadcast" into qt-dev am: 0a98e4b693
am: e5c5ec7316

Change-Id: Id0142e70768afdc4ae02f8c2f97137e984b563a7
2019-07-03 16:52:44 -07:00
Eugene Susla
e5c5ec7316 Merge "Fix sms app changed broadcast" into qt-dev
am: 0a98e4b693

Change-Id: I6223c8373f8e00446f5c7c51496bbacff6483be5
2019-07-03 16:32:02 -07:00
Eugene Susla
cbdc139229 Merge "Fix sms app changed broadcast" into qt-dev
am: 0a98e4b693

Change-Id: Ic2ab525c22b17afc97b5220a8c5b4ddd18db225b
2019-07-03 16:32:01 -07:00
Eugene Susla
0fa8049fe8 Fix sms app changed broadcast
Fixes: 136257475
Test: switch sms holder in settings, and ensure ceceived broadcasts for both
becoming and leaving the sms app status
Change-Id: I10dda3fd8ebd38ab12bdb8192ed4f3863f4238b8
2019-07-02 11:06:26 -07:00
Jordan Liu
d521d87d45 Merge "Revert "Check Carrier Privilege on Hidden Subs"" into qt-r1-dev
am: 85a55afa3e

Change-Id: Iefbc1fe1cb0967703a897068f433517108f087a0
2019-07-01 20:30:50 -07:00
TreeHugger Robot
85a55afa3e Merge "Revert "Check Carrier Privilege on Hidden Subs"" into qt-r1-dev 2019-07-02 02:11:37 +00:00
Nazanin Bakhshi
1ca89a995b Merge "Add device identifier permission checks to TelephonyPermissions" 2019-07-01 23:26:18 +00:00
Jordan Liu
3c41bb707b Revert "Check Carrier Privilege on Hidden Subs"
This reverts commit 6fc804b3f9.

Reason for revert: causes test failures b/136421546

Change-Id: I3b1dcd78aea6beeadb82626145e868954286bbee
2019-07-01 23:03:50 +00:00
Michael Groover
94672cea7c Add device identifier permission checks to TelephonyPermissions
Bug: 131916175
Fixes: 136305129
Test: atest PhoneSubInfoControllerTest
Change-Id: Icca98347ab76b7c3468b95756a33a758a3abde37
Merged-In: I3c82c53ec89cd17b34a61166ccc9e9747388efac
2019-07-01 17:53:11 +00:00
Nathan Harold
00cf005bd1 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev
am: 09ef9e13a7

Change-Id: Ibb3792dfc28f93dfe96ea67367963b115dbff155
2019-06-28 23:22:35 -07:00
Nathan Harold
09ef9e13a7 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev 2019-06-29 06:07:52 +00:00
Nathan Harold
3b0cf87a5b Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea am: f5ee9c61be
am: 22d0ed63cc

Change-Id: Ibb0e9d7f55c8f1ba6179e7afbd63e33c23628822
2019-06-27 16:06:15 -07:00
Nathan Harold
6fc804b3f9 Check Carrier Privilege on Hidden Subs
When calling CheckCarrierPrivilegeForAnySubId the
hidden subscriptions were not being taken into account
due to getAllActiveSubscriptionIds being a public method
that intentionally ignores hidden subscriptions.

Bug: 135684437
Test: manual
Change-Id: I7688e4fe25fd2c6ed22dc8edc508345c1a3d447c
2019-06-27 16:02:35 -07:00
Nathan Harold
22d0ed63cc Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea
am: f5ee9c61be

Change-Id: I3a1ffa493f8b11cdd7c8bfff4fa4f8d78d54a169
2019-06-27 15:46:06 -07:00
Nathan Harold
4d4e2474ea Merge "Revert "Use TM SubId in getDataState and getDataActivity"" 2019-06-27 22:11:18 +00:00
Andy Chou
4143d9693b Merge "Notify physical channel configuration with phoneId and subId" into qt-r1-dev
am: a96ab85260

Change-Id: Ibb272d712a4a5a691bd0a0b20d6426229a5f355c
2019-06-25 18:51:29 -07:00
Andy Chou
a96ab85260 Merge "Notify physical channel configuration with phoneId and subId" into qt-r1-dev 2019-06-26 01:24:46 +00:00
Nathan Harold
44173ee7b0 Revert "Use TM SubId in getDataState and getDataActivity"
This reverts commit b2ab846cf4.

Reason for revert: Decision has been made to keep the unsupported AIDL API.

Change-Id: I31219606974019ac46da789ec31ca9cb3a86eb13
2019-06-26 00:41:00 +00:00
andychou
ce65922c73 Notify physical channel configuration with phoneId and subId
Physical channel configuration may be retrieved before SIM loaded. So
configuration will not be able to report via TelephonyRegistry.
Therefore, use phoneId to mapping record and notify

Bug: 123904518
Test: Manual test and make sure physical channel configuration is
displayed in RadioInfo

Change-Id: I11c89b9cf68c3f3d7523ad8dfc21520f44fa7ce3
2019-06-25 17:57:29 +00:00
Chen Xu
b6399511f8 Merge "move short code definitions to SmsManager Test API" 2019-06-25 17:18:46 +00:00
Neil Fuller
f28ebce301 Merge "Migrate telephony code away from Time" am: b8bdc72174
am: ae2f34462a

Change-Id: I83631d058eab50374e9f4a7a8d4fc9d1453f285d
2019-06-25 02:17:11 -07:00
Neil Fuller
b8bdc72174 Merge "Migrate telephony code away from Time" 2019-06-25 08:48:17 +00:00
Steven Moreland
31bfec7f19 Merge "Remove obsolete reference to ServiceManagerNative." am: f961b9632f
am: 045d5884fe

Change-Id: I434212fe15be9b6ed1abde556718c08eb552709a
2019-06-24 14:44:53 -07:00
chen xu
0276e13b96 move short code definitions to SmsManager Test API
Bug: 127560420
Test: cts
Change-Id: I6a5ba2439713105b25913ba8eb081abfaafd1a2e
(cherry picked from commit 9c7fad9235)
Merged-in: I6a5ba2439713105b25913ba8eb081abfaafd1a2e
2019-06-24 21:12:48 +00:00
Steven Moreland
f961b9632f Merge "Remove obsolete reference to ServiceManagerNative." 2019-06-24 18:02:34 +00:00