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

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

Merge "Move OnGoingUsage dialog out of debug folder" into rvc-qpr-dev

parents def7cddf 7e9b0641

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ 
                  android:excludeFromRecents="true"

                  android:theme="@style/PermissionDialog.FilterTouches" />



        <activity android:name="com.android.permissioncontroller.permission.debug.ReviewOngoingUsageActivity"

        <activity android:name="com.android.permissioncontroller.permission.ui.ReviewOngoingUsageActivity"

                  android:excludeFromRecents="true"

                  android:theme="@style/PermissionDialog"

                  android:launchMode="singleInstance"

src/com/android/permissioncontroller/permission/debug/PermissionUsageFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ import androidx.preference.PreferenceScreen; 
import androidx.preference.PreferenceViewHolder;



import com.android.permissioncontroller.R;

import com.android.permissioncontroller.permission.debug.AppPermissionUsage.GroupUsage;

import com.android.permissioncontroller.permission.model.AppPermissionUsage;

import com.android.permissioncontroller.permission.model.AppPermissionUsage.GroupUsage;

import com.android.permissioncontroller.permission.model.AppPermissionGroup;

import com.android.permissioncontroller.permission.model.legacy.PermissionApps;

import com.android.permissioncontroller.permission.model.legacy.PermissionApps.PermissionApp;

src/com/android/permissioncontroller/permission/debug/PermissionUsages.java

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ import android.util.SparseArray; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.permissioncontroller.permission.debug.AppPermissionUsage.Builder;

import com.android.permissioncontroller.permission.model.AppPermissionUsage;

import com.android.permissioncontroller.permission.model.AppPermissionUsage.Builder;

import com.android.permissioncontroller.permission.model.AppPermissionGroup;

import com.android.permissioncontroller.permission.model.Permission;

import com.android.permissioncontroller.permission.model.legacy.PermissionApps.PermissionApp;

src/com/android/permissioncontroller/permission/debug/Utils.kt

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.provider.DeviceConfig 
import android.text.format.DateFormat.getMediumDateFormat

import android.text.format.DateFormat.getTimeFormat

import com.android.permissioncontroller.R

import com.android.permissioncontroller.permission.debug.AppPermissionUsage.GroupUsage

import com.android.permissioncontroller.permission.model.AppPermissionUsage.GroupUsage

import java.util.Locale



/** Whether to show the Permissions Hub.  */

src/com/android/permissioncontroller/permission/debug/AppPermissionUsage.java→src/com/android/permissioncontroller/permission/model/AppPermissionUsage.java

+2 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.permissioncontroller.permission.debug;

package com.android.permissioncontroller.permission.model;



import static android.Manifest.permission_group.MICROPHONE;
@@ -28,8 +28,6 @@ import android.media.AudioRecordingConfiguration; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.permissioncontroller.permission.model.AppPermissionGroup;

import com.android.permissioncontroller.permission.model.Permission;

import com.android.permissioncontroller.permission.model.legacy.PermissionApps.PermissionApp;



import java.util.ArrayList;
@@ -124,7 +122,7 @@ public final class AppPermissionUsage { 
        private final @Nullable PackageOps mLastUsage;

        private final @Nullable HistoricalPackageOps mHistoricalUsage;



        GroupUsage(@NonNull AppPermissionGroup group, @Nullable PackageOps lastUsage,

        public GroupUsage(@NonNull AppPermissionGroup group, @Nullable PackageOps lastUsage,

                @Nullable HistoricalPackageOps historicalUsage) {

            mGroup = group;

            mLastUsage = lastUsage;