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

Merge changes from topic "am-2cfb180af8604b6fac1598107a7b546e" into oc-mr1-dev-plus-aosp

Browse Source 
* changes:
  Merge changes from topic "mtp-user" into oc-mr1-dev am: 4de4655f0d
  Reset functions to null when user changes. am: e537a83139
This commit is contained in:
Android Build Merger (Role)
2017-08-24 22:39:51 +00:00
committed by Android (Google) Code Review
parent de9e885193 45629ed195
commit 54c6447f47
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/mtp/MtpDatabase.java
View File

@@ -52,6 +52,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class MtpDatabase implements AutoCloseable {
private static final String TAG = "MtpDatabase";
private final Context mUserContext;
private final Context mContext;
private final String mPackageName;
private final ContentProviderClient mMediaProvider;
@@ -159,13 +160,14 @@ public class MtpDatabase implements AutoCloseable {
}
};
public MtpDatabase(Context context, String volumeName, String storagePath,
public MtpDatabase(Context context, Context userContext, String volumeName, String storagePath,
String[] subDirectories) {
native_setup();
mContext = context;
mUserContext = userContext;
mPackageName = context.getPackageName();
mMediaProvider = context.getContentResolver()
mMediaProvider = userContext.getContentResolver()
.acquireContentProviderClient(MediaStore.AUTHORITY);
mVolumeName = volumeName;
mMediaStoragePath = storagePath;
@@ -1114,7 +1116,7 @@ public class MtpDatabase implements AutoCloseable {
private void sessionEnded() {
if (mDatabaseModified) {
mContext.sendBroadcast(new Intent(MediaStore.ACTION_MTP_SESSION_END));
mUserContext.sendBroadcast(new Intent(MediaStore.ACTION_MTP_SESSION_END));
mDatabaseModified = false;
}
}

2
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -1017,7 +1017,7 @@ public class UsbDeviceManager {
Slog.v(TAG, "Current user switched to " + msg.arg1
+ "; resetting USB host stack for MTP or PTP");
// avoid leaking sensitive data from previous user
setEnabledFunctions(mCurrentFunctions, true, false);
setEnabledFunctions(null, true, false);
}
mCurrentUser = msg.arg1;
}