summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-14 17:17:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-14 17:17:21 +0000
commit0b4ab7c3489620baf2722952ae32f2a1e0b8f74e (patch)
tree25cc953264a31bd1e76a44be4c01845235095f53
parent30d844541ad6eda6773c5089aeffd66e20b85956 (diff)
parent84cdd94e238792b0f611775731be74372043d8d0 (diff)
am 84cdd94e: am fbb44cd3: am a33c1c62: am 268b9d07: Merge "Don\'t cache results of permission check" into mnc-dev
* commit '84cdd94e238792b0f611775731be74372043d8d0': Don't cache results of permission check
-rw-r--r--src/com/android/dialer/CallDetailActivity.java1
-rw-r--r--src/com/android/dialer/DialtactsActivity.java1
-rw-r--r--src/com/android/dialer/calllog/CallLogActivity.java1
3 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index ec92f3f94..c6ec8e1a0 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -268,7 +268,6 @@ public class CallDetailActivity extends Activity
@Override
public void onResume() {
super.onResume();
- PermissionsUtil.updateCachedPermissions(this);
getCallDetails();
}
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index e714c7880..31d1b94bf 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -513,7 +513,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
Trace.beginSection(TAG + " onResume");
super.onResume();
- PermissionsUtil.updateCachedPermissions(this);
mStateSaved = false;
if (mFirstLaunch) {
displayFragment(getIntent());
diff --git a/src/com/android/dialer/calllog/CallLogActivity.java b/src/com/android/dialer/calllog/CallLogActivity.java
index 0f2f83860..1f6c49066 100644
--- a/src/com/android/dialer/calllog/CallLogActivity.java
+++ b/src/com/android/dialer/calllog/CallLogActivity.java
@@ -151,7 +151,6 @@ public class CallLogActivity extends Activity implements ViewPager.OnPageChangeL
protected void onResume() {
mIsResumed = true;
super.onResume();
- PermissionsUtil.updateCachedPermissions(this);
sendScreenViewForChildFragment(mViewPager.getCurrentItem());
}