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

Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev

Browse Source 
am: ebb6e998d5

Change-Id: I8973b62b103f4f40275bc5681f54b5957385ecb1
This commit is contained in:
Daichi Hirono
2017-06-08 18:30:15 +00:00
committed by android-build-merger
parent 440137be48 ebb6e998d5
commit 87df9ee8b7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/MtpDocumentsProvider/src/com/android/mtp/ServiceIntentSender.java
View File

@@ -23,6 +23,7 @@ import android.app.NotificationManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
/** /**
@@ -30,7 +31,7 @@ import com.android.internal.util.Preconditions;
*/ */
class ServiceIntentSender { class ServiceIntentSender {
private final static String CHANNEL_ID = "device_notification_channel"; private final static String CHANNEL_ID = "device_notification_channel";
private Context mContext; private final Context mContext;
ServiceIntentSender(Context context) { ServiceIntentSender(Context context) {
mContext = context; mContext = context;
@@ -46,6 +47,11 @@ class ServiceIntentSender {
notificationManager.createNotificationChannel(mChannel); notificationManager.createNotificationChannel(mChannel);
} }
@VisibleForTesting
protected ServiceIntentSender() {
mContext = null;
}
/** /**
* Notify the change of opened device set. * Notify the change of opened device set.
* @param records List of opened devices. Can be empty. * @param records List of opened devices. Can be empty.

4
packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestServiceIntentSender.java
View File

@@ -17,10 +17,6 @@
package com.android.mtp; package com.android.mtp;
class TestServiceIntentSender extends ServiceIntentSender { class TestServiceIntentSender extends ServiceIntentSender {
TestServiceIntentSender() {
super(null);
}
@Override @Override
void sendUpdateNotificationIntent(MtpDeviceRecord[] record) {} void sendUpdateNotificationIntent(MtpDeviceRecord[] record) {}
} }