diff options
author | Yorke Lee <yorkelee@google.com> | 2015-07-14 18:26:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 18:26:59 +0000 |
commit | 9e6232d383b3fd26346cbec0f3109997d20be04a (patch) | |
tree | 42ff56ca19dafa5b2bf5fcd66be47d83a50c2ac5 /src | |
parent | 12d8a88783bc32cde438ccd4ce96dacfa26c3132 (diff) | |
parent | 0b4ab7c3489620baf2722952ae32f2a1e0b8f74e (diff) |
am 0b4ab7c3: am 84cdd94e: am fbb44cd3: am a33c1c62: am 268b9d07: Merge "Don\'t cache results of permission check" into mnc-dev
* commit '0b4ab7c3489620baf2722952ae32f2a1e0b8f74e':
Don't cache results of permission check
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/CallDetailActivity.java | 1 | ||||
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 1 | ||||
-rw-r--r-- | src/com/android/dialer/calllog/CallLogActivity.java | 1 |
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()); } |