Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
391,160 Commits 3 Branches 0 Tags
60a4504796e3b052d702cc38b982b49503d8ca8c
Commit Graph

4528 Commits

Author SHA1 Message Date
Youming Ye
409b7fd693 Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting" am: e3a989f7d3 am: 22b595e5bd 
am: d07819d5cc

Change-Id: Ie07d14e12ef078f2dd87af697229b6c052a3d712
 2018-10-30 19:02:26 -07:00
Xiangyu/Malcolm Chen
101f907ddb Merge "Clear calling identity in callback." 2018-10-31 01:38:15 +00:00
Youming Ye
d07819d5cc Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting" am: e3a989f7d3 
am: 22b595e5bd

Change-Id: If14fb8996f5cb829fdc0f41ecc7868656195265f
 2018-10-30 18:37:59 -07:00
Youming Ye
e3a989f7d3 Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting" 2018-10-31 00:44:04 +00:00
Michael Groover
6331237ae7 Merge "Revert "Allow apps with carrier privileges to access device IDs"" 2018-10-30 23:52:59 +00:00
Michael Groover
e13f850925 Revert "Allow apps with carrier privileges to access device IDs" 
This reverts commit ec5f77a0d7.

Reason for revert: Change broke the build

Change-Id: Id1a6d35b91e4f547a809d2d222e3f33d51bab990
 2018-10-30 23:49:56 +00:00
Michael Groover
f0ca3fec19 Merge "Allow apps with carrier privileges to access device IDs" 2018-10-30 23:06:38 +00:00
Nathan Harold
bc2a1620d7 Merge "Define CellInfo.UNAVAILABLE for Unreported Fields" am: 40745e1def am: ae7dd94d7f 
am: 9e6faba5ed

Change-Id: I161cf73348b08c99350295762da7a9ff03de55d2
 2018-10-30 12:05:23 -07:00
Nathan Harold
9e6faba5ed Merge "Define CellInfo.UNAVAILABLE for Unreported Fields" am: 40745e1def 
am: ae7dd94d7f

Change-Id: I7491584dfba8ccfa8f9835623f766a87268ae1d3
 2018-10-30 11:37:43 -07:00
Treehugger Robot
40745e1def Merge "Define CellInfo.UNAVAILABLE for Unreported Fields" 2018-10-30 17:53:24 +00:00
Chen Xu
40e6f7ed00 Merge "Revert "Revert "Telephony light grey list clean up for Q""" am: d4e2c6cd5a 
am: 39cc174191

Change-Id: I6c8bdd4d4df115abe6fd1914d21019da8930c8be
 2018-10-29 11:55:14 -07:00
Chen Xu
469b9d6a84 Merge "new system API getRadioAccessFamily" 2018-10-29 18:07:35 +00:00
Chen Xu
d135468a98 Merge "Add CarrierId column in TelephonyProvider" 2018-10-29 18:04:04 +00:00
Chen Xu
d4e2c6cd5a Merge "Revert "Revert "Telephony light grey list clean up for Q""" 2018-10-29 17:20:48 +00:00
calvinpan
beb6cb3b03 Add CarrierId column in TelephonyProvider 
Add a column in provider to migrate mno and mvno to carrierid.

Bug: 115709816
Test: runtest --path tests/src/com/android/providers/telephony/TelephonyProviderTest.java
Change-Id: I9c0c0fd069acc7f182d94f422ff15f45ebf187a9
 2018-10-29 19:50:14 +08:00
Chen Xu
4c0b06d1d1 Revert "Revert "Telephony light grey list clean up for Q"" 
This reverts commit bab59cb9db.

Reason for revert: Put maxTargetSdk=P now will move APIs onto light greylist
because per-SDK versioned dark greylist is not yet supported by ART. We can
keep doing annotation work without breaking existing apps targeting on P.

Bug:117934933
Bug:112477300

Change-Id: I5e0e693dde49fac3044cd73fd6360c4485f312ec
Merged-in: I5e0e693dde49fac3044cd73fd6360c4485f312ec
 2018-10-26 23:31:40 +00:00
Chen Xu
63578a0742 Merge "Revert "Revert "Telephony light grey list clean up for Q""" 2018-10-26 23:29:37 +00:00
Xiangyu/Malcolm Chen
0036d879dc Merge "Revert "Revert "Clean up SubMgr#getOpportunisticSubscriptions.""" 2018-10-26 22:06:37 +00:00
Xiangyu/Malcolm Chen
0c096a01f7 Revert "Revert "Clean up SubMgr#getOpportunisticSubscriptions."" 
This reverts commit 8225032624.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Id620937aec1e19d541c6d1529e97d91292565c6e
 2018-10-26 22:02:21 +00:00
Yuchao Zhou
928579ecb0 Merge "Revert "Clean up SubMgr#getOpportunisticSubscriptions."" 2018-10-26 21:58:32 +00:00
Yuchao Zhou
8225032624 Revert "Clean up SubMgr#getOpportunisticSubscriptions." 
This reverts commit 9569bc70f9.

