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

Merge "Remove references to Google packages." into nyc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2016-03-16 20:55:46 +00:00
committed by Android (Google) Code Review
parent 5ecade7512 237db27c58
commit 215fe69342
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/content/pm/PackageInstaller.java
View File

@@ -37,7 +37,6 @@ import android.os.ParcelFileDescriptor;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.RemoteException; import android.os.RemoteException;
import android.util.ExceptionUtils; import android.util.ExceptionUtils;
import android.util.Log;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
@@ -47,7 +46,6 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@@ -393,13 +391,6 @@ public class PackageInstaller {
* Return list of all known install sessions, regardless of the installer. * Return list of all known install sessions, regardless of the installer.
*/ */
public @NonNull List<SessionInfo> getAllSessions() { public @NonNull List<SessionInfo> getAllSessions() {
final ApplicationInfo info = mContext.getApplicationInfo();
if ("com.google.android.googlequicksearchbox".equals(info.packageName)
&& info.versionCode <= 300400110) {
Log.d(TAG, "Ignoring callback request from old prebuilt");
return Collections.EMPTY_LIST;
}
try { try {
return mInstaller.getAllSessions(mUserId).getList(); return mInstaller.getAllSessions(mUserId).getList();
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -597,14 +588,6 @@ public class PackageInstaller {
* calling thread. * calling thread.
*/ */
public void registerSessionCallback(@NonNull SessionCallback callback, @NonNull Handler handler) { public void registerSessionCallback(@NonNull SessionCallback callback, @NonNull Handler handler) {
// TODO: remove this temporary guard once we have new prebuilts
final ApplicationInfo info = mContext.getApplicationInfo();
if ("com.google.android.googlequicksearchbox".equals(info.packageName)
&& info.versionCode <= 300400110) {
Log.d(TAG, "Ignoring callback request from old prebuilt");
return;
}
synchronized (mDelegates) { synchronized (mDelegates) {
final SessionCallbackDelegate delegate = new SessionCallbackDelegate(callback, final SessionCallbackDelegate delegate = new SessionCallbackDelegate(callback,
handler.getLooper()); handler.getLooper());