Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
383,596 Commits 3 Branches 0 Tags
6131255e77ae2ccfb71b54686c8d19775bfde569
Commit Graph

4888 Commits

Author SHA1 Message Date
Josh Hou
6131255e77 Merge "add NonNull annotation to API" 
am: fd2bb72030

Change-Id: Idf5a7df74815a9e339cf4313506f269ddbdce5d1
 2019-03-06 17:32:50 -08:00
Treehugger Robot
fd2bb72030 Merge "add NonNull annotation to API" 2019-03-07 01:07:34 +00:00
Brad Ebinger
17b85fea09 Merge "Add Nullable/NonNull Annotations where appropriate." 
am: eb4d20673f

Change-Id: Idc4e4d59c4773832111ff4383b1aa494d539f2d9
 2019-03-06 15:04:11 -08:00
Brad Ebinger
eb4d20673f Merge "Add Nullable/NonNull Annotations where appropriate." 2019-03-06 22:47:58 +00:00
Pengquan Meng
b7f5e3782c Merge "[API Feedback] Rename getChannelNumber to getNrarfcn" 
am: 8273d66ebc

Change-Id: I5da974b3b914c2581e8b315016ee2c2ff53ad45d
 2019-03-06 14:32:03 -08:00
Nathan Harold
7c59ddb0b8 Merge "Move Annotations for getCellSignalStrengths" 
am: 5ba92cf940

Change-Id: I6b91cdd94c5367ec4f89b7959d746faae10df1ef
 2019-03-06 13:54:50 -08:00
Pengquan Meng
8273d66ebc Merge "[API Feedback] Rename getChannelNumber to getNrarfcn" 2019-03-06 21:52:32 +00:00
Pengquan Meng
14a78540b8 Merge "Add carrier config for 5G Icon" 
am: 2aee6901fb

Change-Id: Iec2c01555d1200f707ee41f23d7ef75799d678f7
 2019-03-06 13:46:02 -08:00
Nathan Harold
5ba92cf940 Merge "Move Annotations for getCellSignalStrengths" 2019-03-06 21:41:18 +00:00
Pengquan Meng
2aee6901fb Merge "Add carrier config for 5G Icon" 2019-03-06 21:36:46 +00:00
Nazanin Bakhshi
fbd7a667d1 Merge "disallow changing from multi-sim to single-sim for carrier apps" 
am: 27c8f495f2

Change-Id: Iec876a398bec6fa2c61b633d7ba8e999e4742964
 2019-03-06 11:24:04 -08:00
Nathan Harold
bbe345fa97 Move Annotations for getCellSignalStrengths 
As per API council script's feedback, the scripts
do not support having nullable annotations preceding
the return tupe. Moving the @NonNull annotations to a
script friendly location.

Bug: 126700393
Test: make update-api && make
      && make offline-sdk-docs (no functional change)
Change-Id: Ie063ffa2e311f4eb7d9e07cd5ee212af97d9d45d
 2019-03-06 11:22:20 -08:00
Pengquan Meng
e36b791729 Add carrier config for 5G Icon 
Bug: 111453000
Test: build
Merged-In: Ie4b331aaec3981dea0eeada436a2123fe9287b74
Change-Id: Ie4b331aaec3981dea0eeada436a2123fe9287b74
 2019-03-06 11:13:39 -08:00
Nazanin Bakhshi
27c8f495f2 Merge "disallow changing from multi-sim to single-sim for carrier apps" 2019-03-06 19:10:58 +00:00
Andrei-Valentin Onea
734611e34e Merge "Add @UnsupportedAppUsage annotations" 
am: f304f4d2ea

Change-Id: Ic5e5148c473e64bc5d8ff506e7f4ac78c409734c
 2019-03-06 10:30:15 -08:00
Andrei-Valentin Onea
f304f4d2ea Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 18:01:47 +00:00
Andrei Onea
890db3d672 Add @UnsupportedAppUsage annotations 
For packages:
  android.speech
  android.telephony.mbms.vendor
  android.view
  android.webkit

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: Iefe25091fa0fcc0adfe4ff85fe5e3ab3ac9c5f10
Change-Id: I04104cf3852a0a7440676ccc55dd96c1eec730c4
 2019-03-06 15:43:49 +00:00
Chen Xu
81e252c51d Merge "migrate cdma home eri from resource overlay to carrierconfig" 
am: e5fd14aed5

Change-Id: Ic84ed20f676363b5c3cbfd82c25d18027f4b1267
 2019-03-05 19:19:43 -08:00