Reason for revert: The cl is breaking git_master.
https://android-build.googleplex.com/builds/submitted/5095196/errorprone/latest/view/logs/build_error.log

Change-Id: I534af936b718b2f132473b5b42ea2faabc9382cd
 2018-10-26 21:57:29 +00:00
chen xu
c6d25be1bf new system API getRadioAccessFamily 
1. new API in telephonyManager to getRadioAccessFamily
2. define bitmask for radioAccessFamily based on NetworkType because
we don't want to expose two sets of definition RIL_RADIO and Network
type together in public API surface
3. convert definition to NetworkType

Bug: 118351153
Test: telehony unit test
Change-Id: I4a71c61929d9df8ec13c157e0452c6f30d8e4b9c
 2018-10-26 14:17:22 -07:00
Xiangyu/Malcolm Chen
60db69cd39 Merge "Clean up SubMgr#getOpportunisticSubscriptions." 2018-10-26 21:00:39 +00:00
Chen Xu
91f600902b Revert "Revert "Telephony light grey list clean up for Q"" 
This reverts commit bab59cb9db.

Reason for revert: Put maxTargetSdk=P now will move APIs onto light greylist
because per-SDK versioned dark greylist is not yet supported by ART. We can
keep doing annotation work without breaking existing apps targeting on P.

Bug:117934933
Bug:112477300

Change-Id: I5e0e693dde49fac3044cd73fd6360c4485f312ec
 2018-10-26 17:24:23 +00:00
Hall Liu
e3115dec99 Merge changes Ib2ff7e44,I950d614d,Ic87c2f8e into stage-aosp-master am: a293fbabf9 
am: da0497491a

Change-Id: Ifb3a7f2c6715cfa9dfa9c564687c54ebe1257d36
 2018-10-25 23:02:41 -07:00
Pengquan Meng
a39b026ed7 Merge "Set default value to false for show4GForLte" am: 4d3f84fddb am: 9932eb7e22 
am: adc6b190ff

Change-Id: If592a4833654d9ad37358712386836d98f771e06
 2018-10-25 22:36:23 -07:00
Amit Mahajan
d9375df6ed Adding new intent ACTION_SMS_MMS_DB_CREATED. 
am: 1b26e44ce0

Change-Id: I9d2431ba073d67e40bc2056f4dc88c399719aa66
 2018-10-25 21:19:07 -07:00
Brad Ebinger
bb6a3f4aab Merge "Remove obsolete @VisibleForTesting Annotation" am: 1e8249a1d6 am: 2c8ace0794 
am: eeb74b5312

Change-Id: I4599bd202f51726db78c37213afd26a69c8ee31d
 2018-10-25 21:13:51 -07:00
Brad Ebinger
4b81463736 Merge "ImsSsData needs a public constructor for vendors to use" am: a1474266bf am: 207b9dcfbf 
am: ee7267f8dd

Change-Id: Ia9ca9493a802b5e79ee7337ddb308b3dd4883114
 2018-10-25 20:45:24 -07:00
Tony Zhu
065b19e137 Merge "[Call Screening]Support for carrier call screening app" am: ee31b2214d am: 3cde670dd3 
am: 3403275a85

Change-Id: I6a9215503805b6aa42052e42ed0044b9d282ebb6
 2018-10-25 20:30:56 -07:00
Hall Liu
da0497491a Merge changes Ib2ff7e44,I950d614d,Ic87c2f8e into stage-aosp-master 
am: a293fbabf9

Change-Id: I1abdea04fd5175e32f0a417f31b7accb470d920f
 2018-10-25 20:10:26 -07:00
Xiangyu/Malcolm Chen
9932f74257 Merge "Add @NonNull in SubMgr#getOpportunisticSubscriptions return value." am: 923bbad67a 
am: 93b95bf693

Change-Id: I42f48d593d11d6bffd0881aaa95fa2df42158b7f
 2018-10-25 19:58:53 -07:00
Hall Liu
0b9ebf1d44 Merge "Add test API to override carrier config" am: a82f952fe7 am: 657e2a925d 
am: 19c6fd5ab1

Change-Id: Ie243b230d3f6d8aca5c292ee497d9e4dc060aec0
 2018-10-25 19:39:19 -07:00
Nathan Harold
1be1fa0be0 Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" am: ac87c0a884 am: 8dc36336d5 
am: 7695b94e10

Change-Id: I2b6a3753b8aaf9e420f114e1c6acc227b38ba8a4
 2018-10-25 19:32:53 -07:00
Nathan Harold
6bdfcd4462 Merge "Remove Hidden TimestampType From CellInfo" am: c65e610c06 am: 0cce6d2bf4 
am: fce9aea69a

Change-Id: Ibfa6b78cdc5d0f1fc603e119278fbfb838ce62e8
 2018-10-25 19:18:41 -07:00
