Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
366,040 Commits 3 Branches 0 Tags
eef110306fccf1d9a2b026845f2cb40adeb4dfd6
Commit Graph

3526 Commits

Author SHA1 Message Date
Mohamed Abdalkader
eef110306f Merge "Unhide ImsReasonInfo Constructor" into pi-dev am: 4f2e53fe48 
am: cee0b20e71

Change-Id: I2429594470517b7d5496038ca815ac7ff8a6d821
 2018-03-24 06:02:35 +00:00
Brad Ebinger
3a512c2897 Merge "Parse SMS locally upon error to get message ref" into pi-dev am: 2d108c3747 
am: 4a27a1b678

Change-Id: Iae6d0df825b2b78c805a89ede9e502f04701aca4
 2018-03-24 02:55:03 +00:00
Mohamed Abdalkader
cee0b20e71 Merge "Unhide ImsReasonInfo Constructor" into pi-dev 
am: 4f2e53fe48

Change-Id: I37d8fcfc10582f2c865b9c1a5df39e3ad788559c
 2018-03-24 02:37:50 +00:00
Hall Liu
5efb2f73dd Merge "Split the DownloadStateCallback class into two" into pi-dev am: ecd4709573 
am: 3f65260be7

Change-Id: Ib5b10d57b839ff64a79a5b0689d2ae3eacea3a21
 2018-03-24 02:26:33 +00:00
TreeHugger Robot
4f2e53fe48 Merge "Unhide ImsReasonInfo Constructor" into pi-dev 2018-03-24 01:12:49 +00:00
Brad Ebinger
4a27a1b678 Merge "Parse SMS locally upon error to get message ref" into pi-dev 
am: 2d108c3747

Change-Id: I3b75da909f1f07125c5696f7f9e525736732f3c1
 2018-03-24 01:03:41 +00:00
Hall Liu
3f65260be7 Merge "Split the DownloadStateCallback class into two" into pi-dev 
am: ecd4709573

Change-Id: I09cdcd69729ac917ac7290d4e1efcf4d9dbc0530
 2018-03-24 00:31:02 +00:00
Brad Ebinger
2d108c3747 Merge "Parse SMS locally upon error to get message ref" into pi-dev 2018-03-23 23:19:26 +00:00
Hall Liu
ecd4709573 Merge "Split the DownloadStateCallback class into two" into pi-dev 2018-03-23 23:11:46 +00:00
Eric Schwarzenbach
93d1cfe89e Merge "Merge "Change null behavior of getCellBandwidths" into pi-dev am: 9b29e5caa0" into pi-dev-plus-aosp 
am: 90c04bbcc3

Change-Id: Id682c845ecefb2c547891006e3e8bd383a81bc71
 2018-03-23 20:45:43 +00:00
Eric Schwarzenbach
80e2a4698c Merge "Change null behavior of getCellBandwidths" into pi-dev 
am: 9b29e5caa0

Change-Id: I316f112d277e1f1c9f8fd4817a83323d8db78472
 2018-03-23 20:09:06 +00:00
Eric Schwarzenbach
9b29e5caa0 Merge "Change null behavior of getCellBandwidths" into pi-dev 2018-03-23 18:31:43 +00:00
Brad Ebinger
d4285ad123 Parse SMS locally upon error to get message ref 
Parse the SMS locally to get the message ref when
onSmsReceived fails due to the platform being
unavailable. This allows the correct message ref
to be sent back via acknowledgeSms, instead of
the incorrect "0" value.

Bug: 74551838
Test: Manual
Change-Id: I2f8128d8ff4e07bb3720a344cee70fa5fd5d7535
 2018-03-23 09:58:27 -07:00
Eric Schwarzenbach
c119a86350 Change null behavior of getCellBandwidths 
Returns empty array instead of null when there are
no cell bandwidths.

Bug: 73751023
Test: make, runtest
Change-Id: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
 2018-03-22 16:51:19 -07:00
Ying Xu
96c52d3eb0 Merge "Add more comments for the isConfigForIdentifiedCarrier()" am: ec76adb9ff am: 3b84db2329 
am: a8be468657

Change-Id: I406bbb27d7ec94b4122180388badb7757cbae104
 2018-03-22 21:14:45 +00:00