Chen Xu
e5fd14aed5 Merge "migrate cdma home eri from resource overlay to carrierconfig" 2019-03-06 02:50:20 +00:00
chen xu
48467114cc migrate cdma home eri from resource overlay to carrierconfig 
Bug: 121145488
Test: Build
Change-Id: I1ec160883282c8819727d3d56c909d9a1c7fd5d2
(cherry picked from commit eb07e4ebff)
Merged-in: I1ec160883282c8819727d3d56c909d9a1c7fd5d2
 2019-03-05 17:20:26 -08:00
Jack Yu
a98b285b56 Merge changes from topic "iwlan_api" 
am: 83181d80c8

Change-Id: Ia232ee5c9cf4e6393ba093cc7a3723d71bc34af0
 2019-03-05 16:15:36 -08:00
Chen Xu
fe0d62af80 Merge "fix the issue that sending wrong preferred networktype to RIL" 
am: 695bbd1858

Change-Id: I25367a464940eed11028d98f27aa9dd9a1258bbc
 2019-03-05 15:41:11 -08:00
Brad Ebinger
aec46b1475 Add Nullable/NonNull Annotations where appropriate. 
Bug: 126701249
Bug: 126701136
Bug: 126701236
Bug: 126700627
Bug: 126702224
Test: atest FrameworksTelephonyTests
Merged-In: I4cfba9dee766fa9d34f578db4143919c3f203a20
Change-Id: I4cfba9dee766fa9d34f578db4143919c3f203a20
 2019-03-05 15:38:42 -08:00
chen xu
7ce366a28e Merge "add missing annotation for TelephonyManager APIs" 
am: 792ce880ad

Change-Id: Ieb46456932dae085d7d2a4756619902047db40de
 2019-03-05 15:29:41 -08:00
Nazanin Bakhshi
6f68acb0f5 disallow changing from multi-sim to single-sim for carrier apps 
Bug: 125122645
Test: build
Change-Id: Ie422577e1f710b033ed85caed9a3e864aadff061
Merged-In: Ie422577e1f710b033ed85caed9a3e864aadff061
(cherry picked from commit 36ede9a2e6)
 2019-03-05 22:34:55 +00:00
Jack Yu
83181d80c8 Merge changes from topic "iwlan_api" 
* changes:
  Added annotations to the APIs
  Fixed IWLAN related APIs issue
 2019-03-05 21:26:30 +00:00
Chen Xu
695bbd1858 Merge "fix the issue that sending wrong preferred networktype to RIL" 2019-03-05 21:10:41 +00:00
chen xu
42814534d9 fix the issue that sending wrong preferred networktype to RIL 
Bug: 126805258
Test: Manual
Change-Id: Ifb1fc21423a09f0d000553d4d06bafa023adc9d6
Merged-in: Ifb1fc21423a09f0d000553d4d06bafa023adc9d6
 2019-03-05 21:07:02 +00:00
Treehugger Robot
792ce880ad Merge "add missing annotation for TelephonyManager APIs" 2019-03-05 19:06:30 +00:00
Jack Yu
7338e5c238 Added annotations to the APIs 
Added @Nullable and @NonNull to several APIs.

Test: Manual
Bug: 126701840
Bug: 126702171
Bug: 126702057
Bug: 126702564
Bug: 126703014
Bug: 126702900

Change-Id: Ib4d8b2b45b11ef5d70cd229f33b8c8f903e5e6ee
 2019-03-05 11:00:12 -08:00
Jack Yu
6bd48a24cf Fixed IWLAN related APIs issue 
Fixed APIs that not meeting API review requirement.
1. Changed createXxxServiceProvider to onCreateXxxServiceProvider
2. Added builder for NetworkRegistrationState

Test: Manual
Bug: 126552434

Change-Id: Idb2411a47caf61e83fe26b98e393fa851ac1759d
 2019-03-05 10:52:06 -08:00
Jack Yu
29ccc27713 Merge "Add Carriers.SKIP_464XLAT and includes ApnSetting" 
am: a11fb3bafe

Change-Id: Ib07c5eac15c97168d0085470c564d967cd0ada6d
 2019-03-05 09:46:10 -08:00
Jack Yu
a11fb3bafe Merge "Add Carriers.SKIP_464XLAT and includes ApnSetting" 2019-03-05 17:36:51 +00:00
Pengquan Meng
35e5e6abba [API Feedback] Rename getChannelNumber to getNrarfcn 
For consistency with the rest of the public API, the CellIdentityNr structure
should use the specific term for the channel number that is returned
(NR-ARFCN) in the API name rather than the generic getChannelNumber().

