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

Commit 052ae787 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev

parents 5a6655d3 3f5bd093

res/xml/app_info_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -175,6 +175,12 @@ 
            android:summary="@string/summary_placeholder"

            settings:controller="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsPreferenceController" />



        <Preference

            android:key="alarms_and_reminders"

            android:title="@string/alarms_and_reminders_title"

            android:summary="@string/summary_placeholder"

            settings:controller="com.android.settings.applications.appinfo.AlarmsAndRemindersDetailPreferenceController" />



    </PreferenceCategory>



    <!-- App installer info -->

src/com/android/settings/applications/AppStateAlarmsAndRemindersBridge.java

+11 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.applications; 
import android.Manifest;

import android.app.AlarmManager;

import android.app.AppGlobals;

import android.app.compat.CompatChanges;

import android.content.Context;

import android.content.pm.IPackageManager;

import android.os.RemoteException;
@@ -63,14 +64,21 @@ public class AppStateAlarmsAndRemindersBridge extends AppStateBaseBridge { 
        }

    }



    private boolean isChangeEnabled(String packageName, int userId) {

        return CompatChanges.isChangeEnabled(AlarmManager.REQUIRE_EXACT_ALARM_PERMISSION,

                packageName, UserHandle.of(userId));

    }



    /**

     * Returns information regarding {@link Manifest.permission#SCHEDULE_EXACT_ALARM} for the given

     * package and uid.

     */

    public AlarmsAndRemindersState createPermissionState(String packageName, int uid) {

        final boolean permissionRequested = ArrayUtils.contains(mRequesterPackages, packageName);

        final boolean permissionGranted = mAlarmManager.hasScheduleExactAlarm(packageName,

                UserHandle.getUserId(uid));

        final int userId = UserHandle.getUserId(uid);



        final boolean permissionRequested = ArrayUtils.contains(mRequesterPackages, packageName)

                && isChangeEnabled(packageName, userId);

        final boolean permissionGranted = mAlarmManager.hasScheduleExactAlarm(packageName, userId);

        return new AlarmsAndRemindersState(permissionRequested, permissionGranted);

    }

src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetailPreferenceController.java

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.applications.appinfo;



import android.content.Context;

import android.content.pm.PackageInfo;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;



import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;



/**

 * Preference controller for

 * {@link com.android.settings.applications.appinfo.AlarmsAndRemindersDetails} Settings fragment.

 */

public class AlarmsAndRemindersDetailPreferenceController extends AppInfoPreferenceControllerBase {



    private String mPackageName;



    public AlarmsAndRemindersDetailPreferenceController(Context context, String key) {

        super(context, key);

    }



    @Override

    public int getAvailabilityStatus() {

        return isCandidate() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;

    }



    @Override

    public void updateState(Preference preference) {

        preference.setSummary(getPreferenceSummary());

    }



    @Override

    protected Class<? extends SettingsPreferenceFragment> getDetailFragmentClass() {

        return AlarmsAndRemindersDetails.class;

    }



    @VisibleForTesting

    CharSequence getPreferenceSummary() {

        return AlarmsAndRemindersDetails.getSummary(mContext, mParent.getAppEntry());

    }



    @VisibleForTesting

    boolean isCandidate() {

        final PackageInfo packageInfo = mParent.getPackageInfo();

        if (packageInfo == null) {

            return false;

        }

        final AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState appState =

                new AppStateAlarmsAndRemindersBridge(mContext, null, null).createPermissionState(

                        mPackageName, packageInfo.applicationInfo.uid);

        return appState.shouldBeVisible();

    }



    void setPackageName(String packageName) {

        mPackageName = packageName;

    }

}

src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java

+8 −19
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.applications.appinfo; 
import static android.app.Activity.RESULT_CANCELED;

import static android.app.Activity.RESULT_OK;



import android.app.ActivityManager;

import android.app.AppOpsManager;

import android.app.settings.SettingsEnums;

import android.content.Context;
@@ -49,25 +48,20 @@ public class AlarmsAndRemindersDetails extends AppInfoWithHeader 
    private AppOpsManager mAppOpsManager;

    private RestrictedSwitchPreference mSwitchPref;

    private AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState mPermissionState;

    private ActivityManager mActivityManager;

    private volatile Boolean mUncommittedState;



    /**

     * Returns the string that states whether the app has access to

     * {@link android.Manifest.permission#SCHEDULE_EXACT_ALARM}.

     */

    public static int getSummary(Context context, AppEntry entry) {

        final AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState state;

        if (entry.extraInfo instanceof AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState) {

            state = (AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState) entry.extraInfo;

        } else {

            state = new AppStateAlarmsAndRemindersBridge(context, /*appState=*/null,

    public static CharSequence getSummary(Context context, AppEntry entry) {

        final AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState state =

                new AppStateAlarmsAndRemindersBridge(context, /*appState=*/null,

                        /*callback=*/null).createPermissionState(entry.info.packageName,

                        entry.info.uid);

        }



        return state.isAllowed() ? R.string.app_permission_summary_allowed

                : R.string.app_permission_summary_not_allowed;

        return context.getString(state.isAllowed() ? R.string.app_permission_summary_allowed

                : R.string.app_permission_summary_not_allowed);

    }



    @Override
@@ -77,7 +71,6 @@ public class AlarmsAndRemindersDetails extends AppInfoWithHeader 
        final Context context = getActivity();

        mAppBridge = new AppStateAlarmsAndRemindersBridge(context, mState, /*callback=*/null);

        mAppOpsManager = context.getSystemService(AppOpsManager.class);

        mActivityManager = context.getSystemService(ActivityManager.class);



        if (savedInstanceState != null) {

            mUncommittedState = (Boolean) savedInstanceState.get(UNCOMMITTED_STATE_KEY);
@@ -115,10 +108,6 @@ public class AlarmsAndRemindersDetails extends AppInfoWithHeader 
        final int uid = mPackageInfo.applicationInfo.uid;

        mAppOpsManager.setUidMode(AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM, uid,

                newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);

        if (!newState) {

            mActivityManager.killUid(uid,

                    AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM + " no longer allowed.");

        }

    }



    private void logPermissionChange(boolean newState, String packageName) {

src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java

+7 −1
Original line number Diff line number Diff line
@@ -197,8 +197,14 @@ public class AppInfoDashboardFragment extends DashboardFragment 
        acrossProfiles.setPackageName(packageName);

        acrossProfiles.setParentFragment(this);



        final AlarmsAndRemindersDetailPreferenceController alarmsAndReminders =

                use(AlarmsAndRemindersDetailPreferenceController.class);

        alarmsAndReminders.setPackageName(packageName);

        alarmsAndReminders.setParentFragment(this);



        use(AdvancedAppInfoPreferenceCategoryController.class).setChildren(Arrays.asList(

                writeSystemSettings, drawOverlay, pip, externalSource, acrossProfiles));

                writeSystemSettings, drawOverlay, pip, externalSource, acrossProfiles,

                alarmsAndReminders));

    }



    @Override