commit 917eb027d90d0f49fbc6520af9c3a8978d271d47
author Shishir Agrawal <shishir@google.com> Fri Sep 05 23:59:14 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 05 23:59:14 2014 +0000
tree 65a60a13db15d7a47454a14466ce4511d8c616a5
parent c09eda48edb423121f62e45d781a3b97eb29215b
parent cea39c68907e9affdda0e4d72a7082639318eb27

am cea39c68: Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev

* commit 'cea39c68907e9affdda0e4d72a7082639318eb27':
  API change: SetOperatorBrandOverride should not take iccId as a param.

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 98db518..d8259a3 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2016,9 +2016,9 @@
     }
 
     @Override
-    public boolean setOperatorBrandOverride(String iccId, String brand) {
+    public boolean setOperatorBrandOverride(String brand) {
         enforceModifyPermissionOrCarrierPrivilege();
-        return mPhone.setOperatorBrandOverride(iccId, brand);
+        return mPhone.setOperatorBrandOverride(brand);
     }
 
     @Override