Increment BatteryStatsImpl's VERSION.

That'll make it stop trying to interpret older records with the new format.
Also applied other comments involving name changes to remove un-needed 'Wifi' labels in WifiManager API, etc.

3 files changed, 13 insertions, 13 deletions

diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 00829d6..7c3af69 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -70,10 +70,10 @@ interface IWifiManager
 
     boolean releaseWifiLock(IBinder lock);
 
-    boolean isWifiMulticastEnabled();
+    boolean isMulticastEnabled();
 
-    void enableWifiMulticast(IBinder binder, String tag);
+    void enableMulticast(IBinder binder, String tag);
 
-    void disableWifiMulticast();
+    void disableMulticast();
 }
 
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 658a7b2..1a7caef 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -831,9 +831,9 @@ public class WifiManager {
      *
      * @hide pending API council approval
      */
-    public boolean isWifiMulticastEnabled() {
+    public boolean isMulticastEnabled() {
         try {
-            return mService.isWifiMulticastEnabled();
+            return mService.isMulticastEnabled();
         } catch (RemoteException e) {
             return false;
         }
@@ -851,13 +851,13 @@ public class WifiManager {
      *
      * @return true on success
      *
-     * @see #disableWifiMulticast
+     * @see #disableMulticast
      *
      * @hide pending API council approval
      */
-    public boolean enableWifiMulticast(String tag) {
+    public boolean enableMulticast(String tag) {
         try {
-            mService.enableWifiMulticast(new Binder(), tag);
+            mService.enableMulticast(new Binder(), tag);
             return true;
         } catch (RemoteException e) {
             return false;
@@ -872,13 +872,13 @@ public class WifiManager {
      *
      * @return true on success
      *
-     * @see #enableWifiMulticast
+     * @see #enableMulticast
      *
      * @hide pending API council approval
      */
-    public boolean disableWifiMulticast() {
+    public boolean disableMulticast() {
         try {
-            mService.disableWifiMulticast();
+            mService.disableMulticast();
             return true;
         } catch (RemoteException e) {
             return false;
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java
index 4073ddc..6771136 100644
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -747,8 +747,8 @@ public class WifiStateTracker extends NetworkStateTracker {
                  * first and then off.. if nobody else wants it on it'll be
                  * off then and it's all synchronized within the API.
                  */
-                mWM.enableWifiMulticast("WifiStateTracker");
-                mWM.disableWifiMulticast();
+                mWM.enableMulticast("WifiStateTracker");
+                mWM.disableMulticast();
 
                 if (mBluetoothA2dp == null) {
                     mBluetoothA2dp = new BluetoothA2dp(mContext);