From 27de0e51ebf0517607d41a82d1b9462974324d8a Mon Sep 17 00:00:00 2001
From: Malcolm Chen <refuhoo@google.com>
Date: Mon, 12 Nov 2018 19:34:38 -0800
Subject: [PATCH] Fix mis-ordered merge in PhoneStateListener.java

Bug: 119131284
Test: build
Change-Id: I9ab7a0a992e4000efb1a1b89ec198f9da74876d9
---
 .../android/telephony/PhoneStateListener.java | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java
index 7e8eb63affa80..f5dff20eedf28 100644
--- a/telephony/java/android/telephony/PhoneStateListener.java
+++ b/telephony/java/android/telephony/PhoneStateListener.java
@@ -438,12 +438,12 @@ public class PhoneStateListener {
                         PhoneStateListener.this.onPhoneCapabilityChanged(
                                 (PhoneCapability) msg.obj);
                         break;
-                    case LISTEN_RADIO_POWER_STATE_CHANGED:
-                        PhoneStateListener.this.onRadioPowerStateChanged((int) msg.obj);
-                        break;
                     case LISTEN_PREFERRED_DATA_SUBID_CHANGE:
                         PhoneStateListener.this.onPreferredDataSubIdChanged((int) msg.obj);
                         break;
+                    case LISTEN_RADIO_POWER_STATE_CHANGED:
+                        PhoneStateListener.this.onRadioPowerStateChanged((int) msg.obj);
+                        break;
                 }
             }
         };
@@ -683,17 +683,6 @@ public class PhoneStateListener {
         // default implementation empty
     }
 
-    /**
-     * Callback invoked when modem radio power state changes. Requires
-     * the READ_PRIVILEGED_PHONE_STATE permission.
-     * @param state the modem radio power state
-     * @hide
-     */
-    @SystemApi
-    public void onRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state) {
-        // default implementation empty
-    }
-
     /**
      * Callback invoked when preferred data subId changes. Requires
      * the READ_PRIVILEGED_PHONE_STATE permission.
@@ -706,6 +695,17 @@ public class PhoneStateListener {
         // default implementation empty
     }
 
+    /**
+     * Callback invoked when modem radio power state changes. Requires
+     * the READ_PRIVILEGED_PHONE_STATE permission.
+     * @param state the modem radio power state
+     * @hide
+     */
+    @SystemApi
+    public void onRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state) {
+        // default implementation empty
+    }
+
     /**
      * Callback invoked when telephony has received notice from a carrier
      * app that a network action that could result in connectivity loss
@@ -838,13 +838,14 @@ public class PhoneStateListener {
             send(LISTEN_PHONE_CAPABILITY_CHANGE, 0, 0, capability);
         }
 
+        public void onPreferredDataSubIdChanged(int subId) {
+            send(LISTEN_PREFERRED_DATA_SUBID_CHANGE, 0, 0, subId);
+        }
+
         public void onRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state) {
             send(LISTEN_RADIO_POWER_STATE_CHANGED, 0, 0, state);
         }
 
-        public void onPreferredDataSubIdChanged(int subId) {
-            send(LISTEN_PREFERRED_DATA_SUBID_CHANGE, 0, 0, subId);
-        }
     }
 
     /**
@@ -857,4 +858,4 @@ public class PhoneStateListener {
     private void log(String s) {
         Rlog.d(LOG_TAG, s);
     }
-}
+}
\ No newline at end of file