commit a8bd8552a3d232b3df373058a903bd6150d2e74b
author Yorke Lee <yorkelee@google.com> Fri Jul 03 20:34:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 03 20:34:13 2015 +0000
tree 4e76ff561a246cab26a5e05021544b45c5bc7b8b
parent 44aa791099718ecddb4445b46a57c5e5ab0f1b2a
parent ace779434cb82410aa44469be37119296c124b9e

am ace77943: am 94291c6f: am 265aafcd: Merge "Restore Dialer content after permissions granted" into mnc-dev

* commit 'ace779434cb82410aa44469be37119296c124b9e':
  Restore Dialer content after permissions granted

src/com/android/dialer/CallDetailActivity.java

diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index 734e78f..ec92f3f 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -47,6 +47,7 @@
 
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
+import com.android.contacts.common.util.PermissionsUtil;
 import com.android.contacts.common.GeoUtil;
 import com.android.contacts.common.CallUtil;
 import com.android.dialer.calllog.CallDetailHistoryAdapter;
@@ -267,6 +268,7 @@
     @Override
     public void onResume() {
         super.onResume();
+        PermissionsUtil.updateCachedPermissions(this);
         getCallDetails();
     }
 

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 546a646..52a33f2 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -511,6 +511,8 @@
     protected void onResume() {
         Trace.beginSection(TAG + " onResume");
         super.onResume();
+
+        PermissionsUtil.updateCachedPermissions(this);
         mStateSaved = false;
         if (mFirstLaunch) {
             displayFragment(getIntent());

src/com/android/dialer/calllog/CallLogActivity.java

diff --git a/src/com/android/dialer/calllog/CallLogActivity.java b/src/com/android/dialer/calllog/CallLogActivity.java
index d5444de..0f2f838 100644
--- a/src/com/android/dialer/calllog/CallLogActivity.java
+++ b/src/com/android/dialer/calllog/CallLogActivity.java
@@ -35,6 +35,7 @@
 
 import com.android.contacts.common.interactions.TouchPointManager;
 import com.android.contacts.common.list.ViewPagerTabs;
+import com.android.contacts.common.util.PermissionsUtil;
 import com.android.contacts.commonbind.analytics.AnalyticsUtil;
 import com.android.dialer.DialtactsActivity;
 import com.android.dialer.R;
@@ -150,6 +151,7 @@
     protected void onResume() {
         mIsResumed = true;
         super.onResume();
+        PermissionsUtil.updateCachedPermissions(this);
         sendScreenViewForChildFragment(mViewPager.getCurrentItem());
     }
 

src/com/android/dialer/list/SpeedDialFragment.java

diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java
index 541cdf6..bf95758 100644
--- a/src/com/android/dialer/list/SpeedDialFragment.java
+++ b/src/com/android/dialer/list/SpeedDialFragment.java
@@ -194,7 +194,12 @@
         super.onResume();
 
         if (PermissionsUtil.hasContactsPermissions(getActivity())) {
-            getLoaderManager().getLoader(LOADER_ID_CONTACT_TILE).forceLoad();
+            if (getLoaderManager().getLoader(LOADER_ID_CONTACT_TILE) == null) {
+                getLoaderManager().initLoader(LOADER_ID_CONTACT_TILE, null,
+                        mContactTileLoaderListener);
+            } else {
+                getLoaderManager().getLoader(LOADER_ID_CONTACT_TILE).forceLoad();
+            }
         }
         Trace.endSection();
     }