commit fd6cccc775943b1c1c7e18dfa99b94048542248e
author chen xu <fionaxu@google.com> Fri Oct 19 12:56:35 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 19 12:56:35 2018 -0700
tree 9f0a94f7e958c237634fbf302d2b9c392f8e50f8
parent 6ec00c2584c4731b7c34a12275ae67f7bdb6039f
parent 2c10a29eaae43d3678998d84a3f0b8968ff28b8a

Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED"
am: 2c10a29eaa

Change-Id: I265296c4a1b40606f8e3e2b96d4d20a1ccd9d4c7

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 8c396d1..b283cdf 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5159,7 +5159,7 @@
 
   public class PhoneStateListener {
     method public void onRadioPowerStateChanged(int);
-    field public static final int LISTEN_RADIO_POWER_STATE_CHANGED = 4194304; // 0x400000
+    field public static final int LISTEN_RADIO_POWER_STATE_CHANGED = 8388608; // 0x800000
   }
 
   public class ServiceState implements android.os.Parcelable {

telephony/java/android/telephony/PhoneStateListener.java

diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java
index 284e998..3476db4 100644
--- a/telephony/java/android/telephony/PhoneStateListener.java
+++ b/telephony/java/android/telephony/PhoneStateListener.java
@@ -289,7 +289,7 @@
      *  @hide
      */
     @SystemApi
-    public static final int LISTEN_RADIO_POWER_STATE_CHANGED               = 0x00400000;
+    public static final int LISTEN_RADIO_POWER_STATE_CHANGED               = 0x00800000;
 
     /*
      * Subscription used to listen to the phone state changes