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

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

Merge "Fix various issues with multiple profiles." into qt-dev

parents 125bfe73 c612d688

src/com/android/packageinstaller/permission/ui/handheld/PermissionControlPreference.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.packageinstaller.permission.ui.handheld; 
import android.content.Context;

import android.content.Intent;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.text.TextUtils;

import android.view.LayoutInflater;

import android.view.View;
@@ -63,7 +64,7 @@ public class PermissionControlPreference extends Preference { 
            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, group.getApp().packageName);

            intent.putExtra(Intent.EXTRA_PERMISSION_NAME, group.getPermissions().get(0).getName());

            intent.putExtra(Intent.EXTRA_USER, group.getUser());

            context.startActivity(intent);

            context.startActivityAsUser(intent, UserHandle.SYSTEM);

            return true;

        });

    }

src/com/android/packageinstaller/permission/ui/handheld/ReviewOngoingUsageFragment.java

+4 −2
Original line number Diff line number Diff line
@@ -192,10 +192,12 @@ public final class ReviewOngoingUsageFragment extends PreferenceFragmentCompat { 
            }



            itemView.setOnClickListener((v) -> {

                UserHandle user = UserHandle.getUserHandleForUid(app.getUid());

                Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS);

                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);

                intent.putExtra(Intent.EXTRA_PACKAGE_NAME, app.getPackageName());

                intent.putExtra(Intent.EXTRA_USER, UserHandle.getUserHandleForUid(app.getUid()));

                startActivity(intent);

                intent.putExtra(Intent.EXTRA_USER, user);

                context.startActivityAsUser(intent, user);

                mDialog.dismiss();

            });