Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
370,218 Commits 3 Branches 0 Tags
73e68bfed13a057ca87e79973ec36f835e4bb621
Commit Graph

6266 Commits

Author SHA1 Message Date
Jordan Liu
82e9122c7a Merge "Update getIccAuthentication documentation" into pi-dev am: ae4518c736 
am: 1422ec907e

Change-Id: I08ba6926d9eddc4cc26562281f19d0be0cf3b82e
 2018-04-10 16:04:11 -07:00
Jordan Liu
1422ec907e Merge "Update getIccAuthentication documentation" into pi-dev 
am: ae4518c736

Change-Id: I4f06b912bf68a5dea611cb12ebcffd71a8fae7e8
 2018-04-10 15:37:08 -07:00
Jordan Liu
dd20bc3448 Update getIccAuthentication documentation 
Explain what it means if the function returns null. This is based on the
spec at TS 31.102 section 7.3.1.

Bug: 74392381
Test: manual
Change-Id: Ic84d94589431109079a866027953ab9dbef103b8
 2018-04-10 09:27:47 -07:00
Jeff Sharkey
f35b79c609 Merge "API council requested tweaks to SubscriptionPlan." into pi-dev am: 5e0d360411 
am: 4cd485f8e5

Change-Id: I5f3f1b04573a8a2286cf4d6456d7196fc5ed417d
 2018-04-09 18:09:12 -07:00
Jeff Sharkey
4cd485f8e5 Merge "API council requested tweaks to SubscriptionPlan." into pi-dev 
am: 5e0d360411

Change-Id: I447d4041d1dd0751147d13792b07d6617b27978a
 2018-04-09 17:09:34 -07:00
Brad Ebinger
10cbfa7114 Merge "Add GTS test APIs for testing ImsService" into pi-dev am: cb7b92697a 
am: 9d7893150f

Change-Id: I31dd3f361ef8df0ef470f057730ec81d57a843ca
 2018-04-09 16:48:10 -07:00
Jeff Sharkey
5e0d360411 Merge "API council requested tweaks to SubscriptionPlan." into pi-dev 2018-04-09 23:20:43 +00:00
Brad Ebinger
9d7893150f Merge "Add GTS test APIs for testing ImsService" into pi-dev 
am: cb7b92697a

Change-Id: Id60cf07121cf98ab3f0a10af10cf70beb25feb54
 2018-04-09 15:53:13 -07:00
Brad Ebinger
cb7b92697a Merge "Add GTS test APIs for testing ImsService" into pi-dev 2018-04-09 22:40:13 +00:00
Xiangyu/Malcolm Chen
9f4ddb067b Merge "Merge "Marking some hidden API as TestApi." into pi-dev am: 50c069f7c1" into pi-dev-plus-aosp 
am: fd8ca1dbc4

Change-Id: I93d516f7a63bf2c3d8d2925bf287c4cba74b74f9
 2018-04-06 12:16:51 -07:00
Jayachandran Chinnakkannu
cdf44e32e5 Merge "Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED" am: 0222c2cac1 am: d18d68b96f 
am: 41602c8c90

Change-Id: If567d7f8063f07e7c83dfaa5c74216237ae41a75
 2018-04-06 11:59:58 -07:00
Android Build Merger (Role)
fd8ca1dbc4 Merge "Merge "Marking some hidden API as TestApi." into pi-dev am: 50c069f7c1" into pi-dev-plus-aosp 2018-04-06 18:52:41 +00:00
Xiangyu/Malcolm Chen
1444be002d Merge "Marking some hidden API as TestApi." into pi-dev 
am: 50c069f7c1

Change-Id: I9fc4f78ed60d066eba840413b40b88c60b4c5d1a
 2018-04-06 11:51:35 -07:00
Jayachandran Chinnakkannu
41602c8c90 Merge "Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED" am: 0222c2cac1 
am: d18d68b96f

Change-Id: If20f74a2f0cd5618ae56bbb9488bacd551cabacd
 2018-04-06 11:42:27 -07:00
Xiangyu/Malcolm Chen
50c069f7c1 Merge "Marking some hidden API as TestApi." into pi-dev 2018-04-06 18:32:12 +00:00
Jayachandran C
7957147bbe Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED 
Test: Build
Bug: 77657541
Change-Id: Ia6b576c222776cbc7e54e15cb54e39775e76ea56
 2018-04-06 01:10:38 -07:00
Siddharth Ray
8b75215852 Merge "Persistence of LPP profile" into pi-dev am: a6c06bdf5a 
am: abad19e771

Change-Id: Ic7abf1d24d60863b52429b14b6303e1583edf9f4
 2018-04-05 21:13:28 -07:00
