Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move EXTRA_SERVICE_STATE from Intent to ServiceState. am: 3ee618bbf5

Browse Source 
Change-Id: Ia1452df2cd70deeee8bac0d71f108404ac292725
This commit is contained in:
Automerger Merge Worker
2020-02-26 18:04:05 +00:00
parent 7e3f076b2c 3ee618bbf5
commit 4349d2d937
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/Intent.java
View File

@@ -4517,12 +4517,6 @@ public class Intent implements Parcelable, Cloneable {
@SystemApi
public static final String EXTRA_LTE_EARFCN_RSRP_BOOST = "LteEarfcnRsrpBoost";
/**
* An parcelable extra used with {@link #ACTION_SERVICE_STATE} representing the service state.
* @hide
*/
public static final String EXTRA_SERVICE_STATE = "android.intent.extra.SERVICE_STATE";
/**
* The name of the extra used to define the text to be processed, as a
* CharSequence. Note that this may be a styled CharSequence, so you must use

12
telephony/java/android/telephony/ServiceState.java
View File

@@ -317,6 +317,14 @@ public class ServiceState implements Parcelable {
*/
public static final int UNKNOWN_ID = -1;
/**
* A parcelable extra used with {@link Intent#ACTION_SERVICE_STATE} representing the service
* state.
* @hide
*/
private static final String EXTRA_SERVICE_STATE = "android.intent.extra.SERVICE_STATE";
private String mOperatorAlphaLong;
private String mOperatorAlphaShort;
private String mOperatorNumeric;
@@ -1292,7 +1300,7 @@ public class ServiceState implements Parcelable {
*/
@UnsupportedAppUsage
private void setFromNotifierBundle(Bundle m) {
ServiceState ssFromBundle = m.getParcelable(Intent.EXTRA_SERVICE_STATE);
ServiceState ssFromBundle = m.getParcelable(EXTRA_SERVICE_STATE);
if (ssFromBundle != null) {
copyFrom(ssFromBundle);
}
@@ -1310,7 +1318,7 @@ public class ServiceState implements Parcelable {
*/
@SystemApi
public void fillInNotifierBundle(@NonNull Bundle m) {
m.putParcelable(Intent.EXTRA_SERVICE_STATE, this);
m.putParcelable(EXTRA_SERVICE_STATE, this);
// serviceState already consists of below entries.
// for backward compatibility, we continue fill in below entries.
m.putInt("voiceRegState", mVoiceRegState);