Commit Graph

3891 Commits

Author SHA1 Message Date
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
TreeHugger Robot
5ab8ad86f9 Merge "Revert "TelephonyManager System APIs process"" 2018-03-20 19:25:14 +00:00
yuemingw
7e1298f1a4 Better javadoc and rename several methods in ApnSetting.
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
run cts --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testOverrideApn

Bug: 73087996
Change-Id: I5232c92a44ab505946956f81965a205f170aa52b
2018-03-20 18:15:25 +00:00
Cassie
9ba450d805 Add @Nullable annotations to getOperatorAlphaLong and
getOperatorAlphaShort to CellIdentity.

Bug: 75984192
Test: Unit test
Change-Id: I71feb20075559c7b28d4aa346a603f0d11ca69da
2018-03-20 10:47:26 -07:00
yinxu
0d9e55773d Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan
Because there will be multiple callbacks for each scan and they must be
invoked with the same order as they are received by the platform, we
should use AsyncTask.SERIAL_EXECUTOR instead of
AsyncTask.THREAD_POOL_EXECUTOR as the default executor.

This is a clean cherry-pick from:
https://android-review.googlesource.com/#/c/platform/frameworks/base/+/640804/

Bug:74840070
Test: Unit Test, CTS Test
Change-Id: I7333940dad38f7e400a4124486bdb21cea0d5220
Merged-in: I7333940dad38f7e400a4124486bdb21cea0d5220
(cherry picked from commit 2e8d5ed776)
2018-03-20 10:27:37 -07:00
Amit Mahajan
71e4c9bfad Revert "TelephonyManager System APIs process"
This reverts commit 2f39856753.

Reason for revert: b/75998747

Bug: 75998747
Merged-in: I4a98388c732249ce2aaf05a57c3a98c15f4bd4b3
Change-Id: I35569102bc311162c3d3550fadb6b4307dbe3af1
2018-03-20 16:21:39 +00:00
Amit Mahajan
eadd25ad0e Revert "TelephonyManager System APIs process"
This reverts commit 3b991aee47.

Reason for revert: b/75998747

Bug: 75998747
Change-Id: I4a98388c732249ce2aaf05a57c3a98c15f4bd4b3
2018-03-20 16:15:26 +00:00
Jeff Davidson
fc2d5449c9 Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps." into pi-dev am: 2ca77fe976
am: 1bccf3e781

Change-Id: I6bf7f6572d4c0736e7fe4228a8a0e3ea3ead3b54
2018-03-20 07:01:05 +00:00
Jeff Davidson
1bccf3e781 Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps." into pi-dev
am: 2ca77fe976

Change-Id: Ifd1a1fee79b101c566de5fac12a083fdc267da5d
2018-03-20 04:43:16 +00:00
TreeHugger Robot
2ca77fe976 Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps." into pi-dev 2018-03-20 02:47:50 +00:00
Jeff Davidson
1ba1839bd8 Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps.
Bug: 70177947
Bug: 70041899
Test: Flash / boot; TreeHugger; Unit/CTS tests in topic
Merged-In: I4061becb1d7ceaa58d84e4e3568c1b6e63cfc8d1
Change-Id: I4061becb1d7ceaa58d84e4e3568c1b6e63cfc8d1
2018-03-19 18:48:11 -07:00
Tej Singh
b52d6f14aa Merge "Merge "Atoms: Mobile Connection" into pi-dev am: dba47fcd09" into pi-dev-plus-aosp
am: 0a4a9248b5

Change-Id: I6c028678eb91627ae3c36db76e23f5237abf4c28
2018-03-20 01:12:26 +00:00
sqian
4628a8cddd Merge "TelephonyManager System APIs process" into pi-dev
am: f0aeb0578e

Change-Id: If80a92c24d11ab0b48dfdda32a9521f1f7ec4993
2018-03-19 23:07:38 +00:00
Tej Singh
3e39b508f1 Merge "Atoms: Mobile Connection" into pi-dev
am: dba47fcd09

Change-Id: I3008bae7f5ecebbbb79fbe141479d25c6c5f5867
2018-03-19 22:54:01 +00:00
Treehugger Robot
fe78972bb2 Merge "Allow carrier-privileged apps to register telephony listeners." 2018-03-19 21:24:27 +00:00
Brad Ebinger
4f59dce0f8 Merge "Remove IMS Emergency Calling availability API" into pi-dev 2018-03-19 21:12:43 +00:00
TreeHugger Robot
f0aeb0578e Merge "TelephonyManager System APIs process" into pi-dev 2018-03-19 20:55:18 +00:00
sqian
2f39856753 TelephonyManager System APIs process
- lock down some TelephonyManager APIs with system permission
- deprecate some TelephonyManager APIs due to its equivalents
- introduce an aidl interface that handles the current
getPhoneType() functions

The doc: https://docs.google.com/spreadsheets/d/1OJ6EXJ-Zys21mZ1BHgJeWkcfLq0pPxBR765r46ck80U/edit#gid=0