Siddharth Ray
abad19e771 Merge "Persistence of LPP profile" into pi-dev 
am: a6c06bdf5a

Change-Id: I6d8bbbb78924ad8f93e34721a56bfe83bdf16a04
 2018-04-05 21:02:28 -07:00
TreeHugger Robot
a6c06bdf5a Merge "Persistence of LPP profile" into pi-dev 2018-04-06 03:48:14 +00:00
Malcolm Chen
4d28aea671 Merge "Unhide constructors of DataService and NetworkService." into pi-dev am: 271ba383b6 
am: 5477297519

Change-Id: Ie05cc9d8b4f086a297eef2107d472d4859056403
 2018-04-05 18:14:03 -07:00
Malcolm Chen
5477297519 Merge "Unhide constructors of DataService and NetworkService." into pi-dev 
am: 271ba383b6

Change-Id: If6a55e8d996d3b4ef1595271577b005933c752db
 2018-04-05 18:08:38 -07:00
TreeHugger Robot
271ba383b6 Merge "Unhide constructors of DataService and NetworkService." into pi-dev 2018-04-06 00:52:32 +00:00
Malcolm Chen
83f59c61dd Unhide constructors of DataService and NetworkService. 
DataService and NetworkService are System level classes. We shouldn't
hide their constructors otherwise their System level sub-class
can't be instantiated properly.

Test: gts
Bug: 77531655
Change-Id: I1a58b4857dbcf939ac124e20eb0a801ad5a9b597
 2018-04-05 15:02:17 -07:00
Siddharth Ray
9943c7b149 Persistence of LPP profile 
LPP profile will persist by default when SIM is removed.
Persistence will be lost once a different carrier's SIM is inserted.

BUG:64897529
Change-Id: I970599bed27d9278fb2732db65a1ce393afe93fe
 2018-04-04 17:07:35 -07:00
Jeff Sharkey
0fc6d03b62 API council requested tweaks to SubscriptionPlan. 
Return new shiny Range<> object instead of Pair<>.  Tell developers
what permission to check on refresh broadcast.  Describe what
exceptions might be thrown, and that an empty list is okay.

Allow creation of plans with richer Period object, instead of forcing
them into rigid week or day options.

Protect SubscriptionPlan broadcast.

Test: atest android.util.RecurrenceRuleTest
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Bug: 74945820
Change-Id: I7e555798e0cfaa214ca93d9df627c6443fc5d986
 2018-04-04 16:06:27 -06:00
fionaxu
b877688ca2 throw runtimeException for applicable TM APIs 
1. This CL revert some API change from ag/3710629.
2. throw runtime exception when running in a non-1000 UID.
3. throw for methods that persist some sort of state and readers could continue to
return placeholder values.
4. for rest of TelephonyManager API cleanup b/74401420.

Bug: 74016743
Test: Build
Change-Id: I2846efc11eebce4a923762f56f09daaf37c44763
(cherry picked from commit f20f0d916f)
Merged-in: I2846efc11eebce4a923762f56f09daaf37c44763
 2018-04-04 01:38:55 +00:00
Pankaj Kanwar
d40c477b2e Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" into pi-dev 2018-04-04 01:21:17 +00:00
Malcolm Chen
a1d5e9fb97 Marking some hidden API as TestApi. 
Bug: 77488839
Test: cts
Change-Id: Id4adaa7d844ef2b0d54e54a450d326bbebc1e12d
 2018-04-03 17:44:41 -07:00
Brad Ebinger
cb18b163dc Add GTS test APIs for testing ImsService 
Bug: 77141737
Test: Manual
Change-Id: Ia41a96b5013bc6a7f534c347db72a14348c1fc5d
 2018-04-03 15:16:38 -07:00
Pankaj Kanwar
9a7abe6cd1 Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false" 
This reverts commit 84a8bb80a1.

Bug: 77306455
Test: manual

Change-Id: Ied14258726d71262642f8d72db5ee11ea671836b
 2018-04-03 16:48:00 +00:00
Pankaj Kanwar
644d5ea61c Merge "Address IMSI privacy issues." 2018-04-03 16:05:51 +00:00
Chen Xu
9693f9dfbb Merge "A test api to override carrier information" into pi-dev am: b71c76036c 
am: 1a1b0608ca

Change-Id: I65560ff163717b050c124fc0ff28a8958440f2b0
 2018-04-02 23:53:00 -07:00
Jeff Sharkey
3fe7d9b918 Merge changes from topic "am-8e33397accdd42de824f0124a3f51007" into pi-dev-plus-aosp 
am: ec5fab7006

