f9c5c2574d
MtpStorageManager keeps track of file information and send notifications for new files. MtpDatabase now uses this instead of MediaProvider for getting object information, although some operations are still reflected into MP. Since MtpStorageManager handles storage ids, remove that field from StorageVolume and VolumeInfo. Clean up a lot of the jni code for MtpDatabase. Bug: 63143623 Test: Test every MtpOperation in a variety of situations on Linux and Windows. Also use the shell to manipulate files. Verify that the cache is consistent throughout, and the operations behave as expected. Verify files created by the shell appear. Test: adb shell am instrument -w android.mtp /android.support.test.runner.AndroidJUnitRunner Change-Id: Id4ea810047b0c323399cd833047733e5daafb30a
96 lines
3.0 KiB
Java
96 lines
3.0 KiB
Java
/*
|
|
* Copyright (C) 2010 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package android.mtp;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* Encapsulates the ObjectPropList dataset used by the GetObjectPropList command.
|
|
* The fields of this class are read by JNI code in android_media_MtpDatabase.cpp
|
|
*/
|
|
|
|
class MtpPropertyList {
|
|
|
|
// list of object handles (first field in quadruplet)
|
|
private List<Integer> mObjectHandles;
|
|
// list of object property codes (second field in quadruplet)
|
|
private List<Integer> mPropertyCodes;
|
|
// list of data type codes (third field in quadruplet)
|
|
private List<Integer> mDataTypes;
|
|
// list of long int property values (fourth field in quadruplet, when value is integer type)
|
|
private List<Long> mLongValues;
|
|
// list of long int property values (fourth field in quadruplet, when value is string type)
|
|
private List<String> mStringValues;
|
|
|
|
// Return value of this operation
|
|
private int mCode;
|
|
|
|
public MtpPropertyList(int code) {
|
|
mCode = code;
|
|
mObjectHandles = new ArrayList<>();
|
|
mPropertyCodes = new ArrayList<>();
|
|
mDataTypes = new ArrayList<>();
|
|
mLongValues = new ArrayList<>();
|
|
mStringValues = new ArrayList<>();
|
|
}
|
|
|
|
public void append(int handle, int property, int type, long value) {
|
|
mObjectHandles.add(handle);
|
|
mPropertyCodes.add(property);
|
|
mDataTypes.add(type);
|
|
mLongValues.add(value);
|
|
mStringValues.add(null);
|
|
}
|
|
|
|
public void append(int handle, int property, String value) {
|
|
mObjectHandles.add(handle);
|
|
mPropertyCodes.add(property);
|
|
mDataTypes.add(MtpConstants.TYPE_STR);
|
|
mStringValues.add(value);
|
|
mLongValues.add(0L);
|
|
}
|
|
|
|
public int getCode() {
|
|
return mCode;
|
|
}
|
|
|
|
public int getCount() {
|
|
return mObjectHandles.size();
|
|
}
|
|
|
|
public int[] getObjectHandles() {
|
|
return mObjectHandles.stream().mapToInt(Integer::intValue).toArray();
|
|
}
|
|
|
|
public int[] getPropertyCodes() {
|
|
return mPropertyCodes.stream().mapToInt(Integer::intValue).toArray();
|
|
}
|
|
|
|
public int[] getDataTypes() {
|
|
return mDataTypes.stream().mapToInt(Integer::intValue).toArray();
|
|
}
|
|
|
|
public long[] getLongValues() {
|
|
return mLongValues.stream().mapToLong(Long::longValue).toArray();
|
|
}
|
|
|
|
public String[] getStringValues() {
|
|
return mStringValues.toArray(new String[0]);
|
|
}
|
|
}
|