Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update AppOps & UsageStats when app widget tapped." into rvc-dev am: aa3d42b129 am: aab97af060

Browse Source 
Change-Id: I377586349ffe634a65e2c237224469a7c0f90149
This commit is contained in:
Hui Yu
2020-03-21 20:23:51 +00:00
committed by Automerger Merge Worker
parent 56fffa56c8 aab97af060
commit 8b7fcb5766
5 changed files with 83 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/usage/UsageStats.java
View File

@@ -27,6 +27,7 @@ import static android.app.usage.UsageEvents.Event.FLUSH_TO_DISK;
import static android.app.usage.UsageEvents.Event.FOREGROUND_SERVICE_START;
import static android.app.usage.UsageEvents.Event.FOREGROUND_SERVICE_STOP;
import static android.app.usage.UsageEvents.Event.ROLLOVER_FOREGROUND_SERVICE;
import static android.app.usage.UsageEvents.Event.USER_INTERACTION;
import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage;
@@ -580,6 +581,18 @@ public final class UsageStats implements Parcelable {
incrementServiceTimeUsed(timeStamp);
}
break;
case USER_INTERACTION:
if (hasForegroundActivity()) {
incrementTimeUsed(timeStamp);
} else {
mLastTimeUsed = timeStamp;
}
if (hasVisibleActivity()) {
incrementTimeVisible(timeStamp);
} else {
mLastTimeVisible = timeStamp;
}
break;
default:
break;
}

14
core/java/android/appwidget/AppWidgetManager.java
View File