Bug: 125025882
Test: build + cts + unit test
Change-Id: I0513afc19171ea169f83ccb7fe3b378af79c8f4b
 2019-03-05 09:25:54 -08:00
Jack Yu
b2f1c5ddb1 Merge "Fixed that DcTracker does not use correct data registration info" 
am: 06e2f822b9

Change-Id: If1abfb0002e25c5c3b40829ba14b1c9f0e910cd8
 2019-03-04 23:12:21 -08:00
Jack Yu
ea741435e4 Fixed that DcTracker does not use correct data registration info 
Fixed by using correct info from the corresponding transport

Test: Unit tests + manual
Bug: 126436426

Merged-In: Ie8ae20423b794622b6a6141faf68c01b75c144ce
Change-Id: Ie8ae20423b794622b6a6141faf68c01b75c144ce
(cherry picked from commit 1fa6cf1578)
 2019-03-04 21:15:36 -08:00
Yuuki Habu
aaea4a512f Add Carriers.SKIP_464XLAT and includes ApnSetting 
Add the below flag as well and they are hidden now
 - SKIP464_XLAT_DEFAULT
 - SKIP464_XLAT_DISABLE
 - SKIP464_XLAT_ENABLE

Support new flag skip464xlat in ApnSetting

Bug: 69949375
Test: run TelephonyProviderTest

Change-Id: Ia85be92a41a7c1a0b8176718d17469880a0c42cb
 2019-03-05 09:46:18 +09:00
chen xu
5a2b45096c add missing annotation for TelephonyManager APIs 
Bug: 126702627
Test: Build
Change-Id: I39cb57db7cc1105bf74eb18ecf15ddbdc6e44f0c
Merged-in: I39cb57db7cc1105bf74eb18ecf15ddbdc6e44f0c
 2019-03-04 15:43:21 -08:00
Michele Berionne
fdcb15a75a Merge "Move the check on multisim support when switch configuration is done" 
am: 5461b1d23f

Change-Id: Ibcd182dd24ebb5f62918e7e71d7b3f69ae845dd9
 2019-03-04 13:27:02 -08:00
Brad Ebinger
391d3b7d44 Merge "Update ImsSsData/ImsSsInfo API based on API council feedback." 
am: cef848b56e

Change-Id: I04d457733c11b18435fe45670d25bb544592a550
 2019-03-04 13:19:01 -08:00
Michele Berionne
5461b1d23f Merge "Move the check on multisim support when switch configuration is done" 2019-03-04 21:12:06 +00:00
Brad Ebinger
cef848b56e Merge "Update ImsSsData/ImsSsInfo API based on API council feedback." 2019-03-04 21:02:10 +00:00
Jordan Liu
808b57db7f Merge "Add NonNull and Nullable annotations" 
am: 56bd70db86

Change-Id: I1ede74a2cbb1e6a8e5d0c0e82347ec27f3ac438e
 2019-03-04 12:30:53 -08:00
Jordan Liu
56bd70db86 Merge "Add NonNull and Nullable annotations" 2019-03-04 20:18:50 +00:00
Michele Berionne
5654a52322 Merge "Changes to APIs for CarrierRestrictionRules class" 
am: 6d9dd94da0

Change-Id: I10d6f25187c16ac29f188fa5f91b72f76bfee642
 2019-03-04 11:23:37 -08:00
Michele Berionne
6d9dd94da0 Merge "Changes to APIs for CarrierRestrictionRules class" 2019-03-04 19:01:42 +00:00
Michele
9a7b0638ca Changes to APIs for CarrierRestrictionRules class 
Add @NonNull annotation where applicable.
Rename isCarrierIdentifiersAllowed into areCarrierIdentifiersAllowed.
Make Builder class final.

Bug: 126375826
Bug: 126699079
Bug: 126700761
Test: Compilation
Change-Id: I1a02bc007f147597df97eaa55c00fd31a952870b
 2019-03-04 10:59:42 -08:00
Amit Mahajan
c45dc5916a Merge "Adding new APN type for Mission Critical Services." 
am: 36791ef41e

Change-Id: I4ae43791c9444f792d69e27b76a5bf57f8dfb4c8
 2019-03-04 10:43:30 -08:00
Amit Mahajan
36791ef41e Merge "Adding new APN type for Mission Critical Services." 2019-03-04 18:23:30 +00:00
Alan Stokes
4514c01068 Merge "Fix javadoc HTML escaping." 
am: 693e023bac

Change-Id: I038bdae560fe93b75054004e00358da7cb752ff0
 2019-03-04 08:38:03 -08:00