Bug: 62346128
Test: Compile
Change-Id: I5367372f3304e5ad368d0d4775f6e96168243aa3
Merged-In: I5367372f3304e5ad368d0d4775f6e96168243aa3
(cherry picked from commit 3b991aee47)
2018-03-19 11:35:36 -07:00
Shuo Qian
2d907e45e3 Merge "TelephonyManager System APIs process" 2018-03-19 18:04:39 +00:00
Brad Ebinger
c14ab64a4a Added Locking for MmTelFeature
oneway binder methods were not locked, causing the
possible condition where the method was called again
before the previous call to that method completed.

Bug: 74119196
Test: Manual, Telephony Unit Testing
Merged-In: I347c5afb39326e3177667b94db593e76a1c766f9
Change-Id: I794d5f7ea6f091ca83aa71a438c204ac97fad7a1
2018-03-19 11:04:01 -07:00
Brad Ebinger
d4854f11b7 Remove IMS Emergency Calling availability API
Moving to an async update model for updating
IMS emergency calling availability, so this
API is unneeded.

Bug: 74389647
Test: Telephony ImsService testapp
Merged-In: I6b8ba0608c540113ce7303907ec632989c6422bc
Change-Id: Ib7b7dc5b1438f038b370ae9faf152fb15ed4acd5
2018-03-19 11:04:00 -07:00
Tej Singh
eee317b7b6 Atoms: Mobile Connection
Atom definitions for MobileConnectionStateChanged and
MobileRadioTechnologyChanged

Also cleans up batterystats.

Bug: b/72320589
Test: verified logs appear in adb logcat -b stats
Change-Id: I9feb258cf6dd4a8c8bf1cffc9566b5d0a851a9fa
2018-03-19 09:48:22 -07:00
Jeff Davidson
03c07f859d Merge "Allow carrier-privileged apps to register telephony listeners." into pi-dev 2018-03-16 23:48:51 +00:00
Jeff Davidson
be3e094fe9 Merge "Allow carrier-privileged apps to register telephony listeners." into pi-dev-plus-aosp 2018-03-16 23:48:29 +00:00
Jeff Davidson
a4a4c8aea7 Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps.
Bug: 70177947
Bug: 70041899
Test: Flash / boot; TreeHugger; Unit/CTS tests in topic
Change-Id: I4061becb1d7ceaa58d84e4e3568c1b6e63cfc8d1
2018-03-16 23:27:10 +00:00
Jack Yu
5b7103ab97 Merge "Renamed getNetworkId and getSystemId" 2018-03-16 21:50:19 +00:00
Brad Ebinger
ac8d9d51bd Merge "Define phone process as a constant" am: 465fdc2b25 am: 6c54d8509a
am: d3332bbc5e

Change-Id: I258a3b406add0ea18dc41eab4348a4fd17d9ba8a
2018-03-16 21:32:09 +00:00
Brad Ebinger
d3332bbc5e Merge "Define phone process as a constant" am: 465fdc2b25
am: 6c54d8509a

Change-Id: I8086e4efa15d74bd61c55b72c7b14be4705fcd58
2018-03-16 21:16:08 +00:00
Brad Ebinger
500e9fe015 Merge "Added Locking for MmTelFeature" am: d273dea10b am: 3a92430622
am: a77af22570

Change-Id: Iae64fa9a18fecd98e97030abdfd08eabd7b29ac8
2018-03-16 21:10:51 +00:00
Brad Ebinger
a77af22570 Merge "Added Locking for MmTelFeature" am: d273dea10b
am: 3a92430622

Change-Id: I347c5afb39326e3177667b94db593e76a1c766f9
2018-03-16 20:54:10 +00:00
sqian
3b991aee47 TelephonyManager System APIs process
- lock down some TelephonyManager APIs with system permission
- deprecate some TelephonyManager APIs due to its equivalents
- introduce an aidl interface that handles the current
getPhoneType() functions

The doc: https://docs.google.com/spreadsheets/d/1OJ6EXJ-Zys21mZ1BHgJeWkcfLq0pPxBR765r46ck80U/edit#gid=0

Bug: 62346128
Test: Compile
Change-Id: I5367372f3304e5ad368d0d4775f6e96168243aa3
2018-03-16 13:45:44 -07:00
yinxu
36f3781315 Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan" am: cdbf930883 am: a93e4124b5
am: 5195c1bb4e

Change-Id: I160a9aaf97354e00d711f9e9dd295bb418b0b151
2018-03-16 20:24:08 +00:00
yinxu
5195c1bb4e Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan" am: cdbf930883
am: a93e4124b5

Change-Id: I0f67a737f418d105658763e21974dc60216aee1a
2018-03-16 19:52:11 +00:00
Brad Ebinger
465fdc2b25 Merge "Define phone process as a constant" 2018-03-16 18:38:30 +00:00
Jack Yu
3f5e5aef5c Merge "Renamed getNetworkId and getSystemId" into pi-dev am: 6b4e6a17e9
am: a4bc10ab2c

Change-Id: I3464d53c8cd9cf3c90cb9bf49489d9cb93e7dc96
2018-03-16 18:33:43 +00:00
Brad Ebinger
d273dea10b Merge "Added Locking for MmTelFeature" 2018-03-16 18:21:07 +00:00
Jack Yu
a4bc10ab2c Merge "Renamed getNetworkId and getSystemId" into pi-dev
am: 6b4e6a17e9

Change-Id: I6abe048410da981bd0adfe9919ad4e7ea734b0c6
2018-03-16 18:17:39 +00:00