Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
390,930 Commits 3 Branches 0 Tags
63578a0742eba381cb4bd3eb0dbc1ef67d1121be
Commit Graph

4505 Commits

Author SHA1 Message Date
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
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
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
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
Amit Mahajan
1e774558c5 Merge "Adding new intent ACTION_SMS_MMS_DB_CREATED." 2018-10-25 23:44:50 +00: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
Youming Ye
e937fd1ad3 Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"" am: 94fe6430ea 
am: 555090d597

Change-Id: Id8eb4dee3f864c939226321fce5189d43044d1c5
 2018-10-24 17:41:46 -07:00
Tony Zhu
3403275a85 Merge "[Call Screening]Support for carrier call screening app" am: ee31b2214d 
am: 3cde670dd3

Change-Id: Ibf5b6439d695a5cf6e2d08422370b26a165012da
 2018-10-24 17:25:19 -07:00
Hall Liu
19c6fd5ab1 Merge "Add test API to override carrier config" am: a82f952fe7 
am: 657e2a925d

Change-Id: Ic93a7e349e412c84d2c3752d9fe1911e42c08ceb
 2018-10-24 16:33:18 -07:00
Nathan Harold
7695b94e10 Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" am: ac87c0a884 
am: 8dc36336d5

Change-Id: Ic7d0e0bc7c52a6689fb88e27f5f6d5aa6c75869e
 2018-10-24 16:28:49 -07:00
Nathan Harold
fce9aea69a Merge "Remove Hidden TimestampType From CellInfo" am: c65e610c06 
am: 0cce6d2bf4

Change-Id: I121c5ad4200139e7f3dde128865611ed11a306b0
 2018-10-24 16:18:38 -07:00
Nathan Harold
41e2d7494f Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed 
am: 13c9e7e2f3

Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e
 2018-10-24 16:14:06 -07:00
Tyler Gunn
db0e0f8c57 Merge "Re-add removed APIs per API council feedback." am: a94a71af13 
am: 7085118cfc

Change-Id: Idecba0bbaed7b05dc02ec86788268bc8b945963a
 2018-10-24 16:09:16 -07:00
Xiangyu/Malcolm Chen
ecc6407263 Merge "Add PhoneStateListener#onPreferredDataSubIdChanged" am: 0875fbab4b 
am: 4190b87df6

Change-Id: Ic83970e95380071b1f3c1aa0be2fda49889776f6
 2018-10-24 15:53:27 -07:00
Pengquan Meng
cdb6c68ed1 Set default value to false for show4GForLte 
Bug: 118375031
Test: build
Change-Id: I542bfcbf5e88748321f75bdf3bdd5faa214360ea
 2018-10-24 15:43:50 -07:00
sqian
1b023cfa7c Merge "Add @Nullable for getSubscriptionIds" am: ceceb459e0 
am: 6d46d98598

Change-Id: Ifed7dac40564cd322ea75c14db6b9e1827794507
 2018-10-24 15:28:44 -07:00
Chen Xu
8da63cc369 Merge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType" am: 6730f34590 
am: 23e8eadca9

Change-Id: Iabab15d42ce0af2cbe7f6a9eec0bee52c7a238d6
 2018-10-24 15:11:14 -07:00
Chen Xu
97ddb61829 Merge "Need to check empty not null for String" am: e09f7b5ebb 
am: 99053e471d

Change-Id: I3bdeafe4be70779393c74916bafe76ab3f7f455e
 2018-10-24 15:05:23 -07:00
Chen Xu
db45db791a Merge changes from topic "carrier_id_aosp_cp" am: fccdf46adf 
am: 8463ad7760

Change-Id: I7a26c82c978706bc5a522af3ed2b9e2a96ec0fb6
 2018-10-24 14:58:06 -07:00
Brad Ebinger
1e8249a1d6 Merge "Remove obsolete @VisibleForTesting Annotation" 2018-10-24 20:15:35 +00:00
Brad Ebinger
a1474266bf Merge "ImsSsData needs a public constructor for vendors to use" 2018-10-24 17:08:39 +00:00
Youming Ye
94fe6430ea Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"" 2018-10-24 16:26:21 +00:00
Tony Zhu
ee31b2214d Merge "[Call Screening]Support for carrier call screening app" 2018-10-24 15:51:48 +00:00
Malcolm Chen
9569bc70f9 Clean up SubMgr#getOpportunisticSubscriptions. 
Adding more descriptive comments for this API.
Remove param slotIndex.

Bug: 117832560
Bug: 117830188
Test: build
Change-Id: I906cfb8ccb1851bde6be09c273d47092337ed1c1
 2018-10-23 18:47:04 -07:00
Hall Liu
a82f952fe7 Merge "Add test API to override carrier config" 2018-10-24 00:00:22 +00:00
Malcolm Chen
05a9565074 Changing setPreferredData so that it takes subId. 
Bug: 92796390
Test: build
Change-Id: I189fbe3c47f51f361838a6737fb5bef3aa1f0ee9
 2018-10-23 16:56:48 -07:00
Nathan Harold
ac87c0a884 Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" 2018-10-23 23:34:26 +00:00
Brad Ebinger
8853179fa7 Remove obsolete @VisibleForTesting Annotation 
Bug: 118296374
Test: atest FrameworksTelephonyTests
Change-Id: I5156db7d199f89307ca7c602bfc855dbc6ae236e
 2018-10-23 15:46:59 -07:00