Tyler Gunn
1af91e3de8 Merge "Re-add removed APIs per API council feedback." am: a94a71af13 am: 7085118cfc 
am: db0e0f8c57

Change-Id: If4d0ac8815596756774445c558a9456968c4e990
 2018-10-25 18:55:47 -07:00
Hall Liu
bd46b1c4a2 Merge "Move Binder.clearCallingIdentity" 2018-10-26 01:35:24 +00:00
Xiangyu/Malcolm Chen
923bbad67a Merge "Add @NonNull in SubMgr#getOpportunisticSubscriptions return value." 2018-10-26 01:30:21 +00:00
sqian
36d6e75155 Merge "Add @Nullable for getSubscriptionIds" am: ceceb459e0 am: 6d46d98598 
am: 1b023cfa7c

Change-Id: Iaecc9ed426b7649e1b5009e7c78397a8ffe16563
 2018-10-25 18:04:39 -07:00
Michael Groover
ec5f77a0d7 Allow apps with carrier privileges to access device IDs 
The original design for device identifier access only allowed apps with
carrier privileges to access subscriber identifiers (IMSI and SIM serial
number), however this was too restrictive and can impact a number of
carriers. For Q apps with carrier privileges will be allowed access to
the device identifiers, but this may change in a future release.

Change-Id: Ib60eb7670d8a75a2014ff730d89a1ebe4c2039f0
Fixes: 117844226
Test: atest CarrierApiTest
 2018-10-25 17:53:35 -07:00
Chen Xu
e4e589163b Merge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType" am: 6730f34590 am: 23e8eadca9 
am: 8da63cc369

Change-Id: I2a21387c6740eff5ef08ea14abbf484be25b8928
 2018-10-25 17:39:14 -07:00
Chen Xu
1dd69f1924 Merge "Need to check empty not null for String" am: e09f7b5ebb am: 99053e471d 
am: 97ddb61829

Change-Id: I2b3ba7b8f1d4198120b48693e9c4fc7e7e35d0ab
 2018-10-25 17:32:51 -07:00
Malcolm Chen
74b7cbc032 Clear calling identity in callback. 
In SubscriptionManager, when onSubscriptionsChanged is called
when opportunistic subscriptions change, clear calling identity.
Otherwise mExecutor is executed with phone process identity
which can be a security issue.

Test: build
Bug: 117794788
Change-Id: I766cdc89f0421265cab00dc40d53f355deb7b92b
 2018-10-25 17:23:49 -07:00
Amit Mahajan
1e774558c5 Merge "Adding new intent ACTION_SMS_MMS_DB_CREATED." 2018-10-25 23:44:50 +00:00
Nathan Harold
a629ea3928 Define CellInfo.UNAVAILABLE for Unreported Fields 
For all CellInfo classes, there is a common value for
fields that are unreported by the modem: Integer.MAX_VALUE.
To better document this value, this CL defines it as a
constant "UNAVAILABLE" to indicate that for whatever reason
the framework is not reporting this value to the caller.

Bug: 28171234
Test: make; make offline-sdk-docs
Change-Id: I0aa692e3f1b5478284d262ef97fd65b90bce8293
 2018-10-25 23:00:11 +00:00
Amit Mahajan
1b26e44ce0 Adding new intent ACTION_SMS_MMS_DB_CREATED. 
Test: manual (verified from logcat that intent is broadcast)
Bug: 115990430
Merged-in: I660cf2d04a1b57a58c8cefd212e5f8d73b329890
Change-Id: I660cf2d04a1b57a58c8cefd212e5f8d73b329890
(cherry picked from commit 8c1c45a710)
 2018-10-25 15:57:47 -07:00
Pengquan Meng
adc6b190ff Merge "Set default value to false for show4GForLte" am: 4d3f84fddb 
am: 9932eb7e22

Change-Id: I47e5454d31c63c157597325daa50a54115362fa9
 2018-10-25 14:18:53 -07:00
Amit Mahajan
8c1c45a710 Adding new intent ACTION_SMS_MMS_DB_CREATED. 
Test: manual (verified from logcat that intent is broadcast)
Bug: 115990430
Change-Id: I660cf2d04a1b57a58c8cefd212e5f8d73b329890
 2018-10-25 13:00:36 -07:00
Brad Ebinger
eeb74b5312 Merge "Remove obsolete @VisibleForTesting Annotation" am: 1e8249a1d6 
am: 2c8ace0794

Change-Id: Id3a599b4cba60c595b8735b0892c3b340eb94e4b
 2018-10-24 19:25:55 -07:00
Brad Ebinger
ee7267f8dd Merge "ImsSsData needs a public constructor for vendors to use" am: a1474266bf 
am: 207b9dcfbf

Change-Id: Ia47462edc30809ca90f2955eeef87b0d4ba32a80
 2018-10-24 17:59:39 -07:00