From 3331545bd3fb769ae3f9246c0bd92fe35c6308ab Mon Sep 17 00:00:00 2001
From: sail <sail@google.com>
Date: Thu, 29 Jun 2017 08:46:43 -0700
Subject: Automated g4 rollback of changelist 160202511.

*** Reason for rollback ***

Causes crash, see b/63127884

*** Original change description ***

All Fragments are now support library Fragments.

Switch a bunch of imports to support library Fragments (and Loaders) instead of framework Fragments (and Loaders). This was needed to use FragmentManager.isStateSaved() instead of manually tracking that state. This should reduce errors around committing after state is saved.

Also adds METADATA presubmit to prevent new usages of framework Fragments or Loaders.

***

Bug: 38241305,63127884
Test: N/A
PiperOrigin-RevId: 160530287
Change-Id: Ie2c4d3561ebea2d0f05097ce89bdd9bc8767c8cf
---
 .../dialer/interactions/PhoneNumberInteraction.java       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'java/com/android/dialer/interactions')

diff --git a/java/com/android/dialer/interactions/PhoneNumberInteraction.java b/java/com/android/dialer/interactions/PhoneNumberInteraction.java
index ea7d841f5..ef468a9f3 100644
--- a/java/com/android/dialer/interactions/PhoneNumberInteraction.java
+++ b/java/com/android/dialer/interactions/PhoneNumberInteraction.java
@@ -20,9 +20,14 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
 import android.content.Context;
+import android.content.CursorLoader;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.Loader;
+import android.content.Loader.OnLoadCompleteListener;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
@@ -37,13 +42,7 @@ import android.provider.ContactsContract.RawContacts;
 import android.support.annotation.IntDef;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v4.content.Loader.OnLoadCompleteListener;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -351,7 +350,7 @@ public class PhoneNumberInteraction implements OnLoadCompleteListener<Cursor> {
   }
 
   private void showDisambiguationDialog(ArrayList<PhoneItem> phoneList) {
-    final FragmentActivity activity = (FragmentActivity) mContext;
+    final Activity activity = (Activity) mContext;
     if (activity.isDestroyed()) {
       // Check whether the activity is still running
       LogUtil.i("PhoneNumberInteraction.showDisambiguationDialog", "activity destroyed");
@@ -359,7 +358,7 @@ public class PhoneNumberInteraction implements OnLoadCompleteListener<Cursor> {
     }
     try {
       PhoneDisambiguationDialogFragment.show(
-          activity.getSupportFragmentManager(),
+          activity.getFragmentManager(),
           phoneList,
           mInteractionType,
           mIsVideoCall,
-- 
cgit v1.2.3