Change-Id: I0c460b27edeb8d0db734d1c8092e7eb866e656cd
 2018-04-02 21:36:06 -07:00
Jeff Sharkey
820068524b Obtain NPMS through helper method. am: a435ab5124 
am: bfbae60fd4

Change-Id: I4278f93601da7f6ae580ae562b5ff8e86baf6abe
 2018-04-02 21:21:22 -07:00
Chen Xu
1a1b0608ca Merge "A test api to override carrier information" into pi-dev 
am: b71c76036c

Change-Id: I1d0be7c706e6dfffa3d83c96e7e48c2accd6269e
 2018-04-02 20:52:47 -07:00
Jeff Sharkey
0d07a2e777 Merge changes from topic "planz" into pi-dev 
am: 93e11759d6

Change-Id: I342eb26c7e50582c1ce34a7c8b70dadbb7881858
 2018-04-02 18:59:01 -07:00
Jeff Sharkey
bfbae60fd4 Obtain NPMS through helper method. 
am: a435ab5124

Change-Id: Ic5db497a0d5793de4bdba2474e2abf17ddf201fc
 2018-04-02 18:52:26 -07:00
Chen Xu
b71c76036c Merge "A test api to override carrier information" into pi-dev 2018-04-03 01:14:24 +00:00
pkanwar
26509cda7e Address IMSI privacy issues. 
Added method resetCarrierKeysForImsiEncryption
to allow for keys to be reset.

Bug: 35606429
Test: manual
Change-Id: Id2e92917b50fa2163b2bab112df6e80b5e9c5795
Merged-In: Id2e92917b50fa2163b2bab112df6e80b5e9c5795
 2018-04-03 00:26:27 +00:00
TreeHugger Robot
93e11759d6 Merge changes from topic "planz" into pi-dev 
* changes:
  Tests for SubscriptionManager APIs.
  Obtain NPMS through helper method.
 2018-04-02 21:56:59 +00:00
Xiangyu/Malcolm Chen
9bbfe5c14c Merge "Adding debug message inside NetworkServiceCallback." 2018-04-02 18:43:01 +00:00
Hall Liu
0682aeb483 Merge "Merge "Make changes to MBMS API following recs" am: feb60e0864 am: 2fa2a9d06f" into pi-dev-plus-aosp 
am: 46b959e9d8

Change-Id: Ie102667ddc20ade7a822844377fe2778533d2b3e
 2018-03-31 06:15:29 +00:00
Xiangyu/Malcolm Chen
ef35fda779 Merge "Adding debug message inside NetworkServiceCallback." into pi-dev am: 17d19b7d52 
am: 4c9370d606

Change-Id: I821ea39284942797671fc4effbd59e485cbb69fd
 2018-03-31 05:50:10 +00:00
TreeHugger Robot
7bedbabd0b Merge "Make changes to MBMS API following recs" into pi-dev 2018-03-31 04:17:41 +00:00
Brad Ebinger
976f907777 Merge "Unhide @SystemApi Constructor" into pi-dev am: 77fcc0da3b 
am: cf49f62de5

Change-Id: I704459fc125cfda6b40f6ec96cd40f70d09a6aab
 2018-03-31 03:21:05 +00:00
Hall Liu
6705ef997f Merge "Make changes to MBMS API following recs" am: feb60e0864 
am: 2fa2a9d06f

Change-Id: I3b1aef24454fa45ffbbf6bb003743e662eac0353
 2018-03-31 02:54:39 +00:00
Xiangyu/Malcolm Chen
4c9370d606 Merge "Adding debug message inside NetworkServiceCallback." into pi-dev 
am: 17d19b7d52

Change-Id: Icfec1153ed29ae096083d3260294b7b580e0285e
 2018-03-31 02:36:05 +00:00
Brad Ebinger
cf49f62de5 Merge "Unhide @SystemApi Constructor" into pi-dev 
am: 77fcc0da3b

Change-Id: Idbf2a71018f1bd06f8445b07fc52bc65cb6776f6
 2018-03-31 00:53:48 +00:00
Hall Liu
feb60e0864 Merge "Make changes to MBMS API following recs" 2018-03-31 00:28:06 +00:00
Malcolm Chen
4514425612 Adding debug message inside NetworkServiceCallback. 
Adding debug message inside NetworkServiceCallback when mCallback
is null.

Bug: 76392715
Test: existing test
Change-Id: Icd27d4082e1e4b60efe65abfff99c4165717fd4a
Merged-In: Icd27d4082e1e4b60efe65abfff99c4165717fd4a
 2018-03-31 00:06:14 +00:00