Ying Xu
812319dc7d Merge "Add more comments for the isConfigForIdentifiedCarrier()" into pi-dev 2018-03-22 21:14:32 +00:00
Ying Xu
a8be468657 Merge "Add more comments for the isConfigForIdentifiedCarrier()" am: ec76adb9ff 
am: 3b84db2329

Change-Id: I2a9bd2d3b691418debf601b869049e7df090c3a8
 2018-03-22 20:40:10 +00:00
Pankaj Kanwar
d13c78bad4 Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" am: 320b6c2312 am: 063c6dc0f6 
am: df215ee9f3

Change-Id: Ic0a0e91d91b82466e4bb05b3b872dfd390be73b7
 2018-03-22 19:50:27 +00:00
Pankaj Kanwar
df215ee9f3 Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" am: 320b6c2312 
am: 063c6dc0f6

Change-Id: Icd154b391b05dfa4ed16a97407a15dd7f03ad106
 2018-03-22 19:16:52 +00:00
yinxu
349b644db3 Add more comments for the isConfigForIdentifiedCarrier() 
This is a clean cherry-pick from:
https://android-review.git.corp.google.com/c/platform/frameworks/base/+/642231

Bug:74945742
Test: Compile
Change-Id: Ife3fdf797ca8877ec495d61a8aeed56fa20282a7
Merged-in: Ife3fdf797ca8877ec495d61a8aeed56fa20282a7
(cherry picked from commit cea0d8d488)
 2018-03-22 12:08:51 -07:00
Ying Xu
ec76adb9ff Merge "Add more comments for the isConfigForIdentifiedCarrier()" 2018-03-22 19:07:45 +00:00
Pankaj Kanwar
320b6c2312 Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" 2018-03-22 17:03:39 +00:00
Holly Jiuyu Sun
a99b258049 Merge "Mark eraseSubscriptions as @SystemApi." 2018-03-22 03:45:55 +00:00
Mohamed Abdalkader
ca0c1ac304 Unhide ImsReasonInfo Constructor 
Test: builds
Bug: 76033384
Change-Id: If1101b82f92e45cd417f34356545363f6f9bf322
 2018-03-22 00:40:01 +00:00
Hall Liu
7953997160 Split the DownloadStateCallback class into two 
Use individually-registered DownloadStatusListener and
DownloadProgressListener instead to listen for download status and
progress, respectively.

Bug: 74409377
Test: cts
Change-Id: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
 2018-03-21 23:39:07 +00:00
Brad Ebinger
025cb0c392 Merge "Define phone process as a constant" into pi-dev 2018-03-21 20:38:00 +00:00
Pankaj Kanwar
77f2365672 Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false" 
This reverts commit 84a8bb80a1.

Change-Id: Ied14258726d71262642f8d72db5ee11ea671836b
 2018-03-21 20:20:06 +00:00
nharold
08ee27ff90 Merge "Add alpha Strings to CellIdentityTdscdma" 2018-03-21 20:06:59 +00:00
Brad Ebinger
fb241e2250 Merge "Added Locking for MmTelFeature" into pi-dev 2018-03-21 18:56:00 +00:00
Brad Ebinger
1078b3a36b Define phone process as a constant 
Test: Manual
Bug: 72645729
Merged-In: I8086e4efa15d74bd61c55b72c7b14be4705fcd58
Change-Id: If07728ea2cc0128113ebe947a154f80ff45a7d9d
 2018-03-21 09:59:05 -07:00
yuemingw
50b8acebbd Merge "Better javadoc and rename several methods in ApnSetting." into pi-dev am: 5d5d6aa28a 
am: e31dd1fe95

Change-Id: I055265d8312cb79d1b8ecb08a3340b07624d6e29
 2018-03-21 05:08:17 +00:00
Nathan Harold
d79738634e Merge "Add alpha Strings to CellIdentityTdscdma" into pi-dev am: 7eec8e9635 
am: 5b258f6d3e

Change-Id: I4c2598a2804c35686aeabb5e41a320eeee945f2f
 2018-03-21 05:00:56 +00:00
Jiuyu Sun
60cd769fc9 Merge "Mark eraseSubscriptions as @SystemApi." into pi-dev am: b8651f6fba 
am: eb73734b96

Change-Id: I21f1ef5c693ffb3d88d5067456c8418f037b4f4c
 2018-03-21 04:36:40 +00:00