@@ -1240,4 +1240,18 @@ public class AppWidgetManager {
throw e.rethrowFromSystemServer();
}
}
/**
* Note an app widget is tapped on.
* @param uid App UID.
* @param packageName App package name.
* @hide
*/
public void noteAppWidgetTapped(int uid, @NonNull String packageName) {
try {
mService.noteAppWidgetTapped(uid, packageName);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
}

13
core/java/android/widget/RemoteViews.java
View File

@@ -29,6 +29,7 @@ import android.app.Application;
import android.app.PendingIntent;
import android.app.RemoteInput;
import android.appwidget.AppWidgetHostView;
import android.appwidget.AppWidgetManager;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.content.ContextWrapper;
@@ -4130,8 +4131,18 @@ public class RemoteViews implements Parcelable, Filter {
// The NEW_TASK flags are applied through the activity options and not as a part of
// the call to startIntentSender() to ensure that they are consistently applied to
// both mutable and immutable PendingIntents.
final IntentSender intentSender = pendingIntent.getIntentSender();
final int uid = intentSender.getCreatorUid();
final String packageName = intentSender.getCreatorPackage();
if (uid != -1 && packageName != null) {
final AppWidgetManager appWidgetManager =
context.getSystemService(AppWidgetManager.class);
if (appWidgetManager != null) {
appWidgetManager.noteAppWidgetTapped(uid, packageName);
}
}
context.startIntentSender(
pendingIntent.getIntentSender(), options.first,
intentSender, options.first,
0, 0, 0, options.second.toBundle());
} catch (IntentSender.SendIntentException e) {
Log.e(LOG_TAG, "Cannot send pending intent: ", e);

1
core/java/com/android/internal/appwidget/IAppWidgetService.aidl
View File

@@ -77,5 +77,6 @@ interface IAppWidgetService {
boolean requestPinAppWidget(String packageName, in ComponentName providerComponent,
in Bundle extras, in IntentSender resultIntent);
boolean isRequestPinAppWidgetSupported();
void noteAppWidgetTapped(int uid, String packageName);
}

61
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -35,6 +35,8 @@ import android.app.KeyguardManager;
import android.app.PendingIntent;
import android.app.admin.DevicePolicyManagerInternal;
import android.app.admin.DevicePolicyManagerInternal.OnCrossProfileWidgetProvidersChangeListener;
import android.app.usage.UsageEvents;
import android.app.usage.UsageStatsManagerInternal;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetManagerInternal;
import android.appwidget.AppWidgetProviderInfo;
@@ -235,6 +237,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
private PackageManagerInternal mPackageManagerInternal;
private ActivityManagerInternal mActivityManagerInternal;
private AppOpsManagerInternal mAppOpsManagerInternal;
private UsageStatsManagerInternal mUsageStatsManagerInternal;
private SecurityPolicy mSecurityPolicy;
@@ -278,6 +281,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
void systemServicesReady() {
mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);
mAppOpsManagerInternal = LocalServices.getService(AppOpsManagerInternal.class);
mUsageStatsManagerInternal = LocalServices.getService(UsageStatsManagerInternal.class);
}
private void computeMaximumWidgetBitmapMemory() {
@@ -879,8 +883,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
outUpdates.add(updatesMap.valueAt(j));
}
}
updateAppOpsLocked(host, true);
// Reset the update counter once all the updates have been calculated
host.lastWidgetUpdateSequenceNo = updateSequenceNo;
return new ParceledListSlice<>(outUpdates);
@@ -909,7 +911,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
if (host != null) {
host.callbacks = null;
pruneHostLocked(host);
updateAppOpsLocked(host, false);
mAppOpsManagerInternal.updateAppWidgetVisibility(host.getWidgetUids(), false);
}
}
}
@@ -3646,26 +3648,49 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
return false;
}
private void updateAppOpsLocked(Host host, boolean visible) {
if (visible) {
final int procState = mActivityManagerInternal.getUidProcessState(host.id.uid);
/**
* Note an app widget is tapped on. If a app widget is tapped, the underlying app is treated as
* foreground so the app can get while-in-use permission.
*
* @param uid UID of the underlying app.
* @param packageName Package name of the app.
*/
@Override
public void noteAppWidgetTapped(int uid, String packageName) {
final int callingUid = Binder.getCallingUid();
final long ident = Binder.clearCallingIdentity();
try {
// The launcher must be at TOP.
final int procState = mActivityManagerInternal.getUidProcessState(callingUid);
if (procState > ActivityManager.PROCESS_STATE_TOP) {
// The launcher must be at TOP.
return;
}
}
final List<ResolveInfo> allHomeCandidates = new ArrayList<>();
// Default launcher from package manager.
final ComponentName defaultLauncher = mPackageManagerInternal
.getHomeActivitiesAsUser(allHomeCandidates, UserHandle.getUserId(host.id.uid));
// The launcher must be default launcher.
if (defaultLauncher == null
|| !defaultLauncher.getPackageName().equals(host.id.packageName)) {
return;
// Default launcher from package manager.
final ComponentName defaultLauncher = mPackageManagerInternal
.getDefaultHomeActivity(UserHandle.getUserId(callingUid));
int defaultLauncherUid = 0;
try {
defaultLauncherUid = mPackageManager.getApplicationInfo(
defaultLauncher.getPackageName(), 0 ,
UserHandle.getUserId(callingUid)).uid;
} catch (RemoteException e) {
Slog.e(TAG, "Failed to getApplicationInfo for package:"
+ defaultLauncher.getPackageName(), e);
return;
}
// The callingUid must be default launcher uid.
if (defaultLauncherUid != callingUid) {
return;
}
final SparseArray<String> uid2PackageName = new SparseArray<String>();
uid2PackageName.put(uid, packageName);
mAppOpsManagerInternal.updateAppWidgetVisibility(uid2PackageName, true);
mUsageStatsManagerInternal.reportEvent(packageName, UserHandle.getUserId(uid),
UsageEvents.Event.USER_INTERACTION);
} finally {
Binder.restoreCallingIdentity(ident);
}
mAppOpsManagerInternal.updateAppWidgetVisibility(host.getWidgetUids(), visible);
}
private final class CallbackHandler extends Handler {