commit 1f7bac2ba99ddbd32059eb0fc5fbef3ec3089479
author Lifu Tang <lifu@google.com> Wed Oct 02 09:56:28 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 02 09:56:28 2013 -0700
tree e7ba9870f0854f376845913b81de63f969a14ff5
parent b26bf780300aa851b66ab7eaf86d7f2b469fe44d
parent 615a6da493d4f9ef4ae7d8f43d495a1272aefed8

am 615a6da4: am c120c6cf: Fixed crash when rotating screen

* commit '615a6da493d4f9ef4ae7d8f43d495a1272aefed8':
  Fixed crash when rotating screen

src/com/android/settings/location/LocationMode.java

diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java
index 63ba6ea..233b010 100644
--- a/src/com/android/settings/location/LocationMode.java
+++ b/src/com/android/settings/location/LocationMode.java
@@ -45,12 +45,6 @@
     private RadioButtonPreference mSensorsOnly;
 
     @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        createPreferenceHierarchy();
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
         createPreferenceHierarchy();

src/com/android/settings/location/LocationSettings.java

diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 6a29e99..06a6650 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -69,12 +69,6 @@
     }
 
     @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        createPreferenceHierarchy();
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
         mSwitch = new Switch(getActivity());