yuemingw
e31dd1fe95 Merge "Better javadoc and rename several methods in ApnSetting." into pi-dev 
am: 5d5d6aa28a

Change-Id: Ifaae67cd03bd979e3aeb40f3a077bdb36d5911e6
 2018-03-21 02:51:18 +00:00
Nathan Harold
5b258f6d3e Merge "Add alpha Strings to CellIdentityTdscdma" into pi-dev 
am: 7eec8e9635

Change-Id: I0343a43b014f5c09336dad2e108063dc48518269
 2018-03-21 02:43:24 +00:00
Jiuyu Sun
eb73734b96 Merge "Mark eraseSubscriptions as @SystemApi." into pi-dev 
am: b8651f6fba

Change-Id: I31b7c560e9e2c0c6163b2f4214d897ddc279f51a
 2018-03-21 02:31:18 +00:00
TreeHugger Robot
9b50f67fff Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan" into pi-dev 2018-03-21 02:05:12 +00:00
Treehugger Robot
e3ee136c89 Merge "Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity.'" 2018-03-21 00:15:10 +00:00
Xi Han
a692ba6b78 Merge "Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity." into pi-dev am: cd6bb7242c 
am: 987eb171b4

Change-Id: Ic8dc036e7eb287fe327e5dd65524e742e7e3cd6b
 2018-03-21 00:13:02 +00:00
Nathan Harold
a7b147eb05 Add alpha Strings to CellIdentityTdscdma 
Add equivalent alphaLong and alphaShort to
TD-SCDMA so that it's equivalent to LTE, WCDMA,
GSM, etc.

Bug: 75980473
Test: compilation
Merged-In: Ibaa8a7daafb44f7fc94f0fd6aaa193b67793eea4
Change-Id: Ibaa8a7daafb44f7fc94f0fd6aaa193b67793eea4
(cherry picked from commit 0acd7eeed4)
 2018-03-20 16:46:28 -07:00
TreeHugger Robot
5d5d6aa28a Merge "Better javadoc and rename several methods in ApnSetting." into pi-dev 2018-03-20 23:38:10 +00:00
Nathan Harold
7eec8e9635 Merge "Add alpha Strings to CellIdentityTdscdma" into pi-dev 2018-03-20 23:35:58 +00:00
Holly Jiuyu Sun
bbebf8feb4 Mark eraseSubscriptions as @SystemApi. 
This is a blocker for P.

Bug: 74621500
Test: test on phone
Merged-In: I9455a0b7594cbd2acbdbba99a725c9866c448a07
Change-Id: I9455a0b7594cbd2acbdbba99a725c9866c448a07
 2018-03-20 16:31:59 -07:00
Jiuyu Sun
b8651f6fba Merge "Mark eraseSubscriptions as @SystemApi." into pi-dev 2018-03-20 22:53:31 +00:00
Nathan Harold
0acd7eeed4 Add alpha Strings to CellIdentityTdscdma 
Add equivalent alphaLong and alphaShort to
TD-SCDMA so that it's equivalent to LTE, WCDMA,
GSM, etc.

Bug: 75980473
Test: compilation
Change-Id: Ibaa8a7daafb44f7fc94f0fd6aaa193b67793eea4
 2018-03-20 22:37:45 +00:00
Xi Han
987eb171b4 Merge "Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity." into pi-dev 
am: cd6bb7242c

Change-Id: I92b19d3aa66088e65736e5562cb40881c9aa954d
 2018-03-20 22:00:36 +00:00
Amit Mahajan
04c6962605 Merge "Revert "TelephonyManager System APIs process"" into pi-dev 
am: cfa8591779

Change-Id: I9cea061688397e4d407167f8f7b680385c5592cf
 2018-03-20 21:27:58 +00:00
Cassie
f7bb40affb Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and 
getOperatorAlphaShort to CellIdentity.'

Bug: 75984192
Test: Unit test
Change-Id: I71feb20075559c7b28d4aa346a603f0d11ca69da
Merged-In: I71feb20075559c7b28d4aa346a603f0d11ca69da
 2018-03-20 21:04:09 +00:00
Xi Han
cd6bb7242c Merge "Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity." into pi-dev 2018-03-20 20:49:13 +00:00
Amit Mahajan
cfa8591779 Merge "Revert "TelephonyManager System APIs process"" into pi-dev 2018-03-20 19:27:10 +00:00