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

Merge "Fix injection in ContentProvider" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-11 23:03:42 +00:00
committed by Android (Google) Code Review
parent c7bfe7d196 24a57d97a6
commit 0709cb572f
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/src/com/android/systemui/people/PeopleProvider.java
View File

@@ -18,7 +18,9 @@ package com.android.systemui.people;
import android.content.ContentProvider; import android.content.ContentProvider;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ProviderInfo;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Binder; import android.os.Binder;
@@ -27,16 +29,19 @@ import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import android.widget.RemoteViews; import android.widget.RemoteViews;
import com.android.systemui.SystemUIAppComponentFactory;
import com.android.systemui.people.widget.PeopleSpaceWidgetManager; import com.android.systemui.people.widget.PeopleSpaceWidgetManager;
import com.android.systemui.shared.system.PeopleProviderUtils; import com.android.systemui.shared.system.PeopleProviderUtils;
import javax.inject.Inject; import javax.inject.Inject;
/** API that returns a People Tile preview. */ /** API that returns a People Tile preview. */
public class PeopleProvider extends ContentProvider { public class PeopleProvider extends ContentProvider implements
SystemUIAppComponentFactory.ContextInitializer {
private static final String TAG = "PeopleProvider"; private static final String TAG = "PeopleProvider";
private static final boolean DEBUG = PeopleSpaceUtils.DEBUG; private static final boolean DEBUG = PeopleSpaceUtils.DEBUG;
private static final String EMPTY_STRING = ""; private static final String EMPTY_STRING = "";
private SystemUIAppComponentFactory.ContextAvailableCallback mCallback;
@Inject @Inject
PeopleSpaceWidgetManager mPeopleSpaceWidgetManager; PeopleSpaceWidgetManager mPeopleSpaceWidgetManager;
@@ -82,8 +87,8 @@ public class PeopleProvider extends ContentProvider {
Log.e(TAG, "Could not initialize people widget manager"); Log.e(TAG, "Could not initialize people widget manager");
return null; return null;
} }
RemoteViews view = RemoteViews view = mPeopleSpaceWidgetManager.getPreview(shortcutId, userHandle, packageName,
mPeopleSpaceWidgetManager.getPreview(shortcutId, userHandle, packageName, extras); extras);
if (view == null) { if (view == null) {
if (DEBUG) Log.d(TAG, "No preview available for shortcutId: " + shortcutId); if (DEBUG) Log.d(TAG, "No preview available for shortcutId: " + shortcutId);
return null; return null;
@@ -130,5 +135,17 @@ public class PeopleProvider extends ContentProvider {
public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
throw new IllegalArgumentException("Invalid method"); throw new IllegalArgumentException("Invalid method");
} }
@Override
public void attachInfo(Context context, ProviderInfo info) {
mCallback.onContextAvailable(context);
super.attachInfo(context, info);
}
@Override
public void setContextAvailableCallback(
SystemUIAppComponentFactory.ContextAvailableCallback callback) {
mCallback = callback;
}
} }