Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad21212b authored by Gary Mai's avatar Gary Mai Committed by Android (Google) Code Review
Browse files

Merge "Handle revoked permissions when resuming the app (1/2)" into ub-contactsdialer-i-dev

parents 8d26c0a7 1e899dc1

src/com/android/contacts/NonPhoneActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -44,9 +44,7 @@ public class NonPhoneActivity extends ContactsActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (RequestPermissionsActivity.startPermissionActivity(this)) {

            return;

        }

        RequestPermissionsActivity.startPermissionActivityIfNeeded(this);



        final String phoneNumber = getPhoneNumber();

        if (TextUtils.isEmpty(phoneNumber)) {

src/com/android/contacts/activities/AttachPhotoActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class AttachPhotoActivity extends ContactsActivity { 
    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);



        if (RequestPermissionsActivity.startPermissionActivity(this)) {

        if (RequestPermissionsActivity.startPermissionActivityIfNeeded(this)) {

            return;

        }

src/com/android/contacts/activities/ContactEditorActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -314,9 +314,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements 
    public void onCreate(Bundle savedState) {

        super.onCreate(savedState);



        if (RequestPermissionsActivity.startPermissionActivity(this)) {

            return;

        }

        RequestPermissionsActivity.startPermissionActivityIfNeeded(this);



        final Intent intent = getIntent();

        final String action = intent.getAction();

src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class ContactEditorSpringBoardActivity extends AppCompatContactsActivity 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (RequestPermissionsActivity.startPermissionActivity(this)) {

        if (RequestPermissionsActivity.startPermissionActivityIfNeeded(this)) {

            return;

        }

src/com/android/contacts/activities/ContactSelectionActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -107,9 +107,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen 
    protected void onCreate(Bundle savedState) {

        super.onCreate(savedState);



        if (RequestPermissionsActivity.startPermissionActivity(this)) {

            return;

        }

        RequestPermissionsActivity.startPermissionActivityIfNeeded(this);



        if (savedState != null) {

            mActionCode = savedState.getInt(KEY_ACTION_CODE);