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

Unverified Commit f2878de6 authored by Gitsaibot's avatar Gitsaibot Committed by GitHub
Browse files

Merge pull request #610 from jspricke/fix_exceptions 

Fix some exceptions
parents de6c9dee 79f8cb44

src/com/android/calendar/CalendarUtils.java

+10 −2
Original line number Diff line number Diff line
@@ -16,18 +16,23 @@ 


package com.android.calendar;



import android.Manifest;

import android.content.AsyncQueryHandler;

import android.content.ContentResolver;

import android.content.ContentValues;

import android.content.Context;

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.database.Cursor;

import android.os.Build;

import android.provider.CalendarContract.CalendarCache;

import android.text.TextUtils;

import android.text.format.DateUtils;

import android.text.format.Time;

import android.util.Log;



import androidx.core.content.ContextCompat;



import java.util.Formatter;

import java.util.HashSet;

import java.util.Locale;
@@ -256,9 +261,12 @@ public class CalendarUtils { 
                    if (mHandler == null) {

                        mHandler = new AsyncTZHandler(context.getContentResolver());

                    }

                    if (Build.VERSION.SDK_INT < 23 || ContextCompat.checkSelfPermission(context,

                                Manifest.permission.READ_CALENDAR) == PackageManager.PERMISSION_GRANTED) {

                        mHandler.startQuery(0, context, CalendarCache.URI, CALENDAR_CACHE_POJECTION,

                                null, null, null);

                    }

                }

                if (mTZQueryInProgress) {

                    mTZCallbacks.add(callback);

                }

src/com/android/calendar/selectcalendars/SelectVisibleCalendarsActivity.java

+10 −2
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@ 


package com.android.calendar.selectcalendars;



import android.Manifest;

import android.app.ActionBar;

import android.app.FragmentTransaction;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.database.ContentObserver;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.provider.CalendarContract;
@@ -35,6 +38,8 @@ import com.android.calendar.CalendarController.ViewType; 
import com.android.calendar.DynamicTheme;

import com.android.calendar.Utils;



import androidx.core.content.ContextCompat;



import ws.xsoh.etar.R;



public class SelectVisibleCalendarsActivity extends AbstractCalendarActivity {
@@ -82,9 +87,12 @@ public class SelectVisibleCalendarsActivity extends AbstractCalendarActivity { 
    @Override

    public void onResume() {

        super.onResume();

        if (Build.VERSION.SDK_INT < 23 || ContextCompat.checkSelfPermission(this,

                    Manifest.permission.READ_CALENDAR) == PackageManager.PERMISSION_GRANTED) {

            getContentResolver().registerContentObserver(CalendarContract.Events.CONTENT_URI,

                    true, mObserver);

        }

    }



    @Override

    public void